From 236874a930147c27e46c673d8c1a607f1260e8aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 31 三月 2025 12:43:43 +0800
Subject: [PATCH] 追溯码

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs |  294 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 154 insertions(+), 140 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 1a7b004..360c564 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -67,13 +67,11 @@
             this.gv_lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_erpCheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_erpCheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_checkFalg = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_changereason = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvcol6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -81,10 +79,12 @@
             this.lbGuid = new DevExpress.XtraEditors.LabelControl();
             this.txt_supplier = new Gs.DevApp.UserControl.UcLookSupplier();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -124,6 +124,8 @@
             this.gvMx1planTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1changeFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             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();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -145,10 +147,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -161,6 +165,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;
@@ -214,7 +219,7 @@
             // 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";
@@ -228,7 +233,7 @@
             this.gridView1.Appearance.HeaderPanel.Options.UseFont = true;
             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 = 30;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -259,13 +264,11 @@
             this.gv_lastupdateBy,
             this.gv_erpCheckBy,
             this.gv_erpCheckDate,
-            this.gv_checkDate,
-            this.gv_checkBy,
-            this.gv_checkFalg,
             this.gv_changereason,
             this.gridColumn4,
             this.gridColumn5,
-            this.gridColumn7});
+            this.gridColumn7,
+            this.gvcol6});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -288,7 +291,7 @@
             // 
             // 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";
@@ -302,7 +305,7 @@
             // 
             // gv_documentStatus
             // 
-            this.gv_documentStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gv_documentStatus.AppearanceCell.Options.UseFont = true;
             this.gv_documentStatus.Caption = "鍗曟嵁鐘舵��";
             this.gv_documentStatus.FieldName = "docStusTxt";
@@ -316,7 +319,7 @@
             // 
             // gv_documentType
             // 
-            this.gv_documentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gv_documentType.AppearanceCell.Options.UseFont = true;
             this.gv_documentType.Caption = "鍗曟嵁绫诲瀷";
             this.gv_documentType.FieldName = "documentTypeTxt";
@@ -330,7 +333,7 @@
             // 
             // gv_businessType
             // 
-            this.gv_businessType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_businessType.AppearanceCell.Options.UseFont = true;
             this.gv_businessType.Caption = "涓氬姟绫诲瀷";
             this.gv_businessType.FieldName = "businessType2";
@@ -344,7 +347,7 @@
             // 
             // gv_purchaseDate
             // 
-            this.gv_purchaseDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+          
             this.gv_purchaseDate.AppearanceCell.Options.UseFont = true;
             this.gv_purchaseDate.Caption = "閲囪喘鏃ユ湡";
             this.gv_purchaseDate.FieldName = "purchaseDate";
@@ -370,7 +373,7 @@
             // 
             // gv_supplier
             // 
-            this.gv_supplier.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gv_supplier.AppearanceCell.Options.UseFont = true;
             this.gv_supplier.Caption = "渚涘簲鍟嗙紪鍙�";
             this.gv_supplier.FieldName = "suppNo";
@@ -384,7 +387,7 @@
             // 
             // gv_closeStatus
             // 
-            this.gv_closeStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_closeStatus.AppearanceCell.Options.UseFont = true;
             this.gv_closeStatus.Caption = "鍏抽棴鐘舵��";
             this.gv_closeStatus.FieldName = "closeStatusTxt";
@@ -410,9 +413,9 @@
             // 
             // gv_purchaseDept
             // 
-            this.gv_purchaseDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_purchaseDept.AppearanceCell.Options.UseFont = true;
-            this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬";
+            this.gv_purchaseDept.Caption = "閲囪喘閮ㄩ棬缂栧彿";
             this.gv_purchaseDept.FieldName = "departmentcode";
             this.gv_purchaseDept.MinWidth = 25;
             this.gv_purchaseDept.Name = "gv_purchaseDept";
@@ -424,7 +427,7 @@
             // 
             // gv_qtyAcceptance
             // 
-            this.gv_qtyAcceptance.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_qtyAcceptance.AppearanceCell.Options.UseFont = true;
             this.gv_qtyAcceptance.Caption = "鏁伴噺楠屾敹";
             this.gv_qtyAcceptance.FieldName = "qtyAcceptance";
@@ -438,7 +441,7 @@
             // 
             // gv_purchaser
             // 
-            this.gv_purchaser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+          
             this.gv_purchaser.AppearanceCell.Options.UseFont = true;
             this.gv_purchaser.Caption = "閲囪喘鍛�";
             this.gv_purchaser.FieldName = "purchaser";
