bug
lu
2025-06-13 6beb321d3a6e9909d14a6e94d8e34195211201c5
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -29,20 +29,21 @@
        /// </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.XtraLayout.RowDefinition rowDefinition5 = 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();
            this.components = new System.ComponentModel.Container();
            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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            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();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -63,6 +64,7 @@
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -126,7 +128,10 @@
            this.gvMx1invWorkLine = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -189,6 +194,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;
@@ -222,6 +228,7 @@
            // split1
            // 
            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
            this.split1.Horizontal = false;
            this.split1.Location = new System.Drawing.Point(0, 0);
            this.split1.Name = "split1";
@@ -235,14 +242,14 @@
            // split1.Panel2
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1126, 570);
            this.split1.SplitterPosition = 558;
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
            // 
            // gcMain1
            // 
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
@@ -255,7 +262,6 @@
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -272,7 +278,8 @@
            this.gv_returnType,
            this.gv_depotId,
            this.gv_suppId,
            this.gv_remark});
            this.gv_remark,
            this.gridColumn7});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -292,7 +299,6 @@
            // 
            // gv_status
            // 
            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_status.AppearanceCell.Options.UseFont = true;
            this.gv_status.Caption = "审核状态";
            this.gv_status.FieldName = "status";
@@ -307,7 +313,6 @@
            // 
            // gv_isFinish
            // 
            this.gv_isFinish.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isFinish.AppearanceCell.Options.UseFont = true;
            this.gv_isFinish.Caption = "是否完成";
            this.gv_isFinish.FieldName = "isFinish";
@@ -316,13 +321,10 @@
            this.gv_isFinish.Name = "gv_isFinish";
            this.gv_isFinish.OptionsColumn.AllowEdit = false;
            this.gv_isFinish.Tag = "query_a.IS_FINISH";
            this.gv_isFinish.Visible = true;
            this.gv_isFinish.VisibleIndex = 2;
            this.gv_isFinish.Width = 50;
            // 
            // gv_isOut
            // 
            this.gv_isOut.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_isOut.AppearanceCell.Options.UseFont = true;
            this.gv_isOut.Caption = "委外标识";
            this.gv_isOut.FieldName = "isOut";
@@ -332,12 +334,11 @@
            this.gv_isOut.OptionsColumn.AllowEdit = false;
            this.gv_isOut.Tag = "query_a.IS_OUT";
            this.gv_isOut.Visible = true;
            this.gv_isOut.VisibleIndex = 3;
            this.gv_isOut.VisibleIndex = 2;
            this.gv_isOut.Width = 50;
            // 
            // gv_billNo
            // 
            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_billNo.AppearanceCell.Options.UseFont = true;
            this.gv_billNo.Caption = "单据编码";
            this.gv_billNo.FieldName = "billNo";
@@ -345,12 +346,11 @@
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.BILL_NO";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 4;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.Width = 120;
            // 
            // gv_lastUpdateUser
            // 
            this.gv_lastUpdateUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateUser.Caption = "最后跟新人 ";
            this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
@@ -358,12 +358,11 @@
            this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
            this.gv_lastUpdateUser.Visible = true;
            this.gv_lastUpdateUser.VisibleIndex = 5;
            this.gv_lastUpdateUser.VisibleIndex = 4;
            this.gv_lastUpdateUser.Width = 94;
            // 
            // gv_lastUpdateTime
            // 
            this.gv_lastUpdateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
            this.gv_lastUpdateTime.Caption = "最后修改时间 ";
            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
@@ -371,12 +370,11 @@
            this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
            this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
            this.gv_lastUpdateTime.Visible = true;
            this.gv_lastUpdateTime.VisibleIndex = 6;
            this.gv_lastUpdateTime.VisibleIndex = 5;
            this.gv_lastUpdateTime.Width = 180;
            // 
            // gv_checkUser
            // 
            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_checkUser.AppearanceCell.Options.UseFont = true;
            this.gv_checkUser.Caption = "审核人 ";
            this.gv_checkUser.FieldName = "checkUser";
