~tjx/GsMesClient.git

			@@ -118,7 +118,7 @@
			this.txtSupplierId = new DevExpress.XtraEditors.TextEdit();
			this.txt_fType = new DevExpress.XtraEditors.CheckEdit();
			this.txt_urgentFlag = new DevExpress.XtraEditors.CheckEdit();
			this.txt_ischeck = new DevExpress.XtraEditors.CheckEdit();
			this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
			this.txt_depotsId = new Gs.DevApp.UserControl.UcLookCk();
			this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
			this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
			@@ -148,7 +148,7 @@
			((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
			this.SuspendLayout();
			//
			@@ -444,10 +444,10 @@
			//
			// gridColumn8
			//
			this.gridColumn8.Caption = "选择";
			this.gridColumn8.Caption = "退货选择";
			this.gridColumn8.ColumnEdit = this.repositoryItemCheckEdit1;
			this.gridColumn8.FieldName = "gvChk";
			this.gridColumn8.MinWidth = 50;
			this.gridColumn8.MinWidth = 60;
			this.gridColumn8.Name = "gridColumn8";
			this.gridColumn8.Visible = true;
			this.gridColumn8.VisibleIndex = 0;
			@@ -753,6 +753,7 @@
			this.gridColumn2.Caption = "入库";
			this.gridColumn2.FieldName = "status";
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.OptionsColumn.AllowEdit = false;
			this.gridColumn2.Visible = true;
			this.gridColumn2.Width = 50;
			//
			@@ -878,6 +879,7 @@
			this.gridColumn4.Caption = "收货仓库名称";
			this.gridColumn4.FieldName = "depotName";
			this.gridColumn4.Name = "gridColumn4";
			this.gridColumn4.OptionsColumn.AllowEdit = false;
			this.gridColumn4.Visible = true;
			this.gridColumn4.Width = 119;
			//
			@@ -928,6 +930,7 @@
			this.gridColumn5.Caption = "供应商名称";
			this.gridColumn5.FieldName = "suppName";
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.OptionsColumn.AllowEdit = false;
			this.gridColumn5.Visible = true;
			this.gridColumn5.Width = 49;
			//
			@@ -1069,7 +1072,7 @@
			this.panel1.Controls.Add(this.txtSupplierId);
			this.panel1.Controls.Add(this.txt_fType);
			this.panel1.Controls.Add(this.txt_urgentFlag);
			this.panel1.Controls.Add(this.txt_ischeck);
			this.panel1.Controls.Add(this.txt_fstatus);
			this.panel1.Controls.Add(this.txt_depotsId);
			this.panel1.Controls.Add(this.labelControl3);
			this.panel1.Controls.Add(this.btnSelect);
			@@ -1096,9 +1099,9 @@
			// btnTui
			//
			this.btnTui.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.close_16x16;
			this.btnTui.Location = new System.Drawing.Point(207, 126);
			this.btnTui.Location = new System.Drawing.Point(197, 126);
			this.btnTui.Name = "btnTui";
			this.btnTui.Size = new System.Drawing.Size(124, 29);
			this.btnTui.Size = new System.Drawing.Size(116, 29);
			this.btnTui.TabIndex = 455;
			this.btnTui.Text = "去退入库明细";
			//
			@@ -1157,14 +1160,14 @@
			this.txt_urgentFlag.Size = new System.Drawing.Size(35, 24);
			this.txt_urgentFlag.TabIndex = 449;
			//
			// txt_ischeck
			// txt_fstatus
			//
			this.txt_ischeck.Enabled = false;
			this.txt_ischeck.Location = new System.Drawing.Point(785, 92);
			this.txt_ischeck.Name = "txt_ischeck";
			this.txt_ischeck.Properties.Caption = "";
			this.txt_ischeck.Size = new System.Drawing.Size(47, 24);
			this.txt_ischeck.TabIndex = 447;
			this.txt_fstatus.Enabled = false;
			this.txt_fstatus.Location = new System.Drawing.Point(785, 92);
			this.txt_fstatus.Name = "txt_fstatus";
			this.txt_fstatus.Properties.Caption = "";
			this.txt_fstatus.Size = new System.Drawing.Size(47, 24);
			this.txt_fstatus.TabIndex = 447;
			//
			// txt_depotsId
			//
			@@ -1190,7 +1193,7 @@
			this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
			this.btnSelect.Location = new System.Drawing.Point(30, 126);
			this.btnSelect.Name = "btnSelect";
			this.btnSelect.Size = new System.Drawing.Size(133, 29);
			this.btnSelect.Size = new System.Drawing.Size(128, 29);
			this.btnSelect.TabIndex = 443;
			this.btnSelect.Text = "去选择来料明细";
			//
			@@ -1215,7 +1218,7 @@
			//
			// labelControl11
			//
			this.labelControl11.Location = new System.Drawing.Point(851, 99);
			this.labelControl11.Location = new System.Drawing.Point(870, 22);
			this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
			this.labelControl11.Name = "labelControl11";
			this.labelControl11.Size = new System.Drawing.Size(45, 18);
			@@ -1226,7 +1229,7 @@
			// lbGuid
			//
			this.lbGuid.AutoSize = true;
			this.lbGuid.Location = new System.Drawing.Point(902, 99);
			this.lbGuid.Location = new System.Drawing.Point(877, 99);
			this.lbGuid.Name = "lbGuid";
			this.lbGuid.Size = new System.Drawing.Size(0, 21);
			this.lbGuid.TabIndex = 1;
			@@ -1236,7 +1239,7 @@
			//
			this.lb_remark.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.lb_remark.Appearance.Options.UseFont = true;
			this.lb_remark.Location = new System.Drawing.Point(843, 18);
			this.lb_remark.Location = new System.Drawing.Point(377, 130);
			this.lb_remark.Name = "lb_remark";
			this.lb_remark.Size = new System.Drawing.Size(34, 21);
			this.lb_remark.TabIndex = 240;
			@@ -1244,11 +1247,11 @@
			//
			// txt_remark
			//
			this.txt_remark.Location = new System.Drawing.Point(887, 14);
			this.txt_remark.Location = new System.Drawing.Point(421, 126);
			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(215, 28);
			this.txt_remark.Size = new System.Drawing.Size(388, 28);
			this.txt_remark.TabIndex = 240;
			//
			// Frm_MesInvItemArn
			@@ -1280,7 +1283,7 @@
			((System.ComponentModel.ISupportInitialize)(this.txtSupplierId.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_urgentFlag.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_ischeck.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
			this.ResumeLayout(false);

			@@ -1337,7 +1340,7 @@
			private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
			private DevExpress.XtraEditors.LabelControl lb_remark;
			private DevExpress.XtraEditors.TextEdit txt_remark;
			private DevExpress.XtraEditors.CheckEdit txt_ischeck;
			private DevExpress.XtraEditors.CheckEdit txt_fstatus;
			private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
			private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;