From 34e30e2261a057fc9f46f67a3d216e3d9a9e67be Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 03 六月 2025 17:17:21 +0800
Subject: [PATCH] 上线梳理

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs |  245 +++++++++++++++++++++++++++++++++++-------------
 1 files changed, 179 insertions(+), 66 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
index 44d62ac..6566a59 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesRohIn.Designer.cs
@@ -37,6 +37,11 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -135,11 +140,13 @@
             this.gvMx1terminator = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1terminateTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1totalReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1totalStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1remainingStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1totalReturnedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1remainingStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnableReceivedQty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1returnableStoredQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1sourceDocumentType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1planTrackingId = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -148,6 +155,8 @@
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -159,6 +168,8 @@
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -212,6 +223,7 @@
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -334,7 +346,7 @@
             // 
             // gv_factory
             // 
-            this.gv_factory.Caption = "ERPID鍙�";
+            this.gv_factory.Caption = "ErpId";
             this.gv_factory.FieldName = "ebelnK3id";
             this.gv_factory.MinWidth = 25;
             this.gv_factory.Name = "gv_factory";
@@ -1103,6 +1115,8 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.rptHistory});
             this.gcMx1.Size = new System.Drawing.Size(1361, 426);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1138,11 +1152,13 @@
             this.gvMx1terminator,
             this.gvMx1terminateTime,
             this.gvMx1totalReceivedQty,
-            this.gridColumn10,
             this.gvMx1totalStoredQty,
-            this.gvMx1remainingStoredQty,
             this.gvMx1totalReturnedQty,
+            this.gridColumn10,
+            this.gvMx1remainingStoredQty,
             this.gvMx1returnableReceivedQty,
+            this.gridColumn21,
+            this.gridColumn20,
             this.gvMx1returnableStoredQty,
             this.gvMx1sourceDocumentType,
             this.gvMx1planTrackingId,
@@ -1150,7 +1166,8 @@
             this.gvMx1demandDocumentLineId,
             this.gridColumn6,
             this.gridColumn8,
-            this.gridColumn9});
+            this.gridColumn9,
+            this.gridColumn19});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1169,7 +1186,7 @@
             // 
             // gv_erpid
             // 
-            this.gv_erpid.Caption = "ERP涓ID";
+            this.gv_erpid.Caption = "Erp琛孖d";
             this.gv_erpid.FieldName = "ebelnK3id";
             this.gv_erpid.MinWidth = 25;
             this.gv_erpid.Name = "gv_erpid";
@@ -1236,7 +1253,7 @@
             this.gvMx1deliveryDate.Name = "gvMx1deliveryDate";
             this.gvMx1deliveryDate.Tag = "query_a.DELIVERY_DATE";
             this.gvMx1deliveryDate.Visible = true;
-            this.gvMx1deliveryDate.VisibleIndex = 18;
+            this.gvMx1deliveryDate.VisibleIndex = 13;
             this.gvMx1deliveryDate.Width = 92;
             // 
             // gvMx1earliestDeliveryDate
@@ -1248,7 +1265,7 @@
             this.gvMx1earliestDeliveryDate.Name = "gvMx1earliestDeliveryDate";
             this.gvMx1earliestDeliveryDate.Tag = "query_a.EARLIEST_DELIVERY_DATE";
             this.gvMx1earliestDeliveryDate.Visible = true;
-            this.gvMx1earliestDeliveryDate.VisibleIndex = 19;
+            this.gvMx1earliestDeliveryDate.VisibleIndex = 14;
             this.gvMx1earliestDeliveryDate.Width = 92;
             // 
             // gvMx1latestDeliveryDate
@@ -1260,7 +1277,7 @@
             this.gvMx1latestDeliveryDate.Name = "gvMx1latestDeliveryDate";
             this.gvMx1latestDeliveryDate.Tag = "query_a.LATEST_DELIVERY_DATE";
             this.gvMx1latestDeliveryDate.Visible = true;
-            this.gvMx1latestDeliveryDate.VisibleIndex = 20;
+            this.gvMx1latestDeliveryDate.VisibleIndex = 15;
             this.gvMx1latestDeliveryDate.Width = 92;
             // 
             // gvMx1purchaseQty
@@ -1272,7 +1289,7 @@
             this.gvMx1purchaseQty.Name = "gvMx1purchaseQty";
             this.gvMx1purchaseQty.Tag = "query_a.PURCHASE_QTY";
             this.gvMx1purchaseQty.Visible = true;