@@ -384,12 +382,11 @@
            this.gv_checkUser.OptionsColumn.AllowEdit = false;
            this.gv_checkUser.Tag = "query_a.CHECK_USER";
            this.gv_checkUser.Visible = true;
            this.gv_checkUser.VisibleIndex = 7;
            this.gv_checkUser.VisibleIndex = 6;
            this.gv_checkUser.Width = 94;
            // 
            // gv_checkDate
            // 
            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_checkDate.AppearanceCell.Options.UseFont = true;
            this.gv_checkDate.Caption = "审核时间 ";
            this.gv_checkDate.FieldName = "checkDate";
@@ -397,12 +394,11 @@
            this.gv_checkDate.OptionsColumn.AllowEdit = false;
            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
            this.gv_checkDate.Visible = true;
            this.gv_checkDate.VisibleIndex = 8;
            this.gv_checkDate.VisibleIndex = 7;
            this.gv_checkDate.Width = 94;
            // 
            // gv_returnMethod
            // 
            this.gv_returnMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
            this.gv_returnMethod.Caption = "退料方式 ";
            this.gv_returnMethod.FieldName = "returnMethod";
@@ -410,12 +406,11 @@
            this.gv_returnMethod.OptionsColumn.AllowEdit = false;
            this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
            this.gv_returnMethod.Visible = true;
            this.gv_returnMethod.VisibleIndex = 9;
            this.gv_returnMethod.VisibleIndex = 8;
            this.gv_returnMethod.Width = 94;
            // 
            // gv_returnType
            // 
            this.gv_returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_returnType.AppearanceCell.Options.UseFont = true;
            this.gv_returnType.Caption = "退料类型 ";
            this.gv_returnType.FieldName = "returnType";
@@ -423,12 +418,11 @@
            this.gv_returnType.OptionsColumn.AllowEdit = false;
            this.gv_returnType.Tag = "query_a.RETURN_TYPE";
            this.gv_returnType.Visible = true;
            this.gv_returnType.VisibleIndex = 10;
            this.gv_returnType.VisibleIndex = 9;
            this.gv_returnType.Width = 94;
            // 
            // gv_depotId
            // 
            this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "仓库";
            this.gv_depotId.FieldName = "dptName";
@@ -436,12 +430,11 @@
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 11;
            this.gv_depotId.VisibleIndex = 10;
            this.gv_depotId.Width = 94;
            // 
            // gv_suppId
            // 
            this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_suppId.AppearanceCell.Options.UseFont = true;
            this.gv_suppId.Caption = "供应商";
            this.gv_suppId.FieldName = "supName";
@@ -449,21 +442,28 @@
            this.gv_suppId.OptionsColumn.AllowEdit = false;
            this.gv_suppId.Tag = "query_a.SUPP_ID";
            this.gv_suppId.Visible = true;
            this.gv_suppId.VisibleIndex = 12;
            this.gv_suppId.VisibleIndex = 11;
            this.gv_suppId.Width = 94;
            // 
            // gv_remark
            // 
            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_remark.AppearanceCell.Options.UseFont = true;
            this.gv_remark.Caption = "备注 ";
            this.gv_remark.Caption = "申请备注";
            this.gv_remark.FieldName = "remark";
            this.gv_remark.Name = "gv_remark";
            this.gv_remark.OptionsColumn.AllowEdit = false;
            this.gv_remark.Tag = "query_a.REMARK";
            this.gv_remark.Visible = true;
            this.gv_remark.VisibleIndex = 13;
            this.gv_remark.VisibleIndex = 12;
            this.gv_remark.Width = 94;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "主键GUID";
            this.gridColumn7.FieldName = "guid";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Width = 94;
            // 
            // pageBar1
            // 
@@ -500,6 +500,7 @@
            // 
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 177;
            this.splitMx1.TabIndex = 0;