@@ -452,7 +455,7 @@
             // 
             // gv_qualityReq
             // 
-            this.gv_qualityReq.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_qualityReq.AppearanceCell.Options.UseFont = true;
             this.gv_qualityReq.Caption = "璐ㄩ噺瑕佹眰";
             this.gv_qualityReq.FieldName = "qualityReq";
@@ -466,7 +469,7 @@
             // 
             // gv_settlementParty
             // 
-            this.gv_settlementParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gv_settlementParty.AppearanceCell.Options.UseFont = true;
             this.gv_settlementParty.Caption = "缁撶畻鏂�";
             this.gv_settlementParty.FieldName = "settlementParty";
@@ -480,7 +483,7 @@
             // 
             // gv_paymentParty
             // 
-            this.gv_paymentParty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_paymentParty.AppearanceCell.Options.UseFont = true;
             this.gv_paymentParty.Caption = "鏀舵鏂�";
             this.gv_paymentParty.FieldName = "paymentParty";
@@ -494,7 +497,7 @@
             // 
             // gv_transportMethod
             // 
-            this.gv_transportMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+      
             this.gv_transportMethod.AppearanceCell.Options.UseFont = true;
             this.gv_transportMethod.Caption = "杩愯緭鏂瑰紡";
             this.gv_transportMethod.FieldName = "transportMethod";
@@ -508,7 +511,7 @@
             // 
             // gv_remarks
             // 
-            this.gv_remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_remarks.AppearanceCell.Options.UseFont = true;
             this.gv_remarks.Caption = "澶囨敞";
             this.gv_remarks.FieldName = "remarks";
@@ -522,7 +525,7 @@
             // 
             // gv_cancellationStatus
             // 
-            this.gv_cancellationStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+          
             this.gv_cancellationStatus.AppearanceCell.Options.UseFont = true;
             this.gv_cancellationStatus.Caption = "浣滃簾鐘舵��";
             this.gv_cancellationStatus.FieldName = "cancellationStatusTxt";
@@ -536,7 +539,7 @@
             // 
             // gv_cancellationPerson
             // 
-            this.gv_cancellationPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+          
             this.gv_cancellationPerson.AppearanceCell.Options.UseFont = true;
             this.gv_cancellationPerson.Caption = "浣滃簾浜�";
             this.gv_cancellationPerson.FieldName = "cancellationPerson";
@@ -550,7 +553,7 @@
             // 
             // gv_cancellationDate
             // 
-            this.gv_cancellationDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_cancellationDate.AppearanceCell.Options.UseFont = true;
             this.gv_cancellationDate.Caption = "浣滃簾鏃ユ湡";
             this.gv_cancellationDate.FieldName = "cancellationDate";
@@ -564,7 +567,7 @@
             // 
             // 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";
@@ -578,7 +581,7 @@
             // 
             // gv_createDate
             // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃ユ湡";
             this.gv_createDate.FieldName = "createDate";
@@ -592,7 +595,7 @@
             // 
             // gv_lastupdateDate
             // 
-            this.gv_lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏈�鍚庝慨鏀规椂闂�";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
@@ -606,7 +609,7 @@
             // 
             // gv_lastupdateBy
             // 
-            this.gv_lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gv_lastupdateBy.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateBy.Caption = "鏈�鍚庝慨鏀逛汉";
             this.gv_lastupdateBy.FieldName = "lastupdateBy";
@@ -620,7 +623,7 @@
             // 
             // gv_erpCheckBy
             // 
-            this.gv_erpCheckBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+             
             this.gv_erpCheckBy.AppearanceCell.Options.UseFont = true;
             this.gv_erpCheckBy.Caption = "erp瀹℃牳浜�";
             this.gv_erpCheckBy.FieldName = "erpCheckBy";
@@ -634,7 +637,7 @@
             // 
             // gv_erpCheckDate
             // 
-            this.gv_erpCheckDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+         
             this.gv_erpCheckDate.AppearanceCell.Options.UseFont = true;
             this.gv_erpCheckDate.Caption = "erp瀹℃牳鏃堕棿";
             this.gv_erpCheckDate.FieldName = "erpCheckDate";
@@ -646,51 +649,9 @@
             this.gv_erpCheckDate.VisibleIndex = 26;
             this.gv_erpCheckDate.Width = 180;
             // 
