lu
2025-03-26 95a2120e504bad6f514bb0db986712f52194d1dc
其它入库
已修改5个文件
386 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs 286 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs 83 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs 4 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -29,24 +29,24 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -65,6 +65,7 @@
            this.gv_qt010 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -157,9 +158,16 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -233,6 +241,7 @@
            // 
            this.toolBarMenu1.chkParameter = null;
            this.toolBarMenu1.currentAction = null;
            this.toolBarMenu1.defaultActions = null;
            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
            this.toolBarMenu1.guidKey = null;
            this.toolBarMenu1.isSetBtn = false;
@@ -310,7 +319,11 @@
            this.gv_qt002,
            this.gv_qt010,
            this.gridColumn13,
            this.gridColumn14});
            this.gridColumn14,
            this.gridColumn21,
            this.gridColumn22,
            this.gridColumn23,
            this.gridColumn24});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -480,6 +493,16 @@
            this.gridColumn14.VisibleIndex = 11;
            this.gridColumn14.Width = 94;
            // 
            // gridColumn21
            //
            this.gridColumn21.Caption = "货主名称";
            this.gridColumn21.FieldName = "hzName";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 12;
            this.gridColumn21.Width = 94;
            //
            // pageBar1
            // 
            this.pageBar1.CurrentPage = 1;
@@ -559,11 +582,11 @@
            // 
            // txt_qt010
            // 
            this.txt_qt010.Location = new System.Drawing.Point(661, 108);
            this.txt_qt010.Location = new System.Drawing.Point(646, 108);
            this.txt_qt010.Name = "txt_qt010";
            this.txt_qt010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_qt010.Properties.Appearance.Options.UseFont = true;
            this.txt_qt010.Size = new System.Drawing.Size(190, 28);
            this.txt_qt010.Size = new System.Drawing.Size(205, 28);
            this.txt_qt010.StyleController = this.layoutMx1;
            this.txt_qt010.TabIndex = 240;
            // 
@@ -580,19 +603,19 @@
            // txt_qt008
            // 
            this.txt_qt008.IsReadly = false;
            this.txt_qt008.Location = new System.Drawing.Point(380, 108);
            this.txt_qt008.Location = new System.Drawing.Point(365, 108);
            this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
            this.txt_qt008.Name = "txt_qt008";
            this.txt_qt008.Size = new System.Drawing.Size(190, 28);
            this.txt_qt008.Size = new System.Drawing.Size(205, 28);
            this.txt_qt008.TabIndex = 301;
            // 
            // txt_qt016
            // 
            this.txt_qt016.Location = new System.Drawing.Point(942, 12);
            this.txt_qt016.Location = new System.Drawing.Point(927, 12);
            this.txt_qt016.Name = "txt_qt016";
            this.txt_qt016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_qt016.Properties.Appearance.Options.UseFont = true;
            this.txt_qt016.Size = new System.Drawing.Size(192, 28);
            this.txt_qt016.Size = new System.Drawing.Size(207, 28);
            this.txt_qt016.StyleController = this.layoutMx1;
            this.txt_qt016.TabIndex = 267;
            this.txt_qt016.Tag = "readonly";