@@ -538,7 +539,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 140);
            this.btnSelect.Location = new System.Drawing.Point(12, 136);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -557,15 +558,15 @@
            // txt_thOrgId
            // 
            this.txt_thOrgId.IsReadly = false;
            this.txt_thOrgId.Location = new System.Drawing.Point(114, 44);
            this.txt_thOrgId.Location = new System.Drawing.Point(114, 43);
            this.txt_thOrgId.Name = "txt_thOrgId";
            this.txt_thOrgId.Size = new System.Drawing.Size(165, 28);
            this.txt_thOrgId.Size = new System.Drawing.Size(170, 24);
            this.txt_thOrgId.TabIndex = 526;
            // 
            // txt_returnType
            // 
            this.txt_returnType.EditValue = "-请选择-";
            this.txt_returnType.Location = new System.Drawing.Point(385, 76);
            this.txt_returnType.Location = new System.Drawing.Point(390, 74);
            this.txt_returnType.Name = "txt_returnType";
            this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -577,7 +578,7 @@
            "供应商物品号错误",
            "采购料号变更"});
            this.txt_returnType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_returnType.Size = new System.Drawing.Size(165, 24);
            this.txt_returnType.Size = new System.Drawing.Size(170, 24);
            this.txt_returnType.StyleController = this.layoutMx1;
            this.txt_returnType.TabIndex = 521;
            // 
@@ -585,9 +586,8 @@
            // 
            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(165, 28);
            this.txt_billNo.Size = new System.Drawing.Size(170, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
@@ -595,7 +595,7 @@
            // txt_returnMethod
            // 
            this.txt_returnMethod.EditValue = "-请选择-";
            this.txt_returnMethod.Location = new System.Drawing.Point(385, 44);
            this.txt_returnMethod.Location = new System.Drawing.Point(390, 43);
            this.txt_returnMethod.Name = "txt_returnMethod";
            this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -604,17 +604,16 @@
            "退料补料",
            "退料并扣款"});
            this.txt_returnMethod.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_returnMethod.Size = new System.Drawing.Size(165, 24);
            this.txt_returnMethod.Size = new System.Drawing.Size(170, 24);
            this.txt_returnMethod.StyleController = this.layoutMx1;
            this.txt_returnMethod.TabIndex = 520;
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(927, 44);
            this.txt_checkDate.Location = new System.Drawing.Point(942, 43);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(166, 28);
            this.txt_checkDate.Size = new System.Drawing.Size(172, 24);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 226;
            this.txt_checkDate.Tag = "readonly";
@@ -622,29 +621,27 @@
            // txt_depotId
            // 
            this.txt_depotId.IsReadly = false;
            this.txt_depotId.Location = new System.Drawing.Point(114, 76);
            this.txt_depotId.Location = new System.Drawing.Point(114, 74);
            this.txt_depotId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_depotId.Name = "txt_depotId";
            this.txt_depotId.Size = new System.Drawing.Size(165, 28);
            this.txt_depotId.Size = new System.Drawing.Size(170, 24);
            this.txt_depotId.TabIndex = 260;
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(385, 108);
            this.txt_remark.Location = new System.Drawing.Point(390, 105);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(436, 28);
            this.txt_remark.Size = new System.Drawing.Size(446, 24);
            this.txt_remark.StyleController = this.layoutMx1;
            this.txt_remark.TabIndex = 252;
            // 
            // txt_checkUser
            // 
            this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
            this.txt_checkUser.Location = new System.Drawing.Point(942, 12);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
            this.txt_checkUser.Size = new System.Drawing.Size(166, 28);
            this.txt_checkUser.Size = new System.Drawing.Size(172, 24);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 222;
            this.txt_checkUser.Tag = "readonly";