-            // 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";
-            this.gv_checkDate.MinWidth = 25;
-            this.gv_checkDate.Name = "gv_checkDate";
-            this.gv_checkDate.OptionsColumn.AllowEdit = false;
-            this.gv_checkDate.Tag = "query_a.CHECK_DATE";
-            this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 27;
-            this.gv_checkDate.Width = 120;
-            // 
-            // gv_checkBy
-            // 
-            this.gv_checkBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkBy.AppearanceCell.Options.UseFont = true;
-            this.gv_checkBy.Caption = "瀹℃牳浜�";
-            this.gv_checkBy.FieldName = "checkBy";
-            this.gv_checkBy.MinWidth = 25;
-            this.gv_checkBy.Name = "gv_checkBy";
-            this.gv_checkBy.OptionsColumn.AllowEdit = false;
-            this.gv_checkBy.Tag = "query_a.CHECK_BY";
-            this.gv_checkBy.Visible = true;
-            this.gv_checkBy.VisibleIndex = 28;
-            this.gv_checkBy.Width = 100;
-            // 
-            // gv_checkFalg
-            // 
-            this.gv_checkFalg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_checkFalg.AppearanceCell.Options.UseFont = true;
-            this.gv_checkFalg.Caption = "瀹℃牳鏍囪瘑";
-            this.gv_checkFalg.FieldName = "checkFalg";
-            this.gv_checkFalg.MinWidth = 25;
-            this.gv_checkFalg.Name = "gv_checkFalg";
-            this.gv_checkFalg.OptionsColumn.AllowEdit = false;
-            this.gv_checkFalg.Tag = "query_a.CHECK_FALG";
-            this.gv_checkFalg.Visible = true;
-            this.gv_checkFalg.VisibleIndex = 29;
-            this.gv_checkFalg.Width = 100;
-            // 
             // gv_changereason
             // 
-            this.gv_changereason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gv_changereason.AppearanceCell.Options.UseFont = true;
             this.gv_changereason.Caption = "鍙樻洿鍘熷洜";
             this.gv_changereason.FieldName = "changereason";
@@ -699,7 +660,7 @@
             this.gv_changereason.OptionsColumn.AllowEdit = false;
             this.gv_changereason.Tag = "query_a.CHANGEREASON";
             this.gv_changereason.Visible = true;
-            this.gv_changereason.VisibleIndex = 30;
+            this.gv_changereason.VisibleIndex = 27;
             this.gv_changereason.Width = 100;
             // 
             // gridColumn4
@@ -709,7 +670,7 @@
             this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 31;
+            this.gridColumn4.VisibleIndex = 28;
             this.gridColumn4.Width = 94;
             // 
             // gridColumn5
@@ -719,7 +680,7 @@
             this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 32;
+            this.gridColumn5.VisibleIndex = 29;
             this.gridColumn5.Width = 94;
             // 
             // gridColumn7
@@ -729,8 +690,16 @@
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 33;
+            this.gridColumn7.VisibleIndex = 30;
             this.gridColumn7.Width = 94;
+            // 
+            // gvcol6
+            // 
+            this.gvcol6.Caption = "涓婚敭GUID";
+            this.gvcol6.FieldName = "guid";
+            this.gvcol6.MinWidth = 25;
+            this.gvcol6.Name = "gvcol6";
+            this.gvcol6.Width = 94;
             // 
             // pageBar1
             // 
@@ -776,7 +745,11 @@
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_supplier);
             this.layoutMx1.Controls.Add(this.txt_billNo);
+            this.layoutMx1.Controls.Add(this.txt_guid);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem4,
+            this.layoutControlItem3});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 0, 812, 500);
@@ -799,21 +772,50 @@
             // txt_supplier
             // 
             this.txt_supplier.IsReadly = false;
-            this.txt_supplier.Location = new System.Drawing.Point(429, 12);
+            this.txt_supplier.Location = new System.Drawing.Point(434, 12);
             this.txt_supplier.Margin = new System.Windows.Forms.Padding(0);
             this.txt_supplier.Name = "txt_supplier";
