From 77f9269e1bef71f475c72f85fa64cdfd09a503f6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 29 三月 2025 21:51:14 +0800
Subject: [PATCH] 委外

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs |  176 +++++++++++++++++++++++++++++++---------------------------
 1 files changed, 95 insertions(+), 81 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..62982ad 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;
@@ -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";
@@ -412,7 +415,7 @@
             // 
             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";
@@ -646,48 +649,6 @@
             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);
@@ -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,10 +772,10 @@
             // 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
@@ -811,9 +784,38 @@
             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;
@@ -1390,6 +1382,24 @@
             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
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -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