From ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 09 六月 2025 09:53:37 +0800
Subject: [PATCH] 采购明细报表

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs |  278 ++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 161 insertions(+), 117 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 8400bed..60d7f61 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -49,6 +49,11 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -59,7 +64,6 @@
             this.gv_fType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -146,6 +150,10 @@
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -204,6 +212,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -245,6 +254,7 @@
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -258,8 +268,9 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1231, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -284,7 +295,6 @@
             this.gv_fType,
             this.gv_urgentFlag,
             this.gv_fstatus,
-            this.gridColumn2,
             this.gv_billNo,
             this.gv_createBy,
             this.gv_createDate,
@@ -358,18 +368,6 @@
             this.gv_fstatus.VisibleIndex = 3;
             this.gv_fstatus.Width = 68;
             // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "鍏ュ簱";
-            this.gridColumn2.FieldName = "ckStatus";
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.OptionsColumn.AllowEdit = false;
-            this.gridColumn2.Tag = "query_a.ckStatus";
-            this.gridColumn2.UnboundDataType = typeof(bool);
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 4;
-            this.gridColumn2.Width = 68;
-            // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
@@ -379,7 +377,7 @@
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 5;
+            this.gv_billNo.VisibleIndex = 4;
             this.gv_billNo.Width = 68;
             // 
             // gv_createBy
@@ -391,7 +389,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 6;
+            this.gv_createBy.VisibleIndex = 5;
             this.gv_createBy.Width = 89;
             // 
             // gv_createDate
@@ -403,7 +401,7 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 7;
+            this.gv_createDate.VisibleIndex = 6;
             this.gv_createDate.Width = 193;
             // 
             // gv_checkUser
@@ -415,7 +413,7 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 8;
+            this.gv_checkUser.VisibleIndex = 7;
             this.gv_checkUser.Width = 100;
             // 
             // gv_checkDate
@@ -427,7 +425,7 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 9;
+            this.gv_checkDate.VisibleIndex = 8;
             this.gv_checkDate.Width = 64;
             // 
             // gv_depotsCode
@@ -439,7 +437,7 @@
             this.gv_depotsCode.OptionsColumn.AllowEdit = false;
             this.gv_depotsCode.Tag = "query_a.depots_code";
             this.gv_depotsCode.Visible = true;
-            this.gv_depotsCode.VisibleIndex = 10;
+            this.gv_depotsCode.VisibleIndex = 9;
             this.gv_depotsCode.Width = 87;
             // 
             // gridColumn4
@@ -449,7 +447,7 @@
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.AllowEdit = false;
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 11;
+            this.gridColumn4.VisibleIndex = 10;
             this.gridColumn4.Width = 128;
             // 
             // gv_suppNo
@@ -461,7 +459,7 @@
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 12;
+            this.gv_suppNo.VisibleIndex = 11;
             this.gv_suppNo.Width = 69;
             // 
             // gridColumn5
@@ -471,7 +469,7 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.AllowEdit = false;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 13;
+            this.gridColumn5.VisibleIndex = 12;
             this.gridColumn5.Width = 70;
             // 
             // gv_remark
@@ -483,7 +481,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 14;
+            this.gv_remark.VisibleIndex = 13;
             this.gv_remark.Width = 90;
             // 
             // gridColumn11
@@ -529,6 +527,7 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1231, 570);
             this.splitMx1.SplitterPosition = 175;
             this.splitMx1.TabIndex = 0;
@@ -585,50 +584,50 @@
             // 
             // txtDepotsCode
             // 
-            this.txtDepotsCode.Location = new System.Drawing.Point(416, 74);
+            this.txtDepotsCode.Location = new System.Drawing.Point(401, 74);
             this.txtDepotsCode.Name = "txtDepotsCode";
             this.txtDepotsCode.Properties.Appearance.Options.UseFont = true;
             this.txtDepotsCode.Properties.Tag = "";
-            this.txtDepotsCode.Size = new System.Drawing.Size(197, 24);
+            this.txtDepotsCode.Size = new System.Drawing.Size(212, 24);
             this.txtDepotsCode.StyleController = this.layoutMx1;
             this.txtDepotsCode.TabIndex = 454;
             this.txtDepotsCode.Tag = "readOnly";
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(416, 105);
+            this.txt_remark.Location = new System.Drawing.Point(401, 105);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(500, 24);
+            this.txt_remark.Size = new System.Drawing.Size(515, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 240;
             // 
             // txt_receiveOrgId
             // 
             this.txt_receiveOrgId.IsReadly = false;
-            this.txt_receiveOrgId.Location = new System.Drawing.Point(114, 43);
+            this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 43);
             this.txt_receiveOrgId.Name = "txt_receiveOrgId";