-            this.gvMx1purchaseQty.VisibleIndex = 5;
+            this.gvMx1purchaseQty.VisibleIndex = 4;
             this.gvMx1purchaseQty.Width = 25;
             // 
             // gvMx1purchaseUnit
@@ -1284,7 +1301,7 @@
             this.gvMx1purchaseUnit.Name = "gvMx1purchaseUnit";
             this.gvMx1purchaseUnit.Tag = "query_a.PURCHASE_UNIT";
             this.gvMx1purchaseUnit.Visible = true;
-            this.gvMx1purchaseUnit.VisibleIndex = 6;
+            this.gvMx1purchaseUnit.VisibleIndex = 7;
             this.gvMx1purchaseUnit.Width = 25;
             // 
             // gvMx1inventoryUnit
@@ -1316,7 +1333,7 @@
             this.gvMx1isGift.Name = "gvMx1isGift";
             this.gvMx1isGift.Tag = "query_a.IS_GIFT";
             this.gvMx1isGift.Visible = true;
-            this.gvMx1isGift.VisibleIndex = 7;
+            this.gvMx1isGift.VisibleIndex = 8;
             this.gvMx1isGift.Width = 25;
             // 
             // gvMx1remarks
@@ -1328,7 +1345,7 @@
             this.gvMx1remarks.Name = "gvMx1remarks";
             this.gvMx1remarks.Tag = "query_a.REMARKS";
             this.gvMx1remarks.Visible = true;
-            this.gvMx1remarks.VisibleIndex = 8;
+            this.gvMx1remarks.VisibleIndex = 9;
             this.gvMx1remarks.Width = 46;
             // 
             // gvMx1businessTerminate
@@ -1340,7 +1357,7 @@
             this.gvMx1businessTerminate.Name = "gvMx1businessTerminate";
             this.gvMx1businessTerminate.Tag = "query_a.BUSINESS_TERMINATE";
             this.gvMx1businessTerminate.Visible = true;
-            this.gvMx1businessTerminate.VisibleIndex = 4;
+            this.gvMx1businessTerminate.VisibleIndex = 10;
             this.gvMx1businessTerminate.Width = 25;
             // 
             // gvMx1businessClose
@@ -1352,7 +1369,7 @@
             this.gvMx1businessClose.Name = "gvMx1businessClose";
             this.gvMx1businessClose.Tag = "query_a.BUSINESS_CLOSE";
             this.gvMx1businessClose.Visible = true;
-            this.gvMx1businessClose.VisibleIndex = 9;
+            this.gvMx1businessClose.VisibleIndex = 11;
             this.gvMx1businessClose.Width = 25;
             // 
             // gvMx1businessFreeze
@@ -1364,7 +1381,7 @@
             this.gvMx1businessFreeze.Name = "gvMx1businessFreeze";
             this.gvMx1businessFreeze.Tag = "query_a.BUSINESS_FREEZE";
             this.gvMx1businessFreeze.Visible = true;
-            this.gvMx1businessFreeze.VisibleIndex = 10;
+            this.gvMx1businessFreeze.VisibleIndex = 12;
             this.gvMx1businessFreeze.Width = 25;
             // 
             // gvMx1freezer
@@ -1409,84 +1426,126 @@
             // 
             // gvMx1totalReceivedQty
             // 
+            this.gvMx1totalReceivedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red;
             this.gvMx1totalReceivedQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1totalReceivedQty.Caption = "绱鏀舵枡鏁伴噺";
+            this.gvMx1totalReceivedQty.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1totalReceivedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gvMx1totalReceivedQty.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1totalReceivedQty.Caption = "绱鏀堕噺";
             this.gvMx1totalReceivedQty.FieldName = "qty1";
             this.gvMx1totalReceivedQty.MinWidth = 25;
             this.gvMx1totalReceivedQty.Name = "gvMx1totalReceivedQty";
             this.gvMx1totalReceivedQty.Tag = "query_a.TOTAL_RECEIVED_QTY";
-            this.gvMx1totalReceivedQty.Visible = true;
-            this.gvMx1totalReceivedQty.VisibleIndex = 11;
             this.gvMx1totalReceivedQty.Width = 32;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "鍓╀綑鏀舵枡鏁伴噺";
-            this.gridColumn10.FieldName = "qty2";
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 12;
-            this.gridColumn10.Width = 37;
             // 
             // gvMx1totalStoredQty
             // 
+            this.gvMx1totalStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red;
             this.gvMx1totalStoredQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1totalStoredQty.Caption = "绱鍏ュ簱鏁伴噺";