@@ -600,46 +623,46 @@
            // txt_qt018
            // 
            this.txt_qt018.IsReadly = false;
            this.txt_qt018.Location = new System.Drawing.Point(380, 76);
            this.txt_qt018.Location = new System.Drawing.Point(365, 76);
            this.txt_qt018.Margin = new System.Windows.Forms.Padding(0);
            this.txt_qt018.Name = "txt_qt018";
            this.txt_qt018.Size = new System.Drawing.Size(190, 28);
            this.txt_qt018.Size = new System.Drawing.Size(205, 28);
            this.txt_qt018.TabIndex = 302;
            // 
            // txt_qt022
            // 
            this.txt_qt022.IsReadly = false;
            this.txt_qt022.Location = new System.Drawing.Point(99, 44);
            this.txt_qt022.Location = new System.Drawing.Point(84, 44);
            this.txt_qt022.Name = "txt_qt022";
            this.txt_qt022.Size = new System.Drawing.Size(190, 28);
            this.txt_qt022.Size = new System.Drawing.Size(205, 28);
            this.txt_qt022.TabIndex = 326;
            // 
            // txt_qt009
            // 
            this.txt_qt009.IsReadly = false;
            this.txt_qt009.Location = new System.Drawing.Point(380, 44);
            this.txt_qt009.Location = new System.Drawing.Point(365, 44);
            this.txt_qt009.Name = "txt_qt009";
            this.txt_qt009.Size = new System.Drawing.Size(190, 28);
            this.txt_qt009.Size = new System.Drawing.Size(205, 28);
            this.txt_qt009.TabIndex = 304;
            // 
            // txt_qtck
            // 
            this.txt_qtck.Location = new System.Drawing.Point(99, 12);
            this.txt_qtck.Location = new System.Drawing.Point(84, 12);
            this.txt_qtck.Name = "txt_qtck";
            this.txt_qtck.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_qtck.Properties.Appearance.Options.UseFont = true;
            this.txt_qtck.Size = new System.Drawing.Size(190, 28);
            this.txt_qtck.Size = new System.Drawing.Size(205, 28);
            this.txt_qtck.StyleController = this.layoutMx1;
            this.txt_qtck.TabIndex = 213;
            this.txt_qtck.Tag = "readonly";
            // 
            // txt_qt002
            // 
            this.txt_qt002.Location = new System.Drawing.Point(942, 44);
            this.txt_qt002.Location = new System.Drawing.Point(927, 44);
            this.txt_qt002.Name = "txt_qt002";
            this.txt_qt002.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_qt002.Properties.Appearance.Options.UseFont = true;
            this.txt_qt002.Size = new System.Drawing.Size(192, 28);
            this.txt_qt002.Size = new System.Drawing.Size(207, 28);
            this.txt_qt002.StyleController = this.layoutMx1;
            this.txt_qt002.TabIndex = 217;
            this.txt_qt002.Tag = "readonly";
@@ -647,21 +670,21 @@
            // txt_qt003
            // 
            this.txt_qt003.EditValue = "其它入库(QTRKD01_SYS)";
            this.txt_qt003.Location = new System.Drawing.Point(661, 12);
            this.txt_qt003.Location = new System.Drawing.Point(646, 12);
            this.txt_qt003.Name = "txt_qt003";
            this.txt_qt003.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_qt003.Properties.Items.AddRange(new object[] {
            "其它入库(QTRKD01_SYS)"});
            this.txt_qt003.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_qt003.Size = new System.Drawing.Size(190, 24);
            this.txt_qt003.Size = new System.Drawing.Size(205, 24);
            this.txt_qt003.StyleController = this.layoutMx1;
            this.txt_qt003.TabIndex = 305;
            // 
            // txt_qt019
            // 
            this.txt_qt019.EditValue = "请选择";
            this.txt_qt019.Location = new System.Drawing.Point(380, 12);
            this.txt_qt019.Location = new System.Drawing.Point(365, 12);
            this.txt_qt019.Name = "txt_qt019";
            this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -670,7 +693,7 @@
            "普通(GENERAL)",
            "退货(RETURN)"});
            this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_qt019.Size = new System.Drawing.Size(190, 24);
            this.txt_qt019.Size = new System.Drawing.Size(205, 24);
            this.txt_qt019.StyleController = this.layoutMx1;
            this.txt_qt019.TabIndex = 299;
            // 
@@ -686,22 +709,22 @@
            // 
            // txt_qt005
            // 
            this.txt_qt005.Location = new System.Drawing.Point(661, 44);
            this.txt_qt005.Location = new System.Drawing.Point(646, 44);
            this.txt_qt005.Name = "txt_qt005";
            this.txt_qt005.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_qt005.Properties.Appearance.Options.UseFont = true;
            this.txt_qt005.Size = new System.Drawing.Size(190, 28);
            this.txt_qt005.Size = new System.Drawing.Size(205, 28);
            this.txt_qt005.StyleController = this.layoutMx1;
            this.txt_qt005.TabIndex = 331;
            this.txt_qt005.Tag = "readonly";
            // 
            // txt_qt001
            // 
            this.txt_qt001.Location = new System.Drawing.Point(661, 76);
            this.txt_qt001.Location = new System.Drawing.Point(646, 76);
            this.txt_qt001.Name = "txt_qt001";
            this.txt_qt001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_qt001.Properties.Appearance.Options.UseFont = true;
            this.txt_qt001.Size = new System.Drawing.Size(190, 28);
            this.txt_qt001.Size = new System.Drawing.Size(205, 28);
            this.txt_qt001.StyleController = this.layoutMx1;
            this.txt_qt001.TabIndex = 332;
            this.txt_qt001.Tag = "readonly";