-            this.txt_receiveOrgId.Size = new System.Drawing.Size(196, 24);
+            this.txt_receiveOrgId.Size = new System.Drawing.Size(211, 24);
             this.txt_receiveOrgId.TabIndex = 457;
             // 
             // txtSupplierCode
             // 
-            this.txtSupplierCode.Location = new System.Drawing.Point(416, 43);
+            this.txtSupplierCode.Location = new System.Drawing.Point(401, 43);
             this.txtSupplierCode.Name = "txtSupplierCode";
             this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
             this.txtSupplierCode.Properties.Tag = "";
-            this.txtSupplierCode.Size = new System.Drawing.Size(197, 24);
+            this.txtSupplierCode.Size = new System.Drawing.Size(212, 24);
             this.txtSupplierCode.StyleController = this.layoutMx1;
             this.txtSupplierCode.TabIndex = 451;
             this.txtSupplierCode.Tag = "readOnly";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(114, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(99, 12);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
             this.txt_billNo.Properties.Tag = "";
-            this.txt_billNo.Size = new System.Drawing.Size(196, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(211, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readOnly";
@@ -636,19 +635,19 @@
             // txt_depotsId
             // 
             this.txt_depotsId.IsReadly = false;
-            this.txt_depotsId.Location = new System.Drawing.Point(114, 105);
+            this.txt_depotsId.Location = new System.Drawing.Point(99, 105);
             this.txt_depotsId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_depotsId.Name = "txt_depotsId";
-            this.txt_depotsId.Size = new System.Drawing.Size(196, 24);
+            this.txt_depotsId.Size = new System.Drawing.Size(211, 24);
             this.txt_depotsId.TabIndex = 445;
             // 
             // txt_suppId
             // 
             this.txt_suppId.IsReadly = false;
-            this.txt_suppId.Location = new System.Drawing.Point(114, 74);
+            this.txt_suppId.Location = new System.Drawing.Point(99, 74);
             this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(196, 24);
+            this.txt_suppId.Size = new System.Drawing.Size(211, 24);
             this.txt_suppId.TabIndex = 440;
             // 
             // txt_fstatus
@@ -673,50 +672,50 @@
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(719, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(704, 12);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(197, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(212, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 461;
             this.txt_createBy.Tag = "readOnly";
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(719, 43);
+            this.txt_createDate.Location = new System.Drawing.Point(704, 43);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(197, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(212, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 462;
             this.txt_createDate.Tag = "readOnly";
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(1022, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(1007, 12);
             this.txt_checkUser.Name = "txt_checkUser";
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
+            this.txt_checkUser.Size = new System.Drawing.Size(212, 24);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 463;
             this.txt_checkUser.Tag = "readOnly";
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(1022, 43);
+            this.txt_checkDate.Location = new System.Drawing.Point(1007, 43);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(197, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(212, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 464;
             this.txt_checkDate.Tag = "readOnly";
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(719, 74);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(704, 74);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(197, 24);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 465;
             // 
@@ -814,7 +813,7 @@
             this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem1.Size = new System.Drawing.Size(302, 31);
             this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem2
             // 
@@ -823,7 +822,7 @@
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Size = new System.Drawing.Size(302, 31);
             this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem3
             // 
@@ -833,7 +832,7 @@
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem3.Size = new System.Drawing.Size(302, 31);
             this.layoutControlItem3.Text = "閫変緵搴斿晢";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem4
             // 
@@ -843,7 +842,7 @@
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem4.Size = new System.Drawing.Size(302, 31);
             this.layoutControlItem4.Text = "閫夋嫨浠撳簱";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem16
             // 
@@ -866,8 +865,8 @@
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.Size = new System.Drawing.Size(303, 31);
-            this.layoutControlItem11.Text = "寤虹珛浜�";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem11.Text = "寤虹珛浜哄憳";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem12
             // 
@@ -878,7 +877,7 @@
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem12.Size = new System.Drawing.Size(303, 31);
             this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem13
             // 
@@ -887,8 +886,8 @@
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem13.Size = new System.Drawing.Size(303, 31);
-            this.layoutControlItem13.Text = "鎻愪氦妫�楠屼汉";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem14
             // 
@@ -898,8 +897,8 @@
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem14.Size = new System.Drawing.Size(303, 31);
-            this.layoutControlItem14.Text = "鎻愪氦妫�楠屾棩鏈�";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
             // 
@@ -933,7 +932,7 @@
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem5.Size = new System.Drawing.Size(303, 31);
             this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem6
             // 
@@ -944,7 +943,7 @@
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem6.Size = new System.Drawing.Size(303, 31);
             this.layoutControlItem6.Text = "浠撳簱缂栫爜";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem17
             // 
@@ -955,8 +954,8 @@
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem17.Size = new System.Drawing.Size(606, 31);
-            this.layoutControlItem17.Text = "澶囨敞淇℃伅";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
             // 
             // lab_paperBillNo
             // 
@@ -967,7 +966,7 @@
             this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
             this.lab_paperBillNo.Size = new System.Drawing.Size(303, 31);
             this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
-            this.lab_paperBillNo.TextSize = new System.Drawing.Size(90, 18);
+            this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18);
             // 
             // tabMx
             // 
@@ -985,7 +984,7 @@
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
             this.tabMxPage1.Size = new System.Drawing.Size(1229, 351);
-            this.tabMxPage1.Text = "鍏ヤ粨鐗╂枡鏄庣粏";
+            this.tabMxPage1.Text = "鏀舵枡鏄庣粏";
             // 
             // gcMx1
             // 
@@ -995,7 +994,8 @@
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
-            this.repositoryItemButtonEdit2});
+            this.repositoryItemButtonEdit2,
+            this.rptHistory});
             this.gcMx1.Size = new System.Drawing.Size(1229, 351);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -1033,7 +1033,10 @@
             this.gvMxDel,
             this.gridColumn14,
             this.gridColumn15,
-            this.gridColumn16});
+            this.gridColumn16,
+            this.gridColumn2,
+            this.gridColumn17,
+            this.gridColumn18});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1053,7 +1056,7 @@
             // gvMx1guid
             // 
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "涓婚敭GUID";
+            this.gvMx1guid.Caption = "鍒拌揣鏄庣粏GUID";
             this.gvMx1guid.FieldName = "guid";
             this.gvMx1guid.MinWidth = 70;
             this.gvMx1guid.Name = "gvMx1guid";
@@ -1064,8 +1067,8 @@
             // gvMx1ebelnLine
             // 
             this.gvMx1ebelnLine.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebelnLine.Caption = "ERP琛孖D";
-            this.gvMx1ebelnLine.FieldName = "ebelnK3id";
+            this.gvMx1ebelnLine.Caption = "Erp琛孖d";
+            this.gvMx1ebelnLine.FieldName = "lineK3id";
             this.gvMx1ebelnLine.MinWidth = 90;
             this.gvMx1ebelnLine.Name = "gvMx1ebelnLine";
             this.gvMx1ebelnLine.OptionsColumn.ReadOnly = true;
@@ -1084,7 +1087,7 @@
             // gvMx1returnFlag
             // 
             this.gvMx1returnFlag.AppearanceCell.Options.UseFont = true;
-            this.gvMx1returnFlag.Caption = "閫�璐ф爣璇�";
+            this.gvMx1returnFlag.Caption = "閫�璐�";
             this.gvMx1returnFlag.FieldName = "returnFlag";
             this.gvMx1returnFlag.MinWidth = 25;
             this.gvMx1returnFlag.Name = "gvMx1returnFlag";
@@ -1093,7 +1096,7 @@
             this.gvMx1returnFlag.UnboundDataType = typeof(bool);
             this.gvMx1returnFlag.Visible = true;
             this.gvMx1returnFlag.VisibleIndex = 0;
-            this.gvMx1returnFlag.Width = 50;
+            this.gvMx1returnFlag.Width = 26;
             // 
             // gvMx1urgentFlag
             // 
@@ -1102,7 +1105,7 @@
             this.gvMx1urgentFlag.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1urgentFlag.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
+            this.gvMx1urgentFlag.Caption = "鎬ユ枡";
             this.gvMx1urgentFlag.FieldName = "urgentFlag";
             this.gvMx1urgentFlag.MinWidth = 25;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
@@ -1110,7 +1113,7 @@
             this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
             this.gvMx1urgentFlag.Visible = true;
             this.gvMx1urgentFlag.VisibleIndex = 1;
-            this.gvMx1urgentFlag.Width = 50;
+            this.gvMx1urgentFlag.Width = 25;
             // 
             // gvMx1isdepsIn
             // 
@@ -1135,7 +1138,7 @@
             this.gvMx1checkStates.Tag = "query_a.check_states";
             this.gvMx1checkStates.Visible = true;
             this.gvMx1checkStates.VisibleIndex = 2;
-            this.gvMx1checkStates.Width = 90;
+            this.gvMx1checkStates.Width = 48;
             // 
             // gvMx1checkRes
             // 
@@ -1148,19 +1151,19 @@
             this.gvMx1checkRes.Tag = "query_a.check_res";
             this.gvMx1checkRes.Visible = true;
             this.gvMx1checkRes.VisibleIndex = 3;
-            this.gvMx1checkRes.Width = 90;
+            this.gvMx1checkRes.Width = 48;
             // 
             // gvMx1ebeln
             // 
             this.gvMx1ebeln.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebeln.Caption = "ERP鍗曞彿";
+            this.gvMx1ebeln.Caption = "閲囪喘鍗曞彿";
             this.gvMx1ebeln.FieldName = "ebeln";
             this.gvMx1ebeln.MinWidth = 120;
             this.gvMx1ebeln.Name = "gvMx1ebeln";
             this.gvMx1ebeln.OptionsColumn.ReadOnly = true;
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
-            this.gvMx1ebeln.VisibleIndex = 5;
+            this.gvMx1ebeln.VisibleIndex = 4;
             this.gvMx1ebeln.Width = 120;
             // 
             // gridColumn8
@@ -1170,8 +1173,8 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 6;
-            this.gridColumn8.Width = 70;
+            this.gridColumn8.VisibleIndex = 5;
+            this.gridColumn8.Width = 37;
             // 
             // gvMx1boardStyle
             // 
@@ -1183,8 +1186,8 @@
             this.gvMx1boardStyle.OptionsColumn.ReadOnly = true;
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
-            this.gvMx1boardStyle.VisibleIndex = 7;
-            this.gvMx1boardStyle.Width = 180;
+            this.gvMx1boardStyle.VisibleIndex = 6;
+            this.gvMx1boardStyle.Width = 96;
             // 
             // gvMx1ebelnQty
             // 
@@ -1196,21 +1199,21 @@
             this.gvMx1ebelnQty.OptionsColumn.ReadOnly = true;
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
-            this.gvMx1ebelnQty.VisibleIndex = 8;
-            this.gvMx1ebelnQty.Width = 80;
+            this.gvMx1ebelnQty.VisibleIndex = 7;
+            this.gvMx1ebelnQty.Width = 42;
             // 
             // gvMx1subQty
             // 
             this.gvMx1subQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1subQty.Caption = "鏈敹鏁伴噺";
+            this.gvMx1subQty.Caption = "绱鏈敹閲�";
             this.gvMx1subQty.FieldName = "wssl";
             this.gvMx1subQty.MinWidth = 25;
             this.gvMx1subQty.Name = "gvMx1subQty";
             this.gvMx1subQty.OptionsColumn.ReadOnly = true;
             this.gvMx1subQty.Tag = "query_a.sub_qty";
             this.gvMx1subQty.Visible = true;
-            this.gvMx1subQty.VisibleIndex = 10;
-            this.gvMx1subQty.Width = 80;
+            this.gvMx1subQty.VisibleIndex = 9;
+            this.gvMx1subQty.Width = 42;
             // 
             // gvMx1quantity
             // 
@@ -1219,14 +1222,14 @@
             this.gvMx1quantity.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1quantity.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1quantity.Caption = "鏀惰揣鏁伴噺";
+            this.gvMx1quantity.Caption = "鏈鏀堕噺";
             this.gvMx1quantity.FieldName = "quantity";
             this.gvMx1quantity.MinWidth = 25;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "yz_quantity_0_edit";
             this.gvMx1quantity.Visible = true;
-            this.gvMx1quantity.VisibleIndex = 11;
-            this.gvMx1quantity.Width = 80;
+            this.gvMx1quantity.VisibleIndex = 10;
+            this.gvMx1quantity.Width = 42;
             // 
             // gvMx1memo
             // 
@@ -1242,21 +1245,21 @@
             this.gvMx1memo.OptionsColumn.ReadOnly = true;
             this.gvMx1memo.Tag = "edit";
             this.gvMx1memo.Visible = true;
-            this.gvMx1memo.VisibleIndex = 12;
-            this.gvMx1memo.Width = 180;
+            this.gvMx1memo.VisibleIndex = 11;
+            this.gvMx1memo.Width = 96;
             // 
             // gvMx1okRkqty
             // 
             this.gvMx1okRkqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx1okRkqty.Caption = "宸叉敹鏁伴噺";
+            this.gvMx1okRkqty.Caption = "绱瀹炴敹";
             this.gvMx1okRkqty.FieldName = "yssl";
             this.gvMx1okRkqty.MinWidth = 25;
             this.gvMx1okRkqty.Name = "gvMx1okRkqty";
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
-            this.gvMx1okRkqty.VisibleIndex = 9;
-            this.gvMx1okRkqty.Width = 80;
+            this.gvMx1okRkqty.VisibleIndex = 8;
+            this.gvMx1okRkqty.Width = 42;
             // 
             // gvMx1checkDate
             // 
@@ -1286,8 +1289,8 @@
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 13;
-            this.gridColumn9.Width = 50;
+            this.gridColumn9.VisibleIndex = 12;
+            this.gridColumn9.Width = 26;
             // 
             // gridColumn7
             // 
@@ -1297,8 +1300,8 @@
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.ReadOnly = true;
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 14;
-            this.gridColumn7.Width = 50;
+            this.gridColumn7.VisibleIndex = 13;
+            this.gridColumn7.Width = 26;
             // 
             // gridColumn6
             // 
@@ -1308,8 +1311,8 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 15;
-            this.gridColumn6.Width = 180;
+            this.gridColumn6.VisibleIndex = 14;
+            this.gridColumn6.Width = 96;
             // 
             // gridColumn10
             // 
@@ -1318,8 +1321,8 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 16;
-            this.gridColumn10.Width = 94;
+            this.gridColumn10.VisibleIndex = 18;
+            this.gridColumn10.Width = 25;
             // 
             // gridColumn12
             // 
@@ -1329,7 +1332,7 @@
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 19;
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.Width = 25;
             // 
             // gridColumn13
             // 
@@ -1339,7 +1342,7 @@
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 20;
-            this.gridColumn13.Width = 94;
+            this.gridColumn13.Width = 25;
             // 
             // gvBtnAlawys
             // 
@@ -1389,29 +1392,66 @@
             this.gridColumn14.FieldName = "freceQty";
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 4;
             this.gridColumn14.Width = 94;
             // 
             // gridColumn15
             // 
-            this.gridColumn15.Caption = "澶勭悊缁撴灉";
-            this.gridColumn15.FieldName = "czjg";
+            this.gridColumn15.Caption = "澶勭悊鎰忚";
+            this.gridColumn15.FieldName = "clyj";
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 17;
-            this.gridColumn15.Width = 94;
+            this.gridColumn15.VisibleIndex = 15;
+            this.gridColumn15.Width = 50;
             // 
             // gridColumn16
             // 
-            this.gridColumn16.Caption = "閫�鐞嗘柟寮�";
-            this.gridColumn16.FieldName = "tlfs";
+            this.gridColumn16.Caption = "鎸戦�夋暟閲�";
+            this.gridColumn16.FieldName = "txsl";
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 18;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.VisibleIndex = 16;
+            this.gridColumn16.Width = 50;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "閫夊埆绫诲埆";
+            this.gridColumn2.FieldName = "xblb";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 17;
+            this.gridColumn2.Width = 26;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "鍒拌揣璁板綍";
+            this.gridColumn17.ColumnEdit = this.rptHistory;
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 23;
+            this.gridColumn17.Width = 26;
+            // 
+            // rptHistory
+            // 
+            this.rptHistory.AutoHeight = false;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
+            editorButtonImageOptions3.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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", 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);
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "ErpId";
+            this.gridColumn18.FieldName = "ebelnK3id";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Width = 94;
             // 
             // picCheckBox
             // 
@@ -1490,6 +1530,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -1506,7 +1547,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_fType;
         private DevExpress.XtraGrid.Columns.GridColumn gv_urgentFlag;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gv_createDate;
@@ -1594,5 +1634,9 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptHistory;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3