-            this.gvMx1totalStoredQty.FieldName = "qty3";
+            this.gvMx1totalStoredQty.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1totalStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gvMx1totalStoredQty.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1totalStoredQty.Caption = "绱鍏ュ簱閲�";
+            this.gvMx1totalStoredQty.FieldName = "qty2";
             this.gvMx1totalStoredQty.MinWidth = 25;
             this.gvMx1totalStoredQty.Name = "gvMx1totalStoredQty";
             this.gvMx1totalStoredQty.Tag = "query_a.TOTAL_STORED_QTY";
-            this.gvMx1totalStoredQty.Visible = true;
-            this.gvMx1totalStoredQty.VisibleIndex = 13;
             this.gvMx1totalStoredQty.Width = 28;
+            // 
+            // gvMx1totalReturnedQty
+            // 
+            this.gvMx1totalReturnedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true;
+            this.gvMx1totalReturnedQty.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1totalReturnedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gvMx1totalReturnedQty.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1totalReturnedQty.Caption = "绱閫�閲�";
+            this.gvMx1totalReturnedQty.FieldName = "qty3";
+            this.gvMx1totalReturnedQty.MinWidth = 25;
+            this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
+            this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
+            this.gvMx1totalReturnedQty.Width = 32;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn10.Caption = "绱楠岄��";
+            this.gridColumn10.FieldName = "qty4";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Width = 37;
             // 
             // gvMx1remainingStoredQty
             // 
+            this.gvMx1remainingStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red;
             this.gvMx1remainingStoredQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1remainingStoredQty.Caption = "鍓╀綑鍏ュ簱鏁伴噺";
-            this.gvMx1remainingStoredQty.FieldName = "qty4";
+            this.gvMx1remainingStoredQty.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1remainingStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gvMx1remainingStoredQty.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1remainingStoredQty.Caption = "鍓╀綑鏀舵枡";
+            this.gvMx1remainingStoredQty.FieldName = "qty5";
             this.gvMx1remainingStoredQty.MinWidth = 25;
             this.gvMx1remainingStoredQty.Name = "gvMx1remainingStoredQty";
             this.gvMx1remainingStoredQty.Tag = "query_a.REMAINING_STORED_QTY";
             this.gvMx1remainingStoredQty.Visible = true;
-            this.gvMx1remainingStoredQty.VisibleIndex = 14;
+            this.gvMx1remainingStoredQty.VisibleIndex = 5;
             this.gvMx1remainingStoredQty.Width = 32;
-            // 
-            // gvMx1totalReturnedQty
-            // 
-            this.gvMx1totalReturnedQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1totalReturnedQty.Caption = "绱閫�鏂欐暟閲�";
-            this.gvMx1totalReturnedQty.FieldName = "qty5";
-            this.gvMx1totalReturnedQty.MinWidth = 25;
-            this.gvMx1totalReturnedQty.Name = "gvMx1totalReturnedQty";
-            this.gvMx1totalReturnedQty.Tag = "query_a.TOTAL_RETURNED_QTY";
-            this.gvMx1totalReturnedQty.Visible = true;
-            this.gvMx1totalReturnedQty.VisibleIndex = 15;
-            this.gvMx1totalReturnedQty.Width = 32;
             // 
             // gvMx1returnableReceivedQty
             // 
+            this.gvMx1returnableReceivedQty.AppearanceCell.ForeColor = System.Drawing.Color.Red;
             this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1returnableReceivedQty.Caption = "鏀舵枡鍙��鏁伴噺";
+            this.gvMx1returnableReceivedQty.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1returnableReceivedQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gvMx1returnableReceivedQty.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1returnableReceivedQty.Caption = "鍓╀綑鍏ュ簱閲�";
             this.gvMx1returnableReceivedQty.FieldName = "qty6";
             this.gvMx1returnableReceivedQty.MinWidth = 25;
             this.gvMx1returnableReceivedQty.Name = "gvMx1returnableReceivedQty";
             this.gvMx1returnableReceivedQty.Tag = "query_a.RETURNABLE_RECEIVED_QTY";
-            this.gvMx1returnableReceivedQty.Visible = true;
-            this.gvMx1returnableReceivedQty.VisibleIndex = 16;
             this.gvMx1returnableReceivedQty.Width = 32;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn21.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn21.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn21.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn21.Caption = "搴撳瓨鍙��閲�";
+            this.gridColumn21.FieldName = "qty8";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.AppearanceCell.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn20.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn20.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gridColumn20.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn20.Caption = "绱瀹炴敹閲�";
+            this.gridColumn20.FieldName = "qty9";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 6;
+            this.gridColumn20.Width = 94;
             // 
             // gvMx1returnableStoredQty
             // 