@@ -739,32 +762,32 @@
            this.layoutControlItem2});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4});
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1146, 148);
            this.Root.TextVisible = false;
            // 
@@ -775,7 +798,7 @@
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem4
            // 
@@ -785,7 +808,7 @@
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem4.Text = "库存组织";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
            // 
@@ -796,18 +819,19 @@
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem5.Text = "选择部门";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_qt018;
            this.layoutControlItem7.CustomizationFormText = "选供应商";
            this.layoutControlItem7.Location = new System.Drawing.Point(281, 64);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem7.Text = "选择供应商";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem7.Text = "选供应商";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
@@ -818,7 +842,7 @@
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem8.Text = "收料仓库";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem9
            // 
@@ -828,7 +852,7 @@
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(283, 32);
            this.layoutControlItem9.Text = "审核人";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
@@ -839,7 +863,7 @@
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(283, 32);
            this.layoutControlItem10.Text = "审核日期";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
@@ -874,7 +898,7 @@
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem13.Text = "入库备注";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem14
            // 
@@ -886,7 +910,7 @@
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem14.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem14.Text = "申请人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
@@ -897,7 +921,7 @@
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem15.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem15.Text = "申请时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem3
            // 
@@ -907,7 +931,7 @@
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem3.Text = "库存方向";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
@@ -917,7 +941,7 @@
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(281, 32);
            this.layoutControlItem2.Text = "单据类型";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -1235,10 +1259,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1280,11 +1304,11 @@
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 67);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
            this.ucBtnPrint1.Size = new System.Drawing.Size(207, 30);
            this.ucBtnPrint1.TabIndex = 230;
            // 
            // lbMxGuid
@@ -1462,6 +1486,8 @@
            // 
            // gvMx2
            // 
            this.gvMx2.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx2.Appearance.Row.Options.UseFont = true;
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn2,
            this.gvMx1itemBarcode,
@@ -1472,6 +1498,10 @@
            this.gridColumn6,
            this.gvMx1createBy,
            this.gvMx1lotDate,
            this.gridColumn17,
            this.gridColumn18,
            this.gridColumn19,
            this.gridColumn20,
            this.gvBtnAlawys});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
@@ -1582,6 +1612,46 @@
            this.gvMx1lotDate.VisibleIndex = 7;
            this.gvMx1lotDate.Width = 94;
            // 
            // gridColumn17
            //
            this.gridColumn17.Caption = "是否入库";
            this.gridColumn17.FieldName = "isRk";
            this.gridColumn17.MinWidth = 25;
            this.gridColumn17.Name = "gridColumn17";
            this.gridColumn17.Visible = true;
            this.gridColumn17.VisibleIndex = 8;
            this.gridColumn17.Width = 94;
            //
            // gridColumn18
            //
            this.gridColumn18.Caption = "入库人";
            this.gridColumn18.FieldName = "rkUser";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
            this.gridColumn18.VisibleIndex = 9;
            this.gridColumn18.Width = 94;
            //
            // gridColumn19
            //
            this.gridColumn19.Caption = "入库日期";
            this.gridColumn19.FieldName = "rkDate";
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 10;
            this.gridColumn19.Width = 94;
            //
            // gridColumn20
            //
            this.gridColumn20.Caption = "入库位";
            this.gridColumn20.FieldName = "rkPositon";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 11;
            this.gridColumn20.Width = 94;
            //
            // gvBtnAlawys
            // 
            this.gvBtnAlawys.Caption = "移出";