-            this.txt_supplier.Size = new System.Drawing.Size(239, 28);
+            this.txt_supplier.Size = new System.Drawing.Size(245, 28);
             this.txt_supplier.TabIndex = 227;
             // 
             // txt_billNo
             // 
             this.txt_billNo.Location = new System.Drawing.Point(99, 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(239, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(244, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
+            // 
+            // txt_guid
+            // 
+            this.txt_guid.Location = new System.Drawing.Point(1089, 12);
+            this.txt_guid.Name = "txt_guid";
+            this.txt_guid.Size = new System.Drawing.Size(241, 24);
+            this.txt_guid.StyleController = this.layoutMx1;
+            this.txt_guid.TabIndex = 229;
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_guid;
+            this.layoutControlItem4.Location = new System.Drawing.Point(990, 0);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem4.Size = new System.Drawing.Size(332, 32);
+            this.layoutControlItem4.Text = "涓婚敭GUID";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.lbGuid;
+            this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem3.Text = "lbGuid";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem3.TextVisible = false;
             // 
             // Root
             // 
@@ -821,8 +823,7 @@
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
-            this.layoutControlItem2,
-            this.layoutControlItem3});
+            this.layoutControlItem2});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -842,7 +843,7 @@
             rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1});
-            this.Root.Size = new System.Drawing.Size(1342, 52);
+            this.Root.Size = new System.Drawing.Size(1363, 52);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -850,30 +851,19 @@
             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, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(335, 32);
             this.layoutControlItem1.Text = "閲囪喘鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_supplier;
-            this.layoutControlItem2.Location = new System.Drawing.Point(330, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(335, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(336, 32);
             this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.lbGuid;
-            this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(330, 32);
-            this.layoutControlItem3.Text = "lbGuid";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem3.TextVisible = false;
             // 
             // tabMx
             // 
@@ -944,7 +934,9 @@
             this.gvMx1sourceDocumentType,
             this.gvMx1planTrackingId,
             this.gvMx1changeFlag,
-            this.gvMx1demandDocumentLineId});
+            this.gvMx1demandDocumentLineId,
+            this.gridColumn6,
+            this.gridColumn8});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -973,7 +965,7 @@
             // 
             // gvMx1salesOrderId
             // 
-            this.gvMx1salesOrderId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1salesOrderId.AppearanceCell.Options.UseFont = true;
             this.gvMx1salesOrderId.Caption = "閿�鍞鍗曞彿";
             this.gvMx1salesOrderId.FieldName = "salesOrderId";
@@ -986,7 +978,7 @@
             // 
             // gvMx1itemId
             // 
-            this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+         
             this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemId.Caption = "鐗╂枡ID";
             this.gvMx1itemId.FieldName = "itemId";
@@ -1017,7 +1009,7 @@
             // 
             // gvMx1businessTerminate
             // 
-            this.gvMx1businessTerminate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1businessTerminate.AppearanceCell.Options.UseFont = true;
             this.gvMx1businessTerminate.Caption = "涓氬姟鐘舵��";
             this.gvMx1businessTerminate.FieldName = "businessTerminate";
@@ -1030,7 +1022,7 @@
             // 
             // gvMx1pricingQty
             // 
-            this.gvMx1pricingQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1pricingQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1pricingQty.Caption = "璁′环鏁伴噺";
             this.gvMx1pricingQty.FieldName = "pricingQty";
@@ -1043,7 +1035,7 @@
             // 
             // gvMx1pricingUnit
             // 
-            this.gvMx1pricingUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1pricingUnit.AppearanceCell.Options.UseFont = true;
             this.gvMx1pricingUnit.Caption = "璁′环鍗曚綅";
             this.gvMx1pricingUnit.FieldName = "jjFname";
@@ -1056,7 +1048,7 @@
             // 
             // gvMx1deliveryDate
             // 
-            this.gvMx1deliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+          
             this.gvMx1deliveryDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1deliveryDate.Caption = "浜よ揣鏃ユ湡";
             this.gvMx1deliveryDate.FieldName = "deliveryDate";
@@ -1069,7 +1061,7 @@
             // 
             // gvMx1earliestDeliveryDate
             // 
-            this.gvMx1earliestDeliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1earliestDeliveryDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1earliestDeliveryDate.Caption = "鏈�鏃╀氦璐ф棩鏈�";
             this.gvMx1earliestDeliveryDate.FieldName = "earliestDeliveryDate";
@@ -1082,7 +1074,7 @@
             // 
             // gvMx1latestDeliveryDate
             // 
-            this.gvMx1latestDeliveryDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1latestDeliveryDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1latestDeliveryDate.Caption = "鏈�鏅氫氦璐ф棩鏈�";
             this.gvMx1latestDeliveryDate.FieldName = "latestDeliveryDate";
@@ -1095,7 +1087,7 @@
             // 
             // gvMx1purchaseQty
             // 