@@ -652,56 +649,56 @@
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(114, 108);
            this.txt_suppId.Location = new System.Drawing.Point(114, 105);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(165, 28);
            this.txt_suppId.Size = new System.Drawing.Size(170, 24);
            this.txt_suppId.TabIndex = 259;
            // 
            // txt_isOut
            // 
            this.txt_isOut.Location = new System.Drawing.Point(283, 12);
            this.txt_isOut.Location = new System.Drawing.Point(288, 12);
            this.txt_isOut.Name = "txt_isOut";
            this.txt_isOut.Properties.Caption = "委外标识";
            this.txt_isOut.Size = new System.Drawing.Size(267, 24);
            this.txt_isOut.Size = new System.Drawing.Size(272, 24);
            this.txt_isOut.StyleController = this.layoutMx1;
            this.txt_isOut.TabIndex = 527;
            this.txt_isOut.Tag = "readOnly";
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(825, 76);
            this.txt_status.Location = new System.Drawing.Point(840, 74);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(268, 24);
            this.txt_status.Size = new System.Drawing.Size(274, 24);
            this.txt_status.StyleController = this.layoutMx1;
            this.txt_status.TabIndex = 528;
            this.txt_status.Tag = "readonly";
            // 
            // txt_isFinish
            // 
            this.txt_isFinish.Location = new System.Drawing.Point(554, 76);
            this.txt_isFinish.Location = new System.Drawing.Point(564, 74);
            this.txt_isFinish.Name = "txt_isFinish";
            this.txt_isFinish.Properties.Caption = "完结标识";
            this.txt_isFinish.Size = new System.Drawing.Size(267, 24);
            this.txt_isFinish.Size = new System.Drawing.Size(272, 24);
            this.txt_isFinish.StyleController = this.layoutMx1;
            this.txt_isFinish.TabIndex = 529;
            this.txt_isFinish.Tag = "readonly";
            // 
            // lastUpdateUser
            // 
            this.lastUpdateUser.Location = new System.Drawing.Point(656, 12);
            this.lastUpdateUser.Location = new System.Drawing.Point(666, 12);
            this.lastUpdateUser.Name = "lastUpdateUser";
            this.lastUpdateUser.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateUser.Size = new System.Drawing.Size(170, 24);
            this.lastUpdateUser.StyleController = this.layoutMx1;
            this.lastUpdateUser.TabIndex = 530;
            this.lastUpdateUser.Tag = "readonly";
            // 
            // lastUpdateTime
            // 
            this.lastUpdateTime.Location = new System.Drawing.Point(656, 44);
            this.lastUpdateTime.Location = new System.Drawing.Point(666, 43);
            this.lastUpdateTime.Name = "lastUpdateTime";
            this.lastUpdateTime.Size = new System.Drawing.Size(165, 24);
            this.lastUpdateTime.Size = new System.Drawing.Size(170, 24);
            this.lastUpdateTime.StyleController = this.layoutMx1;
            this.lastUpdateTime.TabIndex = 531;
            this.lastUpdateTime.Tag = "readonly";
@@ -759,36 +756,36 @@
            this.layoutControlItem12});
            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;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            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;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1105, 180);
            rowDefinition6,
            rowDefinition7,
            rowDefinition8,
            rowDefinition9,
            rowDefinition10});
            this.Root.Size = new System.Drawing.Size(1126, 177);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -796,59 +793,59 @@
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_thOrgId;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem2.Text = "选择组织";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_depotId;
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem3.Text = "选择仓库";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_returnType;
            this.layoutControlItem6.Location = new System.Drawing.Point(271, 64);
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 62);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem6.Text = "退料原因";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_returnMethod;
            this.layoutControlItem5.Location = new System.Drawing.Point(271, 32);
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 31);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem5.Text = "退料方式";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_isOut;
            this.layoutControlItem8.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem8.Text = "委外标识";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
@@ -856,54 +853,55 @@
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_checkUser;
            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem9.CustomizationFormText = "审核人员";
            this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem9.Text = "审核人";
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_checkDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(813, 32);
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.lastUpdateUser;
            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem14.Text = "最后更新人";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(542, 32);
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 31);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem15.Text = "最后更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 128);
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 124);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "退货明细";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -912,33 +910,33 @@
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_suppId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem4.Text = "选供应商";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(271, 96);
            this.layoutControlItem7.Location = new System.Drawing.Point(276, 93);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
            this.layoutControlItem7.Text = "退货备注";
            this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 64);
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -946,11 +944,11 @@
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(542, 64);
            this.layoutControlItem12.Location = new System.Drawing.Point(552, 62);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
            this.layoutControlItem12.Size = new System.Drawing.Size(276, 31);
            this.layoutControlItem12.Text = "完结标识";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem12.TextVisible = false;
