From fa43bc9d26c7b9ec2b07e2d3e1a7f07abe68da5b Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 15 五月 2025 14:46:59 +0800
Subject: [PATCH] 导入

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs |  217 ++++++++++++++++++++++-------------------------------
 1 files changed, 90 insertions(+), 127 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 99ecb67..56832a2 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -54,12 +54,10 @@
             this.gv_closeStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.bandedGridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_purchaseDept = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_qtyAcceptance = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_purchaser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_qualityReq = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_settlementParty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_paymentParty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_transportMethod = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_cancellationStatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_cancellationPerson = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -75,6 +73,7 @@
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -114,7 +113,6 @@
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_erpid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1salesOrderId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1itemId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -149,7 +147,7 @@
             this.gvMx1demandDocumentLineId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -203,7 +201,6 @@
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -293,12 +290,10 @@
             this.gv_closeStatus,
             this.bandedGridColumn2,
             this.gv_purchaseDept,
-            this.gv_qtyAcceptance,
             this.gv_purchaser,
             this.gv_qualityReq,
             this.gv_settlementParty,
             this.gv_paymentParty,
-            this.gv_transportMethod,
             this.gv_remarks,
             this.gv_cancellationStatus,
             this.gv_cancellationPerson,
@@ -313,7 +308,8 @@
             this.gridColumn4,
             this.gridColumn5,
             this.gridColumn7,
-            this.gvcol6});
+            this.gvcol6,
+            this.gridColumn11});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -462,19 +458,6 @@
             this.gv_purchaseDept.VisibleIndex = 10;
             this.gv_purchaseDept.Width = 50;
             // 
-            // gv_qtyAcceptance
-            // 
-            this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true;
-            this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹";
-            this.gv_qtyAcceptance.FieldName = "qtyAcceptance";
-            this.gv_qtyAcceptance.MinWidth = 25;
-            this.gv_qtyAcceptance.Name = "gv_qtyAcceptance";
-            this.gv_qtyAcceptance.OptionsColumn.AllowEdit = false;
-            this.gv_qtyAcceptance.Tag = "query_a.QTY_ACCEPTANCE";
-            this.gv_qtyAcceptance.Visible = true;
-            this.gv_qtyAcceptance.VisibleIndex = 11;
-            this.gv_qtyAcceptance.Width = 50;
-            // 
             // gv_purchaser
             // 
             this.gv_purchaser.AppearanceCell.Options.UseFont = true;
@@ -485,20 +468,20 @@
             this.gv_purchaser.OptionsColumn.AllowEdit = false;
             this.gv_purchaser.Tag = "query_a.PURCHASER";
             this.gv_purchaser.Visible = true;
-            this.gv_purchaser.VisibleIndex = 12;
+            this.gv_purchaser.VisibleIndex = 11;
             this.gv_purchaser.Width = 60;
             // 
             // gv_qualityReq
             // 
             this.gv_qualityReq.AppearanceCell.Options.UseFont = true;
-            this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰";
-            this.gv_qualityReq.FieldName = "qualityReq";
+            this.gv_qualityReq.Caption = "楠屾敹鏂瑰紡";
+            this.gv_qualityReq.FieldName = "acctype";
             this.gv_qualityReq.MinWidth = 25;
             this.gv_qualityReq.Name = "gv_qualityReq";
             this.gv_qualityReq.OptionsColumn.AllowEdit = false;
             this.gv_qualityReq.Tag = "query_a.QUALITY_REQ";
             this.gv_qualityReq.Visible = true;
-            this.gv_qualityReq.VisibleIndex = 13;
+            this.gv_qualityReq.VisibleIndex = 12;
             this.gv_qualityReq.Width = 80;
             // 
             // gv_settlementParty
@@ -511,7 +494,7 @@
             this.gv_settlementParty.OptionsColumn.AllowEdit = false;
             this.gv_settlementParty.Tag = "query_a.SETTLEMENT_PARTY";
             this.gv_settlementParty.Visible = true;
-            this.gv_settlementParty.VisibleIndex = 14;
+            this.gv_settlementParty.VisibleIndex = 13;
             this.gv_settlementParty.Width = 100;
             // 
             // gv_paymentParty
@@ -524,21 +507,8 @@
             this.gv_paymentParty.OptionsColumn.AllowEdit = false;
             this.gv_paymentParty.Tag = "query_a.PAYMENT_PARTY";
             this.gv_paymentParty.Visible = true;