+            this.gvMx1returnableStoredQty.AppearanceCell.ForeColor = System.Drawing.Color.Red;
             this.gvMx1returnableStoredQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1returnableStoredQty.Caption = "搴撳瓨鍙��鏁伴噺";
+            this.gvMx1returnableStoredQty.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1returnableStoredQty.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
+            this.gvMx1returnableStoredQty.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1returnableStoredQty.Caption = "鏀舵枡鍙��閲�";
             this.gvMx1returnableStoredQty.FieldName = "qty7";
             this.gvMx1returnableStoredQty.MinWidth = 25;
             this.gvMx1returnableStoredQty.Name = "gvMx1returnableStoredQty";
             this.gvMx1returnableStoredQty.Tag = "query_a.RETURNABLE_STORED_QTY";
-            this.gvMx1returnableStoredQty.Visible = true;
-            this.gvMx1returnableStoredQty.VisibleIndex = 17;
             this.gvMx1returnableStoredQty.Width = 32;
             // 
             // gvMx1sourceDocumentType
@@ -1531,7 +1590,7 @@
             // 
             // gridColumn6
             // 
-            this.gridColumn6.Caption = "涓婚敭Guid";
+            this.gridColumn6.Caption = "鏄庣粏琛ㄤ富閿瓽uid";
             this.gridColumn6.FieldName = "guid";
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
@@ -1544,7 +1603,7 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 21;
+            this.gridColumn8.VisibleIndex = 16;
             this.gridColumn8.Width = 43;
             // 
             // gridColumn9
@@ -1554,8 +1613,29 @@
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 22;
+            this.gridColumn9.VisibleIndex = 17;
             this.gridColumn9.Width = 94;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "鍒拌揣璁板綍";
+            this.gridColumn19.ColumnEdit = this.rptHistory;
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 18;
+            this.gridColumn19.Width = 94;
+            // 
+            // rptHistory
+            // 
+            this.rptHistory.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.rptHistory.Name = "rptHistory";
+            this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick);
             // 
             // tabMxPage2
             // 
@@ -1588,7 +1668,9 @@
             this.gridColumn17,
             this.gridColumn22,
             this.gridColumn47,
-            this.gridColumn48});
+            this.gridColumn48,
+            this.gridColumn12,
+            this.gridColumn18});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1622,7 +1704,7 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 1;
+            this.gridColumn15.VisibleIndex = 2;
             this.gridColumn15.Width = 46;
             // 
             // gridColumn16
@@ -1632,7 +1714,7 @@
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 2;
+            this.gridColumn16.VisibleIndex = 3;
             this.gridColumn16.Width = 55;
             // 
             // gridColumn17
@@ -1644,19 +1726,19 @@
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Tag = "query_a.PRICING_QTY";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 3;
+            this.gridColumn17.VisibleIndex = 4;
             this.gridColumn17.Width = 25;
             // 
             // gridColumn22
             // 
             this.gridColumn22.AppearanceCell.Options.UseFont = true;
-            this.gridColumn22.Caption = "鏀惰揣鏁伴噺";
+            this.gridColumn22.Caption = "鍒拌揣鏁伴噺";
             this.gridColumn22.FieldName = "quantity";
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 4;
+            this.gridColumn22.VisibleIndex = 5;
             this.gridColumn22.Width = 25;
             // 
             // gridColumn47
@@ -1666,7 +1748,7 @@
             this.gridColumn47.MinWidth = 25;
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.Visible = true;
-            this.gridColumn47.VisibleIndex = 5;
+            this.gridColumn47.VisibleIndex = 7;
             this.gridColumn47.Width = 43;
             // 
             // gridColumn48
@@ -1676,8 +1758,32 @@
             this.gridColumn48.MinWidth = 25;
             this.gridColumn48.Name = "gridColumn48";
             this.gridColumn48.Visible = true;
-            this.gridColumn48.VisibleIndex = 6;
+            this.gridColumn48.VisibleIndex = 8;
             this.gridColumn48.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鍒拌揣鍗曞彿";
+            this.gridColumn12.FieldName = "dhdh";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 1;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn18.Caption = "瀹炴敹鏁伴噺";
+            this.gridColumn18.FieldName = "sjQuantity";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 6;
+            this.gridColumn18.Width = 94;
             // 
             // Frm_MesRohIn
             // 
@@ -1740,6 +1846,7 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1870,5 +1977,11 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3