@@ -1007,7 +1005,9 @@
            this.gvMx1eid,
            this.gvMx1erpid,
            this.gvMx1invWorkLine,
            this.gvMxDel});
            this.gvMxDel,
            this.gridColumn6,
            this.gridColumn8});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1016,7 +1016,7 @@
            // 
            // rkmxGuid
            // 
            this.rkmxGuid.Caption = "gridColumn1";
            this.rkmxGuid.Caption = "入库明细GUID";
            this.rkmxGuid.FieldName = "rkmxGuid";
            this.rkmxGuid.MinWidth = 25;
            this.rkmxGuid.Name = "rkmxGuid";
@@ -1024,9 +1024,8 @@
            // 
            // gvMx1id
            // 
            this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1id.AppearanceCell.Options.UseFont = true;
            this.gvMx1id.Caption = "ID ";
            this.gvMx1id.Caption = "明细GUID";
            this.gvMx1id.FieldName = "id";
            this.gvMx1id.MinWidth = 50;
            this.gvMx1id.Name = "gvMx1id";
@@ -1035,9 +1034,8 @@
            // 
            // gvMx1mid
            // 
            this.gvMx1mid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1mid.AppearanceCell.Options.UseFont = true;
            this.gvMx1mid.Caption = "MID ";
            this.gvMx1mid.Caption = "主表GUID";
            this.gvMx1mid.FieldName = "mid";
            this.gvMx1mid.MinWidth = 50;
            this.gvMx1mid.Name = "gvMx1mid";
@@ -1046,20 +1044,16 @@
            // 
            // gvMx1isFinish
            // 
            this.gvMx1isFinish.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1isFinish.AppearanceCell.Options.UseFont = true;
            this.gvMx1isFinish.Caption = "是否完成";
            this.gvMx1isFinish.FieldName = "isFinish";
            this.gvMx1isFinish.MinWidth = 50;
            this.gvMx1isFinish.Name = "gvMx1isFinish";
            this.gvMx1isFinish.Tag = "query_a.IS_FINISH";
            this.gvMx1isFinish.Visible = true;
            this.gvMx1isFinish.VisibleIndex = 0;
            this.gvMx1isFinish.Width = 94;
            // 
            // gvMx1invBillNo
            // 
            this.gvMx1invBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1invBillNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1invBillNo.Caption = "入库单号";
            this.gvMx1invBillNo.FieldName = "invBillNo";
@@ -1072,10 +1066,9 @@
            // 
            // gvMx1ebeln
            // 
            this.gvMx1ebeln.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
            this.gvMx1ebeln.Caption = "采购订单";
            this.gvMx1ebeln.FieldName = "ebeln";
            this.gvMx1ebeln.Caption = "采购单号";
            this.gvMx1ebeln.FieldName = "cgdh";
            this.gvMx1ebeln.MinWidth = 50;
            this.gvMx1ebeln.Name = "gvMx1ebeln";
            this.gvMx1ebeln.Tag = "query_a.EBELN";
@@ -1085,9 +1078,8 @@
            // 
            // gvMx1itemId
            // 
            this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
            this.gvMx1itemId.Caption = "物料id ";
            this.gvMx1itemId.Caption = "物料ID";
            this.gvMx1itemId.FieldName = "itemId";
            this.gvMx1itemId.MinWidth = 50;
            this.gvMx1itemId.Name = "gvMx1itemId";
@@ -1136,7 +1128,6 @@
            // 
            // gvMx1sqNum
            // 
            this.gvMx1sqNum.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1sqNum.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1sqNum.AppearanceCell.Options.UseFont = true;
            this.gvMx1sqNum.AppearanceCell.Options.UseForeColor = true;