@@ -1589,16 +1659,16 @@
            this.gvBtnAlawys.MinWidth = 25;
            this.gvBtnAlawys.Name = "gvBtnAlawys";
            this.gvBtnAlawys.Visible = true;
            this.gvBtnAlawys.VisibleIndex = 8;
            this.gvBtnAlawys.VisibleIndex = 12;
            this.gvBtnAlawys.Width = 94;
            // 
            // repositoryItemButtonEdit2
            // 
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -1613,6 +1683,36 @@
            this.picCheckBox.TabIndex = 5;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn22
            //
            this.gridColumn22.Caption = "仓库名称";
            this.gridColumn22.FieldName = "ckName";
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 13;
            this.gridColumn22.Width = 94;
            //
            // gridColumn23
            //
            this.gridColumn23.Caption = "部门名称";
            this.gridColumn23.FieldName = "bmName";
            this.gridColumn23.MinWidth = 25;
            this.gridColumn23.Name = "gridColumn23";
            this.gridColumn23.Visible = true;
            this.gridColumn23.VisibleIndex = 14;
            this.gridColumn23.Width = 94;
            //
            // gridColumn24
            //
            this.gridColumn24.Caption = "供应商名称";
            this.gridColumn24.FieldName = "gysName";
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 15;
            this.gridColumn24.Width = 94;
            // 
            // Frm_MesItemQtrk
            // 
@@ -1809,5 +1909,13 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -337,6 +337,12 @@
                txt_qt019.Focus();
                return;
            }
            if (string.IsNullOrEmpty(kcBm) && string.IsNullOrEmpty(kcGys))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("部门或供应商必须选一个!");
                txt_qt009.Focus();
                return;
            }
            if (string.IsNullOrEmpty(kcCk))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择收料仓库!");