-            this.gv_paymentParty.VisibleIndex = 15;
+            this.gv_paymentParty.VisibleIndex = 14;
             this.gv_paymentParty.Width = 100;
-            // 
-            // gv_transportMethod
-            // 
-            this.gv_transportMethod.AppearanceCell.Options.UseFont = true;
-            this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡";
-            this.gv_transportMethod.FieldName = "transportMethod";
-            this.gv_transportMethod.MinWidth = 25;
-            this.gv_transportMethod.Name = "gv_transportMethod";
-            this.gv_transportMethod.OptionsColumn.AllowEdit = false;
-            this.gv_transportMethod.Tag = "query_a.TRANSPORT_METHOD";
-            this.gv_transportMethod.Visible = true;
-            this.gv_transportMethod.VisibleIndex = 16;
-            this.gv_transportMethod.Width = 100;
             // 
             // gv_remarks
             // 
@@ -550,7 +520,7 @@
             this.gv_remarks.OptionsColumn.AllowEdit = false;
             this.gv_remarks.Tag = "query_a.REMARKS";
             this.gv_remarks.Visible = true;
-            this.gv_remarks.VisibleIndex = 17;
+            this.gv_remarks.VisibleIndex = 15;
             this.gv_remarks.Width = 100;
             // 
             // gv_cancellationStatus
@@ -563,7 +533,7 @@
             this.gv_cancellationStatus.OptionsColumn.AllowEdit = false;
             this.gv_cancellationStatus.Tag = "query_a.CANCELLATION_STATUS";
             this.gv_cancellationStatus.Visible = true;
-            this.gv_cancellationStatus.VisibleIndex = 18;
+            this.gv_cancellationStatus.VisibleIndex = 16;
             this.gv_cancellationStatus.Width = 60;
             // 
             // gv_cancellationPerson
@@ -576,7 +546,7 @@
             this.gv_cancellationPerson.OptionsColumn.AllowEdit = false;
             this.gv_cancellationPerson.Tag = "query_a.CANCELLATION_PERSON";
             this.gv_cancellationPerson.Visible = true;
-            this.gv_cancellationPerson.VisibleIndex = 19;
+            this.gv_cancellationPerson.VisibleIndex = 17;
             this.gv_cancellationPerson.Width = 60;
             // 
             // gv_cancellationDate
@@ -589,7 +559,7 @@
             this.gv_cancellationDate.OptionsColumn.AllowEdit = false;
             this.gv_cancellationDate.Tag = "query_a.CANCELLATION_DATE";
             this.gv_cancellationDate.Visible = true;
-            this.gv_cancellationDate.VisibleIndex = 20;
+            this.gv_cancellationDate.VisibleIndex = 18;
             this.gv_cancellationDate.Width = 180;
             // 
             // gv_createBy
@@ -602,7 +572,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.CREATE_BY";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 21;
+            this.gv_createBy.VisibleIndex = 19;
             this.gv_createBy.Width = 80;
             // 
             // gv_createDate
@@ -615,7 +585,7 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.CREATE_DATE";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 22;
+            this.gv_createDate.VisibleIndex = 20;
             this.gv_createDate.Width = 180;
             // 
             // gv_lastupdateDate
@@ -628,7 +598,7 @@
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
             this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 23;
+            this.gv_lastupdateDate.VisibleIndex = 21;
             this.gv_lastupdateDate.Width = 200;
             // 
             // gv_lastupdateBy
@@ -641,7 +611,7 @@
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
             this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 24;
+            this.gv_lastupdateBy.VisibleIndex = 22;
             this.gv_lastupdateBy.Width = 100;
             // 
             // gv_erpCheckBy
@@ -654,7 +624,7 @@
             this.gv_erpCheckBy.OptionsColumn.AllowEdit = false;
             this.gv_erpCheckBy.Tag = "query_a.ERP_CHECK_BY";
             this.gv_erpCheckBy.Visible = true;
-            this.gv_erpCheckBy.VisibleIndex = 25;
+            this.gv_erpCheckBy.VisibleIndex = 23;
             this.gv_erpCheckBy.Width = 80;
             // 
             // gv_erpCheckDate
@@ -667,7 +637,7 @@
             this.gv_erpCheckDate.OptionsColumn.AllowEdit = false;
             this.gv_erpCheckDate.Tag = "query_a.ERP_CHECK_DATE";
             this.gv_erpCheckDate.Visible = true;
-            this.gv_erpCheckDate.VisibleIndex = 26;
+            this.gv_erpCheckDate.VisibleIndex = 24;
             this.gv_erpCheckDate.Width = 180;
             // 
             // gv_changereason
@@ -680,7 +650,7 @@
             this.gv_changereason.OptionsColumn.AllowEdit = false;
             this.gv_changereason.Tag = "query_a.CHANGEREASON";
             this.gv_changereason.Visible = true;
-            this.gv_changereason.VisibleIndex = 27;
+            this.gv_changereason.VisibleIndex = 25;
             this.gv_changereason.Width = 100;
             // 
             // gridColumn4
@@ -690,7 +660,7 @@
             this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 28;
+            this.gridColumn4.VisibleIndex = 26;
             this.gridColumn4.Width = 94;
             // 
             // gridColumn5
@@ -700,7 +670,7 @@
             this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 29;
+            this.gridColumn5.VisibleIndex = 27;
             this.gridColumn5.Width = 94;
             // 
             // gridColumn7
@@ -710,7 +680,7 @@
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 30;
+            this.gridColumn7.VisibleIndex = 28;
             this.gridColumn7.Width = 94;
             // 
             // gvcol6
@@ -720,6 +690,16 @@
             this.gvcol6.MinWidth = 25;
             this.gvcol6.Name = "gvcol6";
             this.gvcol6.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "鍚屾鏃堕棿";
+            this.gridColumn11.FieldName = "synchronousDate";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 29;
+            this.gridColumn11.Width = 94;
             // 
             // pageBar1
             // 
