~tjx/GsMesClient.git

			@@ -227,6 +227,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;
			@@ -358,8 +359,6 @@
			this.gridColumn14.FieldName = "fCustId";
			this.gridColumn14.MinWidth = 25;
			this.gridColumn14.Name = "gridColumn14";
			this.gridColumn14.Visible = true;
			this.gridColumn14.VisibleIndex = 3;
			this.gridColumn14.Width = 94;
			//
			// gridColumn17
			@@ -369,7 +368,7 @@
			this.gridColumn17.MinWidth = 25;
			this.gridColumn17.Name = "gridColumn17";
			this.gridColumn17.Visible = true;
			this.gridColumn17.VisibleIndex = 4;
			this.gridColumn17.VisibleIndex = 3;
			this.gridColumn17.Width = 94;
			//
			// gridColumn18
			@@ -378,8 +377,6 @@
			this.gridColumn18.FieldName = "fStockOrgId";
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			this.gridColumn18.VisibleIndex = 5;
			this.gridColumn18.Width = 94;
			//
			// gridColumn19
			@@ -389,7 +386,7 @@
			this.gridColumn19.MinWidth = 25;
			this.gridColumn19.Name = "gridColumn19";
			this.gridColumn19.Visible = true;
			this.gridColumn19.VisibleIndex = 6;
			this.gridColumn19.VisibleIndex = 4;
			this.gridColumn19.Width = 94;
			//
			// gv_qt005
			@@ -403,7 +400,7 @@
			this.gv_qt005.OptionsColumn.AllowEdit = false;
			this.gv_qt005.Tag = "query_a.qt005";
			this.gv_qt005.Visible = true;
			this.gv_qt005.VisibleIndex = 7;
			this.gv_qt005.VisibleIndex = 5;
			this.gv_qt005.Width = 94;
			//
			// gv_qt001
			@@ -417,7 +414,7 @@
			this.gv_qt001.OptionsColumn.AllowEdit = false;
			this.gv_qt001.Tag = "query_a.qt001";
			this.gv_qt001.Visible = true;
			this.gv_qt001.VisibleIndex = 8;
			this.gv_qt001.VisibleIndex = 6;
			this.gv_qt001.Width = 200;
			//
			// gv_qt016
			@@ -431,7 +428,7 @@
			this.gv_qt016.OptionsColumn.AllowEdit = false;
			this.gv_qt016.Tag = "query_a.qt016";
			this.gv_qt016.Visible = true;
			this.gv_qt016.VisibleIndex = 9;
			this.gv_qt016.VisibleIndex = 7;
			this.gv_qt016.Width = 94;
			//
			// gv_qt002
			@@ -445,7 +442,7 @@
			this.gv_qt002.OptionsColumn.AllowEdit = false;
			this.gv_qt002.Tag = "query_a.qt002";
			this.gv_qt002.Visible = true;
			this.gv_qt002.VisibleIndex = 10;
			this.gv_qt002.VisibleIndex = 8;
			this.gv_qt002.Width = 180;
			//
			// gv_qt010
			@@ -459,7 +456,7 @@
			this.gv_qt010.OptionsColumn.AllowEdit = false;
			this.gv_qt010.Tag = "query_a.qt010";
			this.gv_qt010.Visible = true;
			this.gv_qt010.VisibleIndex = 11;
			this.gv_qt010.VisibleIndex = 9;
			this.gv_qt010.Width = 94;
			//
			// gridColumn13
			@@ -469,7 +466,7 @@
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 12;
			this.gridColumn13.VisibleIndex = 10;
			this.gridColumn13.Width = 94;
			//
			// gv18
			@@ -549,9 +546,9 @@
			// txt_fCustId
			//
			this.txt_fCustId.IsReadly = false;
			this.txt_fCustId.Location = new System.Drawing.Point(370, 44);
			this.txt_fCustId.Location = new System.Drawing.Point(365, 44);
			this.txt_fCustId.Name = "txt_fCustId";
			this.txt_fCustId.Size = new System.Drawing.Size(211, 28);
			this.txt_fCustId.Size = new System.Drawing.Size(205, 28);
			this.txt_fCustId.TabIndex = 333;
			//
			// lbGuid
			@@ -569,26 +566,26 @@
			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(497, 28);
			this.txt_remark.Size = new System.Drawing.Size(486, 28);
			this.txt_remark.StyleController = this.layoutMx1;
			this.txt_remark.TabIndex = 240;
			//
			// txt_fStockId
			//
			this.txt_fStockId.IsReadly = false;
			this.txt_fStockId.Location = new System.Drawing.Point(370, 12);
			this.txt_fStockId.Location = new System.Drawing.Point(365, 12);
			this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
			this.txt_fStockId.Name = "txt_fStockId";
			this.txt_fStockId.Size = new System.Drawing.Size(211, 28);
			this.txt_fStockId.Size = new System.Drawing.Size(205, 28);
			this.txt_fStockId.TabIndex = 301;
			//
			// txt_checkBy
			//
			this.txt_checkBy.Location = new System.Drawing.Point(944, 12);
			this.txt_checkBy.Location = new System.Drawing.Point(927, 12);
			this.txt_checkBy.Name = "txt_checkBy";
			this.txt_checkBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_checkBy.Properties.Appearance.Options.UseFont = true;
			this.txt_checkBy.Size = new System.Drawing.Size(211, 28);
			this.txt_checkBy.Size = new System.Drawing.Size(207, 28);
			this.txt_checkBy.StyleController = this.layoutMx1;
			this.txt_checkBy.TabIndex = 267;
			this.txt_checkBy.Tag = "readonly";
			@@ -598,7 +595,7 @@
			this.txt_fStockOrgId.IsReadly = false;
			this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 44);
			this.txt_fStockOrgId.Name = "txt_fStockOrgId";
			this.txt_fStockOrgId.Size = new System.Drawing.Size(210, 28);
			this.txt_fStockOrgId.Size = new System.Drawing.Size(205, 28);
			this.txt_fStockOrgId.TabIndex = 326;
			//
			// txt_billNo
			@@ -607,46 +604,46 @@
			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(210, 28);
			this.txt_billNo.Size = new System.Drawing.Size(205, 28);
			this.txt_billNo.StyleController = this.layoutMx1;
			this.txt_billNo.TabIndex = 213;
			this.txt_billNo.Tag = "readonly";
			//
			// txt_checkDate
			//
			this.txt_checkDate.Location = new System.Drawing.Point(944, 44);
			this.txt_checkDate.Location = new System.Drawing.Point(927, 44);
			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(211, 28);
			this.txt_checkDate.Size = new System.Drawing.Size(207, 28);
			this.txt_checkDate.StyleController = this.layoutMx1;
			this.txt_checkDate.TabIndex = 217;
			this.txt_checkDate.Tag = "readonly";
			//
			// txt_isCheck
			//
			this.txt_isCheck.Location = new System.Drawing.Point(872, 76);
			this.txt_isCheck.Location = new System.Drawing.Point(855, 76);
			this.txt_isCheck.Name = "txt_isCheck";
			this.txt_isCheck.Properties.Caption = "审核状态";
			this.txt_isCheck.Size = new System.Drawing.Size(283, 24);
			this.txt_isCheck.Size = new System.Drawing.Size(279, 24);
			this.txt_isCheck.StyleController = this.layoutMx1;
			this.txt_isCheck.TabIndex = 330;
			this.txt_isCheck.Tag = "readonly";
			//
			// txt_createBy
			//
			this.txt_createBy.Location = new System.Drawing.Point(657, 12);
			this.txt_createBy.Location = new System.Drawing.Point(646, 12);
			this.txt_createBy.Name = "txt_createBy";
			this.txt_createBy.Size = new System.Drawing.Size(211, 24);
			this.txt_createBy.Size = new System.Drawing.Size(205, 24);
			this.txt_createBy.StyleController = this.layoutMx1;
			this.txt_createBy.TabIndex = 331;
			this.txt_createBy.Tag = "readonly";
			//
			// txt_createDate
			//
			this.txt_createDate.Location = new System.Drawing.Point(657, 44);
			this.txt_createDate.Location = new System.Drawing.Point(646, 44);
			this.txt_createDate.Name = "txt_createDate";
			this.txt_createDate.Size = new System.Drawing.Size(211, 24);
			this.txt_createDate.Size = new System.Drawing.Size(205, 24);
			this.txt_createDate.StyleController = this.layoutMx1;
			this.txt_createDate.TabIndex = 332;
			this.txt_createDate.Tag = "readonly";
			@@ -662,10 +659,10 @@
			//
			// txt_isFinish
			//
			this.txt_isFinish.Location = new System.Drawing.Point(585, 76);
			this.txt_isFinish.Location = new System.Drawing.Point(574, 76);
			this.txt_isFinish.Name = "txt_isFinish";
			this.txt_isFinish.Properties.Caption = "完结状态";
			this.txt_isFinish.Size = new System.Drawing.Size(283, 24);
			this.txt_isFinish.Size = new System.Drawing.Size(277, 24);
			this.txt_isFinish.StyleController = this.layoutMx1;
			this.txt_isFinish.TabIndex = 335;
			this.txt_isFinish.Tag = "readonly";
			@@ -733,7 +730,7 @@
			rowDefinition1,
			rowDefinition2,
			rowDefinition3});
			this.Root.Size = new System.Drawing.Size(1167, 116);
			this.Root.Size = new System.Drawing.Size(1146, 116);
			this.Root.TextVisible = false;
			//
			// layoutControlItem1
			@@ -741,7 +738,7 @@
			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(286, 32);
			this.layoutControlItem1.Size = new System.Drawing.Size(281, 32);
			this.layoutControlItem1.Text = "申请单号";
			this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
			//
			@@ -751,39 +748,39 @@
			this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
			this.layoutControlItem4.Name = "layoutControlItem4";
			this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem4.Size = new System.Drawing.Size(286, 32);
			this.layoutControlItem4.Size = new System.Drawing.Size(281, 32);
			this.layoutControlItem4.Text = "库存组织";
			this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem9
			//
			this.layoutControlItem9.Control = this.txt_checkBy;
			this.layoutControlItem9.Location = new System.Drawing.Point(860, 0);
			this.layoutControlItem9.Location = new System.Drawing.Point(843, 0);
			this.layoutControlItem9.Name = "layoutControlItem9";
			this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem9.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem9.Size = new System.Drawing.Size(283, 32);
			this.layoutControlItem9.Text = "审核人";
			this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem10
			//
			this.layoutControlItem10.Control = this.txt_checkDate;
			this.layoutControlItem10.Location = new System.Drawing.Point(860, 32);
			this.layoutControlItem10.Location = new System.Drawing.Point(843, 32);
			this.layoutControlItem10.Name = "layoutControlItem10";
			this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem10.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem10.Size = new System.Drawing.Size(283, 32);
			this.layoutControlItem10.Text = "审核日期";
			this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem11
			//
			this.layoutControlItem11.Control = this.txt_isCheck;
			this.layoutControlItem11.Location = new System.Drawing.Point(860, 64);
			this.layoutControlItem11.Location = new System.Drawing.Point(843, 64);
			this.layoutControlItem11.Name = "layoutControlItem11";
			this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem11.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem11.Size = new System.Drawing.Size(283, 32);
			this.layoutControlItem11.Text = "审核状态";
			this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem11.TextVisible = false;
			@@ -792,42 +789,42 @@
			//
			this.layoutControlItem14.Control = this.txt_createBy;
			this.layoutControlItem14.CustomizationFormText = "申请人";
			this.layoutControlItem14.Location = new System.Drawing.Point(573, 0);
			this.layoutControlItem14.Location = new System.Drawing.Point(562, 0);
			this.layoutControlItem14.Name = "layoutControlItem14";
			this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem14.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem14.Size = new System.Drawing.Size(281, 32);
			this.layoutControlItem14.Text = "申请人";
			this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem15
			//
			this.layoutControlItem15.Control = this.txt_createDate;
			this.layoutControlItem15.Location = new System.Drawing.Point(573, 32);
			this.layoutControlItem15.Location = new System.Drawing.Point(562, 32);
			this.layoutControlItem15.Name = "layoutControlItem15";
			this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem15.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem15.Size = new System.Drawing.Size(281, 32);
			this.layoutControlItem15.Text = "申请时间";
			this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem8
			//
			this.layoutControlItem8.Control = this.txt_fStockId;
			this.layoutControlItem8.Location = new System.Drawing.Point(286, 0);
			this.layoutControlItem8.Location = new System.Drawing.Point(281, 0);
			this.layoutControlItem8.Name = "layoutControlItem8";
			this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem8.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem8.Size = new System.Drawing.Size(281, 32);
			this.layoutControlItem8.Text = "收料仓库";
			this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem3
			//
			this.layoutControlItem3.Control = this.txt_isFinish;
			this.layoutControlItem3.Location = new System.Drawing.Point(573, 64);
			this.layoutControlItem3.Location = new System.Drawing.Point(562, 64);
			this.layoutControlItem3.Name = "layoutControlItem3";
			this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem3.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem3.Size = new System.Drawing.Size(281, 32);
			this.layoutControlItem3.Text = "完结标识";
			this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem3.TextVisible = false;
			@@ -835,11 +832,11 @@
			// layoutControlItem6
			//
			this.layoutControlItem6.Control = this.txt_fCustId;
			this.layoutControlItem6.Location = new System.Drawing.Point(286, 32);
			this.layoutControlItem6.Location = new System.Drawing.Point(281, 32);
			this.layoutControlItem6.Name = "layoutControlItem6";
			this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem6.Size = new System.Drawing.Size(287, 32);
			this.layoutControlItem6.Size = new System.Drawing.Size(281, 32);
			this.layoutControlItem6.Text = "选择客户";
			this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
			//
			@@ -850,7 +847,7 @@
			this.layoutControlItem13.Name = "layoutControlItem13";
			this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
			this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem13.Size = new System.Drawing.Size(573, 32);
			this.layoutControlItem13.Size = new System.Drawing.Size(562, 32);
			this.layoutControlItem13.Text = "入库原因";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
			//
			@@ -1198,10 +1195,11 @@
			// ucBtnPrint1
			//
			this.ucBtnPrint1.guidKey = null;
			this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
			this.ucBtnPrint1.Location = new System.Drawing.Point(543, 65);
			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, 29);
			this.ucBtnPrint1.TabIndex = 230;
			//
			// lbMxGuid