@@ -453,6 +459,7 @@
        }
        private void getModel(string strGuid)
        {
            gcMx1.DataSource = null;
            bool isEdit = false;
            if (toolBarMenu1.currentAction == "add") return;
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -501,6 +508,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                         Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    else
                    {
@@ -518,6 +526,7 @@
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
                    }
                    else
                    {
@@ -699,7 +708,7 @@
                try
                {
                    var strJson = UtilityHelper.HttpPost("",
                        _webServiceName + "DeleteBarcode",
                        "VArrivalBarcodeManager/DeleteBarcode",
                        JsonConvert.SerializeObject(_obj));
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrkDj.cs
@@ -218,6 +218,7 @@
                        gcMx1.DataSource = dt;
                        gcMx1.ForceInitialize();
                        gvMx1.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
                    }
                    else
                    {
@@ -235,6 +236,7 @@
                        gcMx2.DataSource = dt2;
                        gcMx2.ForceInitialize();
                        gvMx2.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx2);
                    }
                    else
                    {
DevApp/Gs.DevApp/UserControl/UcLookHuoZhu.Designer.cs
@@ -31,23 +31,29 @@
            this.txt_hzabc = new DevExpress.XtraEditors.SearchLookUpEdit();
            this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.txt_hzlxabc = new DevExpress.XtraEditors.ComboBoxEdit();
            this.label1 = new System.Windows.Forms.Label();
            this.label2 = new System.Windows.Forms.Label();
            this.panel1 = new System.Windows.Forms.Panel();
            this.panel2 = new System.Windows.Forms.Panel();
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzabc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).BeginInit();
            this.panel1.SuspendLayout();
            this.panel2.SuspendLayout();
            this.SuspendLayout();
            // 
            // txt_hzabc
            // 
            this.txt_hzabc.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.txt_hzabc.EditValue = "请选择货主";
            this.txt_hzabc.Location = new System.Drawing.Point(0, 25);
            this.txt_hzabc.Location = new System.Drawing.Point(84, 1);
            this.txt_hzabc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_hzabc.Name = "txt_hzabc";
            this.txt_hzabc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_hzabc.Properties.Appearance.Options.UseFont = true;
            this.txt_hzabc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_hzabc.Properties.PopupView = this.searchLookUpEdit1View;
            this.txt_hzabc.Size = new System.Drawing.Size(263, 28);
            this.txt_hzabc.Size = new System.Drawing.Size(225, 28);
            this.txt_hzabc.TabIndex = 312;
            // 
            // searchLookUpEdit1View
@@ -59,10 +65,12 @@
            // 
            // txt_hzlxabc
            // 
            this.txt_hzlxabc.Dock = System.Windows.Forms.DockStyle.Top;
            this.txt_hzlxabc.EditValue = "请选择货主类型";
            this.txt_hzlxabc.Location = new System.Drawing.Point(0, 0);
            this.txt_hzlxabc.Location = new System.Drawing.Point(84, 3);
            this.txt_hzlxabc.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.txt_hzlxabc.Name = "txt_hzlxabc";
            this.txt_hzlxabc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_hzlxabc.Properties.Appearance.Options.UseFont = true;
            this.txt_hzlxabc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_hzlxabc.Properties.Items.AddRange(new object[] {
@@ -71,20 +79,71 @@
            "供应商(BD_Supplier)",
            "客户(BD_Customer)"});
            this.txt_hzlxabc.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_hzlxabc.Size = new System.Drawing.Size(263, 24);
            this.txt_hzlxabc.Size = new System.Drawing.Size(225, 28);
            this.txt_hzlxabc.TabIndex = 313;
            //
            // label1
            //
            this.label1.AutoSize = true;
            this.label1.Font = new System.Drawing.Font("Tahoma", 9F);
            this.label1.Location = new System.Drawing.Point(-2, 8);
            this.label1.Name = "label1";
            this.label1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
            this.label1.Size = new System.Drawing.Size(68, 18);
            this.label1.TabIndex = 314;
            this.label1.Text = "货主类型";
            this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;
            //
            // label2
            //
            this.label2.AutoSize = true;
            this.label2.Font = new System.Drawing.Font("Tahoma", 9F);
            this.label2.Location = new System.Drawing.Point(-2, 6);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(38, 18);
            this.label2.TabIndex = 0;
            this.label2.Text = "货主";
            //
            // panel1
            //
            this.panel1.Controls.Add(this.txt_hzlxabc);
            this.panel1.Controls.Add(this.label1);
            this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
            this.panel1.Location = new System.Drawing.Point(0, 0);
            this.panel1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.panel1.Name = "panel1";
            this.panel1.Size = new System.Drawing.Size(312, 38);
            this.panel1.TabIndex = 316;
            //
            // panel2
            //
            this.panel2.Controls.Add(this.txt_hzabc);
            this.panel2.Controls.Add(this.label2);
            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.panel2.Location = new System.Drawing.Point(0, 39);
            this.panel2.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.panel2.Name = "panel2";
            this.panel2.Size = new System.Drawing.Size(312, 35);
            this.panel2.TabIndex = 317;
            // 
            // UcLookHuoZhu
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.Appearance.Options.UseFont = true;
            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 21F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.txt_hzabc);
            this.Controls.Add(this.txt_hzlxabc);
            this.Controls.Add(this.panel2);
            this.Controls.Add(this.panel1);
            this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
            this.Name = "UcLookHuoZhu";
            this.Size = new System.Drawing.Size(263, 53);
            this.Size = new System.Drawing.Size(312, 74);
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzabc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_hzlxabc.Properties)).EndInit();
            this.panel1.ResumeLayout(false);
            this.panel1.PerformLayout();
            this.panel2.ResumeLayout(false);
            this.panel2.PerformLayout();
            this.ResumeLayout(false);
        }
@@ -94,5 +153,9 @@
        private DevExpress.XtraEditors.SearchLookUpEdit txt_hzabc;
        private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
        private DevExpress.XtraEditors.ComboBoxEdit txt_hzlxabc;
        private System.Windows.Forms.Label label1;
        private System.Windows.Forms.Label label2;
        private System.Windows.Forms.Panel panel1;
        private System.Windows.Forms.Panel panel2;
    }
}
DevApp/Gs.DevApp/UserControl/UcLookSupplier.cs
@@ -65,6 +65,7 @@
                lookSearchSupplier.Properties.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
                if (!string.IsNullOrEmpty(_dftVale))
                    SetIdOrCode(_dftVale);
            }
            catch (Exception ex)
            {
@@ -106,7 +107,8 @@
                return;
            }
            //   lookSearchSupplier.EditValue = ((Code.ToString().Trim()));
            lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
            if (!string.IsNullOrEmpty(Code))
                lookSearchSupplier.EditValue = Int64.Parse((Code.ToString().Trim()));
        }
    }