~tjx/GsMesClient.git

			@@ -65,7 +65,6 @@
			this.gv_lastupdateBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_lastupdateDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_userNoBack = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_taskNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_checkRes = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_checkQty = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			@@ -91,8 +90,9 @@
			this.gv_bgr = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_billNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_cbillNo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_createBy = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_createDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_checkUser = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_checkDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_insDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gv_fcheckDate = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			@@ -128,16 +128,19 @@
			this.panel1 = new System.Windows.Forms.Panel();
			this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
			this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
			this.txt_status = new DevExpress.XtraEditors.CheckEdit();
			this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
			this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
			this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
			this.lbGuid = new System.Windows.Forms.Label();
			this.picCheckBox = new System.Windows.Forms.PictureBox();
			this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
			this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
			@@ -170,7 +173,7 @@
			this.panel1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
			this.SuspendLayout();
			@@ -503,10 +506,12 @@
			this.gridView1.Appearance.Row.Options.UseFont = true;
			this.gridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
			this.gridBand1,
			this.gridBand16,
			this.gridBand2,
			this.gridBand3,
			this.gridBand5,
			this.gridBand4,
			this.gridBand15,
			this.gridBand6,
			this.gridBand7,
			this.gridBand8,
			@@ -556,7 +561,8 @@
			this.gv_suppId,
			this.bandedGridColumn1,
			this.gv_suppNo,
			this.gv_depotsId});
			this.gv_depotsId,
			this.bandedGridColumn2});
			this.gridView1.GridControl = this.gcMain;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -576,7 +582,7 @@
			this.gv_fstatus.OptionsColumn.AllowEdit = false;
			this.gv_fstatus.Tag = "query_a.FSTATUS";
			this.gv_fstatus.Visible = true;
			this.gv_fstatus.Width = 94;
			this.gv_fstatus.Width = 50;
			//
			// gv_guid
			//
			@@ -637,18 +643,6 @@
			this.gv_userNoBack.OptionsColumn.AllowEdit = false;
			this.gv_userNoBack.Tag = "query_a.USER_NO_BACK";
			this.gv_userNoBack.Width = 94;
			//
			// 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";
			this.gv_checkUser.MinWidth = 50;
			this.gv_checkUser.Name = "gv_checkUser";
			this.gv_checkUser.OptionsColumn.AllowEdit = false;
			this.gv_checkUser.Tag = "query_a.CHECK_USER";
			this.gv_checkUser.Width = 94;
			//
			// gv_taskNo
			//
			@@ -952,6 +946,19 @@
			this.gv_cbillNo.Visible = true;
			this.gv_cbillNo.Width = 180;
			//
			// gv_createBy
			//
			this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_createBy.AppearanceCell.Options.UseFont = true;
			this.gv_createBy.Caption = "创建人 ";
			this.gv_createBy.FieldName = "createBy";
			this.gv_createBy.MinWidth = 50;
			this.gv_createBy.Name = "gv_createBy";
			this.gv_createBy.OptionsColumn.AllowEdit = false;
			this.gv_createBy.Tag = "query_a.CREATE_BY";
			this.gv_createBy.Visible = true;
			this.gv_createBy.Width = 80;
			//
			// gv_createDate
			//
			this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			@@ -965,18 +972,18 @@
			this.gv_createDate.Visible = true;
			this.gv_createDate.Width = 180;
			//
			// gv_createBy
			// gv_checkUser
			//
			this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_createBy.AppearanceCell.Options.UseFont = true;
			this.gv_createBy.Caption = "创建人 ";
			this.gv_createBy.FieldName = "createBy";
			this.gv_createBy.MinWidth = 50;
			this.gv_createBy.Name = "gv_createBy";
			this.gv_createBy.OptionsColumn.AllowEdit = false;
			this.gv_createBy.Tag = "query_a.CREATE_BY";
			this.gv_createBy.Visible = true;
			this.gv_createBy.Width = 80;
			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";
			this.gv_checkUser.MinWidth = 60;
			this.gv_checkUser.Name = "gv_checkUser";
			this.gv_checkUser.OptionsColumn.AllowEdit = false;
			this.gv_checkUser.Tag = "query_a.CHECK_USER";
			this.gv_checkUser.Visible = true;
			this.gv_checkUser.Width = 60;
			//
			// gv_checkDate
			//
			@@ -1037,7 +1044,7 @@
			this.gv_depotsId.OptionsColumn.AllowEdit = false;
			this.gv_depotsId.Tag = "query_a.DEPOTS_ID";
			this.gv_depotsId.Visible = true;
			this.gv_depotsId.Width = 134;
			this.gv_depotsId.Width = 100;
			//
			// gv_depotsCode
			//
			@@ -1381,7 +1388,7 @@
			this.panel1.BackColor = System.Drawing.Color.White;
			this.panel1.Controls.Add(this.txt_dptName);
			this.panel1.Controls.Add(this.txt_suppName);
			this.panel1.Controls.Add(this.txt_status);
			this.panel1.Controls.Add(this.txt_fstatus);
			this.panel1.Controls.Add(this.txt_checkDate);
			this.panel1.Controls.Add(this.labelControl1);
			this.panel1.Controls.Add(this.lbGuid);
			@@ -1427,13 +1434,13 @@
			this.txt_suppName.TabIndex = 592;
			this.txt_suppName.Tag = "readonly";
			//
			// txt_status
			// txt_fstatus
			//
			this.txt_status.Location = new System.Drawing.Point(891, 21);
			this.txt_status.Name = "txt_status";
			this.txt_status.Properties.Caption = "";
			this.txt_status.Size = new System.Drawing.Size(48, 24);
			this.txt_status.TabIndex = 591;
			this.txt_fstatus.Location = new System.Drawing.Point(891, 21);
			this.txt_fstatus.Name = "txt_fstatus";
			this.txt_fstatus.Properties.Caption = "";
			this.txt_fstatus.Size = new System.Drawing.Size(48, 24);
			this.txt_fstatus.TabIndex = 591;
			//
			// txt_checkDate
			//
			@@ -1474,6 +1481,16 @@
			this.picCheckBox.TabStop = false;
			this.picCheckBox.Visible = false;
			//
			// bandedGridColumn2
			//
			this.bandedGridColumn2.Caption = "收料组织";
			this.bandedGridColumn2.FieldName = "receivingOrg";
			this.bandedGridColumn2.MinWidth = 250;
			this.bandedGridColumn2.Name = "bandedGridColumn2";
			this.bandedGridColumn2.Tag = "org.fnamber";
			this.bandedGridColumn2.Visible = true;
			this.bandedGridColumn2.Width = 250;
			//
			// gridBand1
			//
			this.gridBand1.AppearanceHeader.Options.UseTextOptions = true;
			@@ -1485,7 +1502,6 @@
			this.gridBand1.Columns.Add(this.gv_lastupdateBy);
			this.gridBand1.Columns.Add(this.gv_lastupdateDate);
			this.gridBand1.Columns.Add(this.gv_userNoBack);
			this.gridBand1.Columns.Add(this.gv_checkUser);
			this.gridBand1.Columns.Add(this.gv_taskNo);
			this.gridBand1.Columns.Add(this.gv_checkRes);
			this.gridBand1.Columns.Add(this.gv_checkQty);
			@@ -1512,7 +1528,15 @@
			this.gridBand1.MinWidth = 50;
			this.gridBand1.Name = "gridBand1";
			this.gridBand1.VisibleIndex = 0;
			this.gridBand1.Width = 94;
			this.gridBand1.Width = 50;
			//
			// gridBand16
			//
			this.gridBand16.Caption = "收料组织";
			this.gridBand16.Columns.Add(this.bandedGridColumn2);
			this.gridBand16.Name = "gridBand16";
			this.gridBand16.VisibleIndex = 1;
			this.gridBand16.Width = 250;
			//
			// gridBand2
			//
			@@ -1520,7 +1544,7 @@
			this.gridBand2.Columns.Add(this.gv_billNo);
			this.gridBand2.MinWidth = 180;
			this.gridBand2.Name = "gridBand2";
			this.gridBand2.VisibleIndex = 1;
			this.gridBand2.VisibleIndex = 2;
			this.gridBand2.Width = 180;
			//
			// gridBand3
			@@ -1529,7 +1553,7 @@
			this.gridBand3.Columns.Add(this.gv_cbillNo);
			this.gridBand3.MinWidth = 180;
			this.gridBand3.Name = "gridBand3";
			this.gridBand3.VisibleIndex = 2;
			this.gridBand3.VisibleIndex = 3;
			this.gridBand3.Width = 180;
			//
			// gridBand5
			@@ -1538,7 +1562,7 @@
			this.gridBand5.Columns.Add(this.gv_createBy);
			this.gridBand5.MinWidth = 80;
			this.gridBand5.Name = "gridBand5";
			this.gridBand5.VisibleIndex = 3;
			this.gridBand5.VisibleIndex = 4;
			this.gridBand5.Width = 80;
			//
			// gridBand4
			@@ -1547,8 +1571,16 @@
			this.gridBand4.Columns.Add(this.gv_createDate);
			this.gridBand4.MinWidth = 180;
			this.gridBand4.Name = "gridBand4";
			this.gridBand4.VisibleIndex = 4;
			this.gridBand4.VisibleIndex = 5;
			this.gridBand4.Width = 180;
			//
			// gridBand15
			//
			this.gridBand15.Caption = "审核人";
			this.gridBand15.Columns.Add(this.gv_checkUser);
			this.gridBand15.Name = "gridBand15";
			this.gridBand15.VisibleIndex = 6;
			this.gridBand15.Width = 60;
			//
			// gridBand6
			//
			@@ -1558,7 +1590,7 @@
			this.gridBand6.Columns.Add(this.gv_fcheckDate);
			this.gridBand6.MinWidth = 180;
			this.gridBand6.Name = "gridBand6";
			this.gridBand6.VisibleIndex = 5;
			this.gridBand6.VisibleIndex = 7;
			this.gridBand6.Width = 180;
			//
			// gridBand7
			@@ -1570,8 +1602,8 @@
			this.gridBand10,
			this.gridBand9});
			this.gridBand7.Name = "gridBand7";
			this.gridBand7.VisibleIndex = 6;
			this.gridBand7.Width = 234;
			this.gridBand7.VisibleIndex = 8;
			this.gridBand7.Width = 200;
			//
			// gridBand10
			//
			@@ -1590,7 +1622,7 @@
			this.gridBand9.MinWidth = 80;
			this.gridBand9.Name = "gridBand9";
			this.gridBand9.VisibleIndex = 1;
			this.gridBand9.Width = 134;
			this.gridBand9.Width = 100;
			//
			// gridBand8
			//
			@@ -1601,7 +1633,7 @@
			this.gridBand11,
			this.gridBand12});
			this.gridBand8.Name = "gridBand8";
			this.gridBand8.VisibleIndex = 7;
			this.gridBand8.VisibleIndex = 9;
			this.gridBand8.Width = 250;
			//
			// gridBand11
			@@ -1628,7 +1660,7 @@
			this.gridBand13.Columns.Add(this.gv_paperBillNo);
			this.gridBand13.MinWidth = 120;
			this.gridBand13.Name = "gridBand13";
			this.gridBand13.VisibleIndex = 8;
			this.gridBand13.VisibleIndex = 10;
			this.gridBand13.Width = 120;
			//
			// gridBand14
			@@ -1637,7 +1669,7 @@
			this.gridBand14.Columns.Add(this.gv_remark);
			this.gridBand14.MinWidth = 120;
			this.gridBand14.Name = "gridBand14";
			this.gridBand14.VisibleIndex = 9;
			this.gridBand14.VisibleIndex = 11;
			this.gridBand14.Width = 120;
			//
			// Frm_MesInvItemIns
			@@ -1674,7 +1706,7 @@
			this.panel1.PerformLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
			this.ResumeLayout(false);
			@@ -1771,7 +1803,7 @@
			private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gv_suppId;
			private DevExpress.XtraEditors.TextEdit txt_checkDate;
			private DevExpress.XtraEditors.LabelControl labelControl1;
			private DevExpress.XtraEditors.CheckEdit txt_status;
			private DevExpress.XtraEditors.CheckEdit txt_fstatus;
			private System.Windows.Forms.PictureBox picCheckBox;
			private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
			private DevExpress.XtraEditors.TextEdit txt_suppName;
			@@ -1793,11 +1825,14 @@
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
			private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
			private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;