@@ -1148,12 +1139,11 @@
            this.gvMx1sqNum.Name = "gvMx1sqNum";
            this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
            this.gvMx1sqNum.Visible = true;
            this.gvMx1sqNum.VisibleIndex = 7;
            this.gvMx1sqNum.VisibleIndex = 8;
            this.gvMx1sqNum.Width = 94;
            // 
            // gvMx1ysNum
            // 
            this.gvMx1ysNum.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
            this.gvMx1ysNum.Caption = "已扫数量";
            this.gvMx1ysNum.FieldName = "ysNum";
@@ -1161,12 +1151,11 @@
            this.gvMx1ysNum.Name = "gvMx1ysNum";
            this.gvMx1ysNum.Tag = "query_a.YS_NUM";
            this.gvMx1ysNum.Visible = true;
            this.gvMx1ysNum.VisibleIndex = 8;
            this.gvMx1ysNum.VisibleIndex = 10;
            this.gvMx1ysNum.Width = 94;
            // 
            // gvMx1remark
            // 
            this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1remark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gvMx1remark.AppearanceCell.Options.UseFont = true;
            this.gvMx1remark.AppearanceCell.Options.UseForeColor = true;
@@ -1183,20 +1172,20 @@
            // 
            // gvMx1orderNo
            // 
            this.gvMx1orderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1orderNo.AppearanceCell.Options.UseFont = true;
            this.gvMx1orderNo.Caption = "序号";
            this.gvMx1orderNo.FieldName = "orderNo";
            this.gvMx1orderNo.MinWidth = 50;
            this.gvMx1orderNo.Name = "gvMx1orderNo";
            this.gvMx1orderNo.Tag = "query_a.ORDER_NO";
            this.gvMx1orderNo.Visible = true;
            this.gvMx1orderNo.VisibleIndex = 0;
            this.gvMx1orderNo.Width = 94;
            // 
            // gvMx1eid
            // 
            this.gvMx1eid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1eid.AppearanceCell.Options.UseFont = true;
            this.gvMx1eid.Caption = "采购订单id";
            this.gvMx1eid.Caption = "采购订单ID";
            this.gvMx1eid.FieldName = "eid";
            this.gvMx1eid.MinWidth = 50;
            this.gvMx1eid.Name = "gvMx1eid";
@@ -1205,9 +1194,8 @@
            // 
            // gvMx1erpid
            // 
            this.gvMx1erpid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
            this.gvMx1erpid.Caption = "采购订单行id";
            this.gvMx1erpid.Caption = "采购订单行ID";
            this.gvMx1erpid.FieldName = "erpid";
            this.gvMx1erpid.MinWidth = 50;
            this.gvMx1erpid.Name = "gvMx1erpid";
@@ -1216,7 +1204,6 @@
            // 
            // gvMx1invWorkLine
            // 
            this.gvMx1invWorkLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gvMx1invWorkLine.AppearanceCell.Options.UseFont = true;
            this.gvMx1invWorkLine.Caption = "入库单行号";
            this.gvMx1invWorkLine.FieldName = "invWorkLine";
@@ -1232,19 +1219,29 @@
            this.gvMxDel.MinWidth = 25;
            this.gvMxDel.Name = "gvMxDel";
            this.gvMxDel.Visible = true;
            this.gvMxDel.VisibleIndex = 10;
            this.gvMxDel.VisibleIndex = 12;
            this.gvMxDel.Width = 94;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.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, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", 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);
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "入库数量";
            this.gridColumn6.FieldName = "rksl";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.Width = 94;
            // 
            // picCheckBox
            // 
@@ -1256,6 +1253,16 @@
            this.picCheckBox.TabIndex = 8;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "当前库存";
            this.gridColumn8.FieldName = "kcQty";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 11;
            this.gridColumn8.Width = 94;
            // 
            // Frm_MesCgthSq
            // 
@@ -1411,5 +1418,9 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
}