-            this.gvMx1purchaseQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1purchaseQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1purchaseQty.Caption = "閲囪喘鏁伴噺";
             this.gvMx1purchaseQty.FieldName = "purchaseQty";
@@ -1108,7 +1100,7 @@
             // 
             // gvMx1purchaseUnit
             // 
-            this.gvMx1purchaseUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1purchaseUnit.AppearanceCell.Options.UseFont = true;
             this.gvMx1purchaseUnit.Caption = "閲囪喘鍗曚綅";
             this.gvMx1purchaseUnit.FieldName = "cgFname";
@@ -1121,7 +1113,7 @@
             // 
             // gvMx1remainingReceivedQty
             // 
-            this.gvMx1remainingReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1remainingReceivedQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1remainingReceivedQty.Caption = "鍓╀綑鏀惰揣鏁伴噺";
             this.gvMx1remainingReceivedQty.FieldName = "remainingReceivedQty";
@@ -1134,7 +1126,7 @@
             // 
             // gvMx1inventoryUnit
             // 
-            this.gvMx1inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true;
             this.gvMx1inventoryUnit.Caption = "搴撳瓨鍗曚綅";
             this.gvMx1inventoryUnit.FieldName = "kcFname";
@@ -1147,7 +1139,7 @@
             // 
             // gvMx1demandDocumentId
             // 
-            this.gvMx1demandDocumentId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1demandDocumentId.AppearanceCell.Options.UseFont = true;
             this.gvMx1demandDocumentId.Caption = "闇�姹傚崟鎹彿";
             this.gvMx1demandDocumentId.FieldName = "demandDocumentId";
@@ -1160,7 +1152,7 @@
             // 
             // gvMx1isGift
             // 
-            this.gvMx1isGift.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1isGift.AppearanceCell.Options.UseFont = true;
             this.gvMx1isGift.Caption = "鏄惁璧犲搧";
             this.gvMx1isGift.FieldName = "isGift";
@@ -1173,7 +1165,7 @@
             // 
             // gvMx1remarks
             // 
-            this.gvMx1remarks.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1remarks.AppearanceCell.Options.UseFont = true;
             this.gvMx1remarks.Caption = "澶囨敞";
             this.gvMx1remarks.FieldName = "remarks";
@@ -1186,7 +1178,7 @@
             // 
             // gvMx1businessClose
             // 
-            this.gvMx1businessClose.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1businessClose.AppearanceCell.Options.UseFont = true;
             this.gvMx1businessClose.Caption = "鍏抽棴鐘舵��";
             this.gvMx1businessClose.FieldName = "businessClose";
@@ -1199,7 +1191,7 @@
             // 
             // gvMx1businessFreeze
             // 
-            this.gvMx1businessFreeze.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1businessFreeze.AppearanceCell.Options.UseFont = true;
             this.gvMx1businessFreeze.Caption = "鍐荤粨鐘舵��";
             this.gvMx1businessFreeze.FieldName = "businessFreeze";
@@ -1212,7 +1204,7 @@
             // 
             // gvMx1freezer
             // 
-            this.gvMx1freezer.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1freezer.AppearanceCell.Options.UseFont = true;
             this.gvMx1freezer.Caption = "鍐荤粨浜�";
             this.gvMx1freezer.FieldName = "freezer";
@@ -1225,7 +1217,7 @@
             // 
             // gvMx1freezeTime
             // 
-            this.gvMx1freezeTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1freezeTime.AppearanceCell.Options.UseFont = true;
             this.gvMx1freezeTime.Caption = "鍐荤粨鏃堕棿";
             this.gvMx1freezeTime.FieldName = "freezeTime";
@@ -1238,7 +1230,7 @@
             // 
             // gvMx1terminator
             // 
-            this.gvMx1terminator.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1terminator.AppearanceCell.Options.UseFont = true;
             this.gvMx1terminator.Caption = "缁堟浜�";
             this.gvMx1terminator.FieldName = "terminator";
@@ -1251,7 +1243,7 @@
             // 
             // gvMx1terminateTime
             // 
-            this.gvMx1terminateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1terminateTime.AppearanceCell.Options.UseFont = true;
             this.gvMx1terminateTime.Caption = "缁堟鏃堕棿";
             this.gvMx1terminateTime.FieldName = "terminateTime";
@@ -1264,7 +1256,7 @@
             // 
             // gvMx1totalReceivedQty
             // 
-            this.gvMx1totalReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+         
             this.gvMx1totalReceivedQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1totalReceivedQty.Caption = "鎬诲凡鏀舵暟閲�";
             this.gvMx1totalReceivedQty.FieldName = "totalReceivedQty";