@@ -801,7 +781,7 @@
             this.txt_billNo.Location = new System.Drawing.Point(109, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(229, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(234, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             // 
@@ -815,41 +795,41 @@
             // 
             // txt_suppName
             // 
-            this.txt_suppName.Location = new System.Drawing.Point(769, 12);
+            this.txt_suppName.Location = new System.Drawing.Point(780, 12);
             this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Size = new System.Drawing.Size(229, 24);
+            this.txt_suppName.Size = new System.Drawing.Size(235, 24);
             this.txt_suppName.StyleController = this.layoutMx1;
             this.txt_suppName.TabIndex = 231;
             // 
             // txt_documentTypeTxt
             // 
-            this.txt_documentTypeTxt.Location = new System.Drawing.Point(439, 12);
+            this.txt_documentTypeTxt.Location = new System.Drawing.Point(444, 12);
             this.txt_documentTypeTxt.Name = "txt_documentTypeTxt";
-            this.txt_documentTypeTxt.Size = new System.Drawing.Size(229, 24);
+            this.txt_documentTypeTxt.Size = new System.Drawing.Size(235, 24);
             this.txt_documentTypeTxt.StyleController = this.layoutMx1;
             this.txt_documentTypeTxt.TabIndex = 232;
             // 
             // txt_suppNo
             // 
-            this.txt_suppNo.Location = new System.Drawing.Point(769, 40);
+            this.txt_suppNo.Location = new System.Drawing.Point(780, 40);
             this.txt_suppNo.Name = "txt_suppNo";
-            this.txt_suppNo.Size = new System.Drawing.Size(229, 24);
+            this.txt_suppNo.Size = new System.Drawing.Size(235, 24);
             this.txt_suppNo.StyleController = this.layoutMx1;
             this.txt_suppNo.TabIndex = 233;
             // 
             // txt_closeStatusTxt
             // 
-            this.txt_closeStatusTxt.Location = new System.Drawing.Point(1099, 40);
+            this.txt_closeStatusTxt.Location = new System.Drawing.Point(1116, 40);
             this.txt_closeStatusTxt.Name = "txt_closeStatusTxt";
-            this.txt_closeStatusTxt.Size = new System.Drawing.Size(231, 24);
+            this.txt_closeStatusTxt.Size = new System.Drawing.Size(235, 24);
             this.txt_closeStatusTxt.StyleController = this.layoutMx1;
             this.txt_closeStatusTxt.TabIndex = 234;
             // 
             // txt_cancellationStatusTxt
             // 
-            this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1099, 68);
+            this.txt_cancellationStatusTxt.Location = new System.Drawing.Point(1116, 68);
             this.txt_cancellationStatusTxt.Name = "txt_cancellationStatusTxt";
-            this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(231, 24);
+            this.txt_cancellationStatusTxt.Size = new System.Drawing.Size(235, 24);
             this.txt_cancellationStatusTxt.StyleController = this.layoutMx1;
             this.txt_cancellationStatusTxt.TabIndex = 235;
             // 
@@ -857,39 +837,39 @@
             // 
             this.txt_dptName.Location = new System.Drawing.Point(109, 40);
             this.txt_dptName.Name = "txt_dptName";
-            this.txt_dptName.Size = new System.Drawing.Size(229, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(234, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 236;
             // 
             // txt_purchaseDate
             // 
-            this.txt_purchaseDate.Location = new System.Drawing.Point(439, 40);
+            this.txt_purchaseDate.Location = new System.Drawing.Point(444, 40);
             this.txt_purchaseDate.Name = "txt_purchaseDate";
-            this.txt_purchaseDate.Size = new System.Drawing.Size(229, 24);
+            this.txt_purchaseDate.Size = new System.Drawing.Size(235, 24);
             this.txt_purchaseDate.StyleController = this.layoutMx1;
             this.txt_purchaseDate.TabIndex = 237;
             // 
             // txt_docStusTxt
             // 
-            this.txt_docStusTxt.Location = new System.Drawing.Point(1099, 12);
+            this.txt_docStusTxt.Location = new System.Drawing.Point(1116, 12);
             this.txt_docStusTxt.Name = "txt_docStusTxt";
-            this.txt_docStusTxt.Size = new System.Drawing.Size(231, 24);
+            this.txt_docStusTxt.Size = new System.Drawing.Size(235, 24);
             this.txt_docStusTxt.StyleController = this.layoutMx1;
             this.txt_docStusTxt.TabIndex = 238;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(769, 68);
+            this.txt_createDate.Location = new System.Drawing.Point(780, 68);
             this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Size = new System.Drawing.Size(229, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(235, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 239;
             // 
             // txt_erpCheckDate
             // 
-            this.txt_erpCheckDate.Location = new System.Drawing.Point(439, 68);
+            this.txt_erpCheckDate.Location = new System.Drawing.Point(444, 68);
             this.txt_erpCheckDate.Name = "txt_erpCheckDate";
-            this.txt_erpCheckDate.Size = new System.Drawing.Size(229, 24);
+            this.txt_erpCheckDate.Size = new System.Drawing.Size(235, 24);
             this.txt_erpCheckDate.StyleController = this.layoutMx1;
             this.txt_erpCheckDate.TabIndex = 240;
             // 
@@ -897,7 +877,7 @@
             // 
             this.txt_erpCheckBy.Location = new System.Drawing.Point(109, 68);
             this.txt_erpCheckBy.Name = "txt_erpCheckBy";
-            this.txt_erpCheckBy.Size = new System.Drawing.Size(229, 24);
+            this.txt_erpCheckBy.Size = new System.Drawing.Size(234, 24);
             this.txt_erpCheckBy.StyleController = this.layoutMx1;
             this.txt_erpCheckBy.TabIndex = 241;
             // 
@@ -964,7 +944,7 @@
             rowDefinition1,
             rowDefinition2,
             rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1342, 104);
+            this.Root.Size = new System.Drawing.Size(1363, 104);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -972,38 +952,38 @@
             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(330, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(335, 28);
             this.layoutControlItem1.Text = "閲囪喘鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_documentTypeTxt;
-            this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(335, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem5.Text = "鍗曟嵁绫诲瀷";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_suppName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(671, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_suppNo;
-            this.layoutControlItem6.Location = new System.Drawing.Point(660, 28);
+            this.layoutControlItem6.Location = new System.Drawing.Point(671, 28);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem6.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem6.Text = "渚涘簲鍟嗙紪鍙�";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(85, 18);
             // 
@@ -1013,72 +993,72 @@
             this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(335, 28);
             this.layoutControlItem9.Text = "閲囪喘閮ㄩ棬";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_purchaseDate;
-            this.layoutControlItem10.Location = new System.Drawing.Point(330, 28);
+            this.layoutControlItem10.Location = new System.Drawing.Point(335, 28);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem10.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem10.Text = "閲囪喘鏃ユ湡";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_cancellationStatusTxt;
-            this.layoutControlItem8.Location = new System.Drawing.Point(990, 56);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1007, 56);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem8.Text = "浣滃簾鐘舵��";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_closeStatusTxt;
-            this.layoutControlItem7.Location = new System.Drawing.Point(990, 28);
+            this.layoutControlItem7.Location = new System.Drawing.Point(1007, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem7.Text = "鍏抽棴鐘舵��";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_docStusTxt;
-            this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
+            this.layoutControlItem11.Location = new System.Drawing.Point(1007, 0);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem11.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem11.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem11.Text = "鍗曟嵁鐘舵��";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_createDate;
-            this.layoutControlItem12.Location = new System.Drawing.Point(660, 56);
+            this.layoutControlItem12.Location = new System.Drawing.Point(671, 56);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem12.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem12.Text = "鍚屾鏃堕棿";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(85, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_erpCheckDate;
-            this.layoutControlItem13.Location = new System.Drawing.Point(330, 56);
+            this.layoutControlItem13.Location = new System.Drawing.Point(335, 56);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem13.Size = new System.Drawing.Size(336, 28);
             this.layoutControlItem13.Text = "ERP瀹℃牳鏃堕棿";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(85, 18);
             // 
@@ -1088,7 +1068,7 @@
             this.layoutControlItem14.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem14.Size = new System.Drawing.Size(335, 28);
             this.layoutControlItem14.Text = "ERP瀹℃牳浜�";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(85, 18);
             // 
@@ -1129,7 +1109,6 @@
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn3,
             this.gv_erpid,
-            this.gvMx1salesOrderId,
             this.gvMx1itemId,
             this.gridColumn2,
             this.gridColumn1,
@@ -1163,7 +1142,8 @@
             this.gvMx1changeFlag,
             this.gvMx1demandDocumentLineId,
             this.gridColumn6,
-            this.gridColumn8});
+            this.gridColumn8,
+            this.gridColumn9});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1189,18 +1169,6 @@
             this.gv_erpid.Visible = true;
             this.gv_erpid.VisibleIndex = 1;
             this.gv_erpid.Width = 46;
-            // 
-            // gvMx1salesOrderId
-            // 
-            this.gvMx1salesOrderId.AppearanceCell.Options.UseFont = true;
-            this.gvMx1salesOrderId.Caption = "閿�鍞鍗曞彿";
-            this.gvMx1salesOrderId.FieldName = "salesOrderId";
-            this.gvMx1salesOrderId.MinWidth = 25;
-            this.gvMx1salesOrderId.Name = "gvMx1salesOrderId";
-            this.gvMx1salesOrderId.Tag = "query_a.SALES_ORDER_ID";
-            this.gvMx1salesOrderId.Visible = true;
-            this.gvMx1salesOrderId.VisibleIndex = 28;
-            this.gvMx1salesOrderId.Width = 69;
             // 
             // gvMx1itemId
             // 
@@ -1583,26 +1551,24 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 29;
+            this.gridColumn8.VisibleIndex = 28;
             this.gridColumn8.Width = 43;
             // 
-            // picCheckBox
+            // gridColumn9
             // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(844, 55);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 229;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
+            this.gridColumn9.Caption = "濮斿璁㈠崟缂栧彿";
+            this.gridColumn9.FieldName = "outsourcingOrderId";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 29;
+            this.gridColumn9.Width = 94;
             // 
             // Frm_MesRohIn
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1365, 682);
-            this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesRohIn";
@@ -1659,14 +1625,12 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraEditors.SplitContainerControl split1;
         private DevExpress.XtraGrid.GridControl gcMain1;
@@ -1682,12 +1646,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_closeStatus;
         private DevExpress.XtraGrid.Columns.GridColumn bandedGridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gv_purchaseDept;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_qtyAcceptance;
         private DevExpress.XtraGrid.Columns.GridColumn gv_purchaser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_qualityReq;
         private DevExpress.XtraGrid.Columns.GridColumn gv_settlementParty;
         private DevExpress.XtraGrid.Columns.GridColumn gv_paymentParty;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_transportMethod;
         private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationStatus;
         private DevExpress.XtraGrid.Columns.GridColumn gv_cancellationPerson;
@@ -1715,7 +1677,6 @@
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1salesOrderId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemId;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
@@ -1778,5 +1739,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3