@@ -1277,7 +1269,7 @@
             // 
             // gvMx1totalStoredQty
             // 
-            this.gvMx1totalStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1totalStoredQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1totalStoredQty.Caption = "鎬诲凡鍏ュ簱鏁伴噺";
             this.gvMx1totalStoredQty.FieldName = "totalStoredQty";
@@ -1290,7 +1282,7 @@
             // 
             // gvMx1remainingStoredQty
             // 
-            this.gvMx1remainingStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1remainingStoredQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1remainingStoredQty.Caption = "鍓╀綑鍏ュ簱鏁伴噺";
             this.gvMx1remainingStoredQty.FieldName = "remainingStoredQty";
@@ -1303,7 +1295,7 @@
             // 
             // gvMx1totalReturnedQty
             // 
-            this.gvMx1totalReturnedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+         
             this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1totalReturnedQty.Caption = "鎬婚��璐ф暟閲�";
             this.gvMx1totalReturnedQty.FieldName = "totalReturnedQty";
@@ -1316,7 +1308,7 @@
             // 
             // gvMx1returnableReceivedQty
             // 
-            this.gvMx1returnableReceivedQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1returnableReceivedQty.Caption = "鍙��鏀惰揣鏁伴噺";
             this.gvMx1returnableReceivedQty.FieldName = "returnableReceivedQty";
@@ -1329,7 +1321,7 @@
             // 
             // gvMx1returnableStoredQty
             // 
-            this.gvMx1returnableStoredQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            
             this.gvMx1returnableStoredQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1returnableStoredQty.Caption = "鍙��鍏ュ簱鏁伴噺";
             this.gvMx1returnableStoredQty.FieldName = "returnableStoredQty";
@@ -1342,7 +1334,7 @@
             // 
             // gvMx1sourceDocumentType
             // 
-            this.gvMx1sourceDocumentType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1sourceDocumentType.AppearanceCell.Options.UseFont = true;
             this.gvMx1sourceDocumentType.Caption = "鏉ユ簮鍗曟嵁绫诲瀷";
             this.gvMx1sourceDocumentType.FieldName = "sourceDocumentType";
@@ -1355,7 +1347,7 @@
             // 
             // gvMx1planTrackingId
             // 
-            this.gvMx1planTrackingId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1planTrackingId.AppearanceCell.Options.UseFont = true;
             this.gvMx1planTrackingId.Caption = "璁″垝璺熻釜鍙�";
             this.gvMx1planTrackingId.FieldName = "planTrackingId";
@@ -1368,7 +1360,7 @@
             // 
             // gvMx1changeFlag
             // 
-            this.gvMx1changeFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+          
             this.gvMx1changeFlag.AppearanceCell.Options.UseFont = true;
             this.gvMx1changeFlag.Caption = "鍙樻洿鏍囪瘑";
             this.gvMx1changeFlag.FieldName = "changeFlag";
@@ -1381,7 +1373,7 @@
             // 
             // gvMx1demandDocumentLineId
             // 
-            this.gvMx1demandDocumentLineId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1demandDocumentLineId.AppearanceCell.Options.UseFont = true;
             this.gvMx1demandDocumentLineId.Caption = "闇�姹傚崟鎹鍙�";
             this.gvMx1demandDocumentLineId.FieldName = "demandDocumentLineId";
@@ -1389,6 +1381,24 @@
             this.gvMx1demandDocumentLineId.Name = "gvMx1demandDocumentLineId";
             this.gvMx1demandDocumentLineId.Tag = "query_a.DEMAND_DOCUMENT_LINE_ID";
             this.gvMx1demandDocumentLineId.Width = 100;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "涓婚敭Guid";
+            this.gridColumn6.FieldName = "guid";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "闇�姹傜粍缁�";
+            this.gridColumn8.FieldName = "demandOrg";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 33;
+            this.gridColumn8.Width = 94;
             // 
             // picCheckBox
             // 
@@ -1431,10 +1441,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1479,9 +1491,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastupdateBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_erpCheckDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_checkFalg;
         private DevExpress.XtraGrid.Columns.GridColumn gv_changereason;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
@@ -1536,5 +1545,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1planTrackingId;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1changeFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1demandDocumentLineId;
+        private DevExpress.XtraGrid.Columns.GridColumn gvcol6;
+        private DevExpress.XtraEditors.TextEdit txt_guid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3