From 9702c6a4dc358c7bff2eb18c8426229a0140e34a Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 15 九月 2025 08:29:16 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs |  520 +++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 358 insertions(+), 162 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index b2d984f..d7709cb 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -71,7 +71,14 @@
             this.gv_suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -89,13 +96,14 @@
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_paperBillNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_isSrm = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_mxStatue = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = 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.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -106,7 +114,10 @@
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.lab_paperBillNo = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -131,7 +142,6 @@
             this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -147,6 +157,11 @@
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.rptHistory = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPageReport = new DevExpress.XtraTab.XtraTabPage();
+            this.ucRptCgdhd1 = new Gs.DevApp.DevFrm.Rpt.UcRptCgdhd();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -177,13 +192,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).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.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -194,7 +210,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -203,6 +222,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).BeginInit();
+            this.xtraTabPageReport.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -215,9 +235,10 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = "rpt_InvItem{}";
-            this.toolBarMenu1.Size = new System.Drawing.Size(1233, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1552, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = "xlsOut_InvItem{}";
@@ -228,17 +249,18 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1233, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1552, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
-            this.xtraTabPage2});
+            this.xtraTabPage2,
+            this.xtraTabPageReport});
             // 
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1231, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1550, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -259,7 +281,7 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1231, 570);
+            this.split1.Size = new System.Drawing.Size(1550, 570);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
@@ -269,7 +291,7 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1231, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1550, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -293,7 +315,14 @@
             this.gv_suppNo,
             this.gridColumn5,
             this.gv_remark,
-            this.gridColumn11});
+            this.gridColumn4,
+            this.gridColumn11,
+            this.gridColumn7,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -334,7 +363,7 @@
             // 
             this.gv_urgentFlag.AppearanceCell.Options.UseFont = true;
             this.gv_urgentFlag.Caption = "鎬ユ枡鏍囪瘑";
-            this.gv_urgentFlag.FieldName = "urgentFlag";
+            this.gv_urgentFlag.FieldName = "urgentFlagTxt";
             this.gv_urgentFlag.Name = "gv_urgentFlag";
             this.gv_urgentFlag.OptionsColumn.AllowEdit = false;
             this.gv_urgentFlag.Tag = "query_a.urgent_flag";
@@ -377,7 +406,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 5;
+            this.gv_createBy.VisibleIndex = 10;
             this.gv_createBy.Width = 89;
             // 
             // gv_createDate
@@ -389,7 +418,7 @@
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
-            this.gv_createDate.VisibleIndex = 6;
+            this.gv_createDate.VisibleIndex = 11;
             this.gv_createDate.Width = 193;
             // 
             // gv_checkUser
@@ -401,7 +430,7 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 7;
+            this.gv_checkUser.VisibleIndex = 8;
             this.gv_checkUser.Width = 100;
             // 
             // gv_checkDate
@@ -413,7 +442,7 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 8;
+            this.gv_checkDate.VisibleIndex = 9;
             this.gv_checkDate.Width = 64;
             // 
             // gv_suppNo
@@ -425,7 +454,7 @@
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 9;
+            this.gv_suppNo.VisibleIndex = 6;
             this.gv_suppNo.Width = 69;
             // 
             // gridColumn5
@@ -435,7 +464,7 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.AllowEdit = false;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 10;
+            this.gridColumn5.VisibleIndex = 7;
             this.gridColumn5.Width = 70;
             // 
             // gv_remark
@@ -447,8 +476,18 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 11;
+            this.gv_remark.VisibleIndex = 12;
             this.gv_remark.Width = 90;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "SRM鏍囪瘑";
+            this.gridColumn4.FieldName = "isSrmChk";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 13;
+            this.gridColumn4.Width = 94;
             // 
             // gridColumn11
             // 
@@ -458,6 +497,58 @@
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Width = 94;
             // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "SRM鍒拌揣鍗曞彿";
+            this.gridColumn7.FieldName = "paperBillNo";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 14;
+            this.gridColumn7.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "鍏ュ簱鐘舵��";
+            this.gridColumn22.FieldName = "mxStatueColor";
+            this.gridColumn22.MinWidth = 24;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 5;
+            this.gridColumn22.Width = 90;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "鍒拌揣鏁伴噺";
+            this.gridColumn23.FieldName = "鍒拌揣鎬婚噺";
+            this.gridColumn23.MinWidth = 24;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Width = 90;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "妫�楠屾暟閲�";
+            this.gridColumn24.FieldName = "妫�楠屾�婚噺";
+            this.gridColumn24.MinWidth = 24;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Width = 90;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "鍏ュ簱鏁伴噺";
+            this.gridColumn25.FieldName = "鍏ュ簱鎬婚噺";
+            this.gridColumn25.MinWidth = 24;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Width = 90;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "鎵撳嵃鏁伴噺";
+            this.gridColumn26.FieldName = "鎵撳嵃鎬婚噺";
+            this.gridColumn26.MinWidth = 24;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Width = 90;
+            // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
@@ -466,7 +557,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1231, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1550, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -474,7 +565,7 @@
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1231, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1550, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -494,7 +585,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.Size = new System.Drawing.Size(1550, 570);
             this.splitMx1.SplitterPosition = 149;
             this.splitMx1.TabIndex = 0;
             // 
@@ -513,8 +604,10 @@
             this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_checkUser);
             this.layoutMx1.Controls.Add(this.txt_checkDate);
-            this.layoutMx1.Controls.Add(this.txt_paperBillNo);
             this.layoutMx1.Controls.Add(this.txt_guid);
+            this.layoutMx1.Controls.Add(this.txt_paperBillNo);
+            this.layoutMx1.Controls.Add(this.txt_isSrm);
+            this.layoutMx1.Controls.Add(this.txt_mxStatue);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem18,
@@ -523,7 +616,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(758, 132, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1231, 149);
+            this.layoutMx1.Size = new System.Drawing.Size(1550, 149);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -548,10 +641,10 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(401, 76);
+            this.txt_remark.Location = new System.Drawing.Point(481, 76);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(212, 24);
+            this.txt_remark.Size = new System.Drawing.Size(291, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 240;
             // 
@@ -559,17 +652,18 @@
             // 
             this.txt_receiveOrgId.IsReadly = false;
             this.txt_receiveOrgId.Location = new System.Drawing.Point(99, 44);
+            this.txt_receiveOrgId.Margin = new System.Windows.Forms.Padding(4);
             this.txt_receiveOrgId.Name = "txt_receiveOrgId";
-            this.txt_receiveOrgId.Size = new System.Drawing.Size(211, 24);
+            this.txt_receiveOrgId.Size = new System.Drawing.Size(291, 24);
             this.txt_receiveOrgId.TabIndex = 457;
             // 
             // txtSupplierCode
             // 
-            this.txtSupplierCode.Location = new System.Drawing.Point(401, 44);
+            this.txtSupplierCode.Location = new System.Drawing.Point(481, 44);
             this.txtSupplierCode.Name = "txtSupplierCode";
             this.txtSupplierCode.Properties.Appearance.Options.UseFont = true;
             this.txtSupplierCode.Properties.Tag = "";
-            this.txtSupplierCode.Size = new System.Drawing.Size(212, 24);
+            this.txtSupplierCode.Size = new System.Drawing.Size(291, 24);
             this.txtSupplierCode.StyleController = this.layoutMx1;
             this.txtSupplierCode.TabIndex = 451;
             this.txtSupplierCode.Tag = "readOnly";
@@ -580,7 +674,7 @@
             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(211, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(291, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 213;
             this.txt_billNo.Tag = "readOnly";
@@ -591,77 +685,68 @@
             this.txt_suppId.Location = new System.Drawing.Point(99, 76);
             this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(211, 24);
+            this.txt_suppId.Size = new System.Drawing.Size(291, 24);
             this.txt_suppId.TabIndex = 440;
             // 
             // txt_fstatus
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(920, 76);
+            this.txt_fstatus.Location = new System.Drawing.Point(1158, 76);
             this.txt_fstatus.Name = "txt_fstatus";
             this.txt_fstatus.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fstatus.Size = new System.Drawing.Size(299, 24);
+            this.txt_fstatus.Size = new System.Drawing.Size(380, 24);
             this.txt_fstatus.StyleController = this.layoutMx1;
             this.txt_fstatus.TabIndex = 458;
             this.txt_fstatus.Tag = "readOnly";
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(314, 12);
+            this.txt_fType.Location = new System.Drawing.Point(394, 12);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(299, 24);
+            this.txt_fType.Size = new System.Drawing.Size(378, 24);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 459;
             this.txt_fType.Tag = "readOnly";
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(704, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(863, 12);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(212, 24);
+            this.txt_createBy.Size = new System.Drawing.Size(291, 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(704, 44);
+            this.txt_createDate.Location = new System.Drawing.Point(863, 44);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(212, 24);
+            this.txt_createDate.Size = new System.Drawing.Size(291, 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(1007, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(1245, 12);
             this.txt_checkUser.Name = "txt_checkUser";
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(212, 24);
+            this.txt_checkUser.Size = new System.Drawing.Size(293, 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(1007, 44);
+            this.txt_checkDate.Location = new System.Drawing.Point(1245, 44);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(212, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(293, 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(704, 76);
-            this.txt_paperBillNo.Name = "txt_paperBillNo";
-            this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(212, 24);
-            this.txt_paperBillNo.StyleController = this.layoutMx1;
-            this.txt_paperBillNo.TabIndex = 465;
             // 
             // txt_guid
             // 
@@ -671,6 +756,34 @@
             this.txt_guid.StyleController = this.layoutMx1;
             this.txt_guid.TabIndex = 466;
             this.txt_guid.Tag = "readOnly";
+            // 
+            // txt_paperBillNo
+            // 
+            this.txt_paperBillNo.Location = new System.Drawing.Point(863, 76);
+            this.txt_paperBillNo.Name = "txt_paperBillNo";
+            this.txt_paperBillNo.Size = new System.Drawing.Size(291, 24);
+            this.txt_paperBillNo.StyleController = this.layoutMx1;
+            this.txt_paperBillNo.TabIndex = 467;
+            // 
+            // txt_isSrm
+            // 
+            this.txt_isSrm.Location = new System.Drawing.Point(1158, 108);
+            this.txt_isSrm.Name = "txt_isSrm";
+            this.txt_isSrm.Properties.Caption = "SRM鏍囪瘑";
+            this.txt_isSrm.Size = new System.Drawing.Size(380, 24);
+            this.txt_isSrm.StyleController = this.layoutMx1;
+            this.txt_isSrm.TabIndex = 468;
+            this.txt_isSrm.Tag = "readOnly";
+            // 
+            // txt_mxStatue
+            // 
+            this.txt_mxStatue.Location = new System.Drawing.Point(481, 108);
+            this.txt_mxStatue.Name = "txt_mxStatue";
+            this.txt_mxStatue.Properties.Appearance.Options.UseFont = true;
+            this.txt_mxStatue.Size = new System.Drawing.Size(291, 24);
+            this.txt_mxStatue.StyleController = this.layoutMx1;
+            this.txt_mxStatue.TabIndex = 240;
+            this.txt_mxStatue.Tag = "readOnly";
             // 
             // layoutControlItem18
             // 
@@ -701,7 +814,6 @@
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem1,
-            this.layoutControlItem2,
             this.layoutControlItem3,
             this.layoutControlItem11,
             this.layoutControlItem12,
@@ -712,7 +824,10 @@
             this.layoutControlItem5,
             this.layoutControlItem17,
             this.layoutControlItem16,
-            this.lab_paperBillNo});
+            this.layoutControlItem4,
+            this.layoutControlItem6,
+            this.layoutControlItem10,
+            this.layoutControlItem2});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -741,7 +856,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1231, 149);
+            this.Root.Size = new System.Drawing.Size(1550, 149);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -750,18 +865,9 @@
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 32);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(302, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(382, 32);
             this.layoutControlItem1.Text = "鏀舵枡缁勭粐";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_billNo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(302, 32);
-            this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem3
             // 
@@ -769,60 +875,60 @@
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(302, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(382, 32);
             this.layoutControlItem3.Text = "閫変緵搴斿晢";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_createBy;
-            this.layoutControlItem11.Location = new System.Drawing.Point(605, 0);
+            this.layoutControlItem11.Location = new System.Drawing.Point(764, 0);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(382, 32);
             this.layoutControlItem11.Text = "寤虹珛浜哄憳";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_createDate;
-            this.layoutControlItem12.Location = new System.Drawing.Point(605, 32);
+            this.layoutControlItem12.Location = new System.Drawing.Point(764, 32);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem12.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(382, 32);
             this.layoutControlItem12.Text = "寤虹珛鏃ユ湡";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_checkUser;
-            this.layoutControlItem13.Location = new System.Drawing.Point(908, 0);
+            this.layoutControlItem13.Location = new System.Drawing.Point(1146, 0);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(384, 32);
             this.layoutControlItem13.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_checkDate;
-            this.layoutControlItem14.Location = new System.Drawing.Point(908, 32);
+            this.layoutControlItem14.Location = new System.Drawing.Point(1146, 32);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(384, 32);
             this.layoutControlItem14.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_fstatus;
-            this.layoutControlItem7.Location = new System.Drawing.Point(908, 64);
+            this.layoutControlItem7.Location = new System.Drawing.Point(1146, 64);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(384, 32);
             this.layoutControlItem7.Text = "鎻愪氦妫�楠�";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem7.TextVisible = false;
@@ -830,10 +936,10 @@
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_fType;
-            this.layoutControlItem8.Location = new System.Drawing.Point(302, 0);
+            this.layoutControlItem8.Location = new System.Drawing.Point(382, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(382, 32);
             this.layoutControlItem8.Text = "濮斿鏍囪瘑";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
@@ -841,22 +947,22 @@
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txtSupplierCode;
-            this.layoutControlItem5.Location = new System.Drawing.Point(302, 32);
+            this.layoutControlItem5.Location = new System.Drawing.Point(382, 32);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(382, 32);
             this.layoutControlItem5.Text = "渚涘簲鍟嗙紪鐮�";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_remark;
-            this.layoutControlItem17.Location = new System.Drawing.Point(302, 64);
+            this.layoutControlItem17.Location = new System.Drawing.Point(382, 64);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(303, 32);
+            this.layoutControlItem17.Size = new System.Drawing.Size(382, 32);
             this.layoutControlItem17.Text = "鏀舵枡澶囨敞";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -868,22 +974,55 @@
             this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(302, 33);
+            this.layoutControlItem16.Size = new System.Drawing.Size(382, 33);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "閫夋嫨鐗╂枡";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem16.TextVisible = false;
             // 
-            // lab_paperBillNo
+            // layoutControlItem4
             // 
-            this.lab_paperBillNo.Control = this.txt_paperBillNo;
-            this.lab_paperBillNo.Location = new System.Drawing.Point(605, 64);
-            this.lab_paperBillNo.Name = "lab_paperBillNo";
-            this.lab_paperBillNo.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.lab_paperBillNo.OptionsTableLayoutItem.RowIndex = 2;
-            this.lab_paperBillNo.Size = new System.Drawing.Size(303, 32);
-            this.lab_paperBillNo.Text = "閫佽揣鍗曞彿";
-            this.lab_paperBillNo.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem4.Control = this.txt_paperBillNo;
+            this.layoutControlItem4.Location = new System.Drawing.Point(764, 64);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem4.Size = new System.Drawing.Size(382, 32);
+            this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_isSrm;
+            this.layoutControlItem6.Location = new System.Drawing.Point(1146, 96);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem6.Size = new System.Drawing.Size(384, 33);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem6.TextVisible = false;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_mxStatue;
+            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
+            this.layoutControlItem10.CustomizationFormText = "鍏ュ簱鐘舵��";
+            this.layoutControlItem10.Location = new System.Drawing.Point(382, 96);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem10.Size = new System.Drawing.Size(382, 33);
+            this.layoutControlItem10.Text = "鍏ュ簱鐘舵��";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_billNo;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.Size = new System.Drawing.Size(382, 32);
+            this.layoutControlItem2.Text = "鍒拌揣鍗曞彿";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
             // tabMx
             // 
@@ -891,7 +1030,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1231, 409);
+            this.tabMx.Size = new System.Drawing.Size(1550, 409);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -900,7 +1039,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1229, 377);
+            this.tabMxPage1.Size = new System.Drawing.Size(1548, 377);
             this.tabMxPage1.Text = "鏀舵枡鏄庣粏";
             // 
             // gcMx1
@@ -913,7 +1052,7 @@
             this.repositoryItemButtonEdit1,
             this.repositoryItemButtonEdit2,
             this.rptHistory});
-            this.gcMx1.Size = new System.Drawing.Size(1229, 377);
+            this.gcMx1.Size = new System.Drawing.Size(1548, 377);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -941,7 +1080,6 @@
             this.gvMx1checkDate,
             this.gridColumn3,
             this.gridColumn9,
-            this.gridColumn7,
             this.gridColumn6,
             this.gridColumn10,
             this.gridColumn12,
@@ -953,7 +1091,10 @@
             this.gridColumn16,
             this.gridColumn2,
             this.gridColumn17,
-            this.gridColumn18});
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1013,7 +1154,7 @@
             this.gvMx1returnFlag.UnboundDataType = typeof(bool);
             this.gvMx1returnFlag.Visible = true;
             this.gvMx1returnFlag.VisibleIndex = 0;
-            this.gvMx1returnFlag.Width = 26;
+            this.gvMx1returnFlag.Width = 63;
             // 
             // gvMx1urgentFlag
             // 
@@ -1023,14 +1164,14 @@
             this.gvMx1urgentFlag.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1urgentFlag.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1urgentFlag.Caption = "鎬ユ枡";
-            this.gvMx1urgentFlag.FieldName = "urgentFlag";
+            this.gvMx1urgentFlag.FieldName = "urgentFlagTxt";
             this.gvMx1urgentFlag.MinWidth = 25;
             this.gvMx1urgentFlag.Name = "gvMx1urgentFlag";
-            this.gvMx1urgentFlag.Tag = "edit";
-            this.gvMx1urgentFlag.UnboundDataType = typeof(bool);
+            this.gvMx1urgentFlag.Tag = "";
+            this.gvMx1urgentFlag.UnboundDataType = typeof(string);
             this.gvMx1urgentFlag.Visible = true;
             this.gvMx1urgentFlag.VisibleIndex = 1;
-            this.gvMx1urgentFlag.Width = 25;
+            this.gvMx1urgentFlag.Width = 34;
             // 
             // gvMx1isdepsIn
             // 
@@ -1055,7 +1196,7 @@
             this.gvMx1checkStates.Tag = "query_a.check_states";
             this.gvMx1checkStates.Visible = true;
             this.gvMx1checkStates.VisibleIndex = 2;
-            this.gvMx1checkStates.Width = 48;
+            this.gvMx1checkStates.Width = 66;
             // 
             // gvMx1checkRes
             // 
@@ -1068,7 +1209,7 @@
             this.gvMx1checkRes.Tag = "query_a.check_res";
             this.gvMx1checkRes.Visible = true;
             this.gvMx1checkRes.VisibleIndex = 3;
-            this.gvMx1checkRes.Width = 48;
+            this.gvMx1checkRes.Width = 66;
             // 
             // gvMx1ebeln
             // 
@@ -1081,7 +1222,7 @@
             this.gvMx1ebeln.Tag = "query_a.ebeln";
             this.gvMx1ebeln.Visible = true;
             this.gvMx1ebeln.VisibleIndex = 4;
-            this.gvMx1ebeln.Width = 120;
+            this.gvMx1ebeln.Width = 129;
             // 
             // gridColumn8
             // 
@@ -1091,7 +1232,7 @@
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 5;
-            this.gridColumn8.Width = 37;
+            this.gridColumn8.Width = 53;
             // 
             // gvMx1boardStyle
             // 
@@ -1104,7 +1245,7 @@
             this.gvMx1boardStyle.Tag = "query_a.board_style";
             this.gvMx1boardStyle.Visible = true;
             this.gvMx1boardStyle.VisibleIndex = 6;
-            this.gvMx1boardStyle.Width = 96;
+            this.gvMx1boardStyle.Width = 73;
             // 
             // gvMx1ebelnQty
             // 
@@ -1117,7 +1258,7 @@
             this.gvMx1ebelnQty.Tag = "query_a.ebeln_qty";
             this.gvMx1ebelnQty.Visible = true;
             this.gvMx1ebelnQty.VisibleIndex = 7;
-            this.gvMx1ebelnQty.Width = 42;
+            this.gvMx1ebelnQty.Width = 64;
             // 
             // gvMx1subQty
             // 
@@ -1129,8 +1270,8 @@
             this.gvMx1subQty.OptionsColumn.ReadOnly = true;
             this.gvMx1subQty.Tag = "query_a.sub_qty";
             this.gvMx1subQty.Visible = true;
-            this.gvMx1subQty.VisibleIndex = 9;
-            this.gvMx1subQty.Width = 42;
+            this.gvMx1subQty.VisibleIndex = 8;
+            this.gvMx1subQty.Width = 64;
             // 
             // gvMx1quantity
             // 
@@ -1145,8 +1286,8 @@
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "yz_quantity_0_edit";
             this.gvMx1quantity.Visible = true;
-            this.gvMx1quantity.VisibleIndex = 10;
-            this.gvMx1quantity.Width = 42;
+            this.gvMx1quantity.VisibleIndex = 9;
+            this.gvMx1quantity.Width = 64;
             // 
             // gvMx1memo
             // 
@@ -1162,8 +1303,8 @@
             this.gvMx1memo.OptionsColumn.ReadOnly = true;
             this.gvMx1memo.Tag = "edit";
             this.gvMx1memo.Visible = true;
-            this.gvMx1memo.VisibleIndex = 11;
-            this.gvMx1memo.Width = 96;
+            this.gvMx1memo.VisibleIndex = 10;
+            this.gvMx1memo.Width = 110;
             // 
             // gvMx1okRkqty
             // 
@@ -1175,8 +1316,8 @@
             this.gvMx1okRkqty.OptionsColumn.ReadOnly = true;
             this.gvMx1okRkqty.Tag = "query_a.ok_rkqty";
             this.gvMx1okRkqty.Visible = true;
-            this.gvMx1okRkqty.VisibleIndex = 8;
-            this.gvMx1okRkqty.Width = 42;
+            this.gvMx1okRkqty.VisibleIndex = 11;
+            this.gvMx1okRkqty.Width = 64;
             // 
             // gvMx1checkDate
             // 
@@ -1206,19 +1347,8 @@
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.OptionsColumn.ReadOnly = true;
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 12;
-            this.gridColumn9.Width = 26;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "搴撳瓨鍗曚綅";
-            this.gridColumn7.FieldName = "kcUnit";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.OptionsColumn.ReadOnly = true;
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 13;
-            this.gridColumn7.Width = 26;
+            this.gridColumn9.VisibleIndex = 14;
+            this.gridColumn9.Width = 40;
             // 
             // gridColumn6
             // 
@@ -1228,8 +1358,8 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 14;
-            this.gridColumn6.Width = 96;
+            this.gridColumn6.VisibleIndex = 15;
+            this.gridColumn6.Width = 119;
             // 
             // gridColumn10
             // 
@@ -1238,8 +1368,8 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 18;
-            this.gridColumn10.Width = 25;
+            this.gridColumn10.VisibleIndex = 19;
+            this.gridColumn10.Width = 43;
             // 
             // gridColumn12
             // 
@@ -1247,8 +1377,6 @@
             this.gridColumn12.FieldName = "returnDate";
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 19;
             this.gridColumn12.Width = 25;
             // 
             // gridColumn13
@@ -1257,8 +1385,6 @@
             this.gridColumn13.FieldName = "returnBy";
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 20;
             this.gridColumn13.Width = 25;
             // 
             // gvBtnAlawys
@@ -1268,7 +1394,7 @@
             this.gvBtnAlawys.MinWidth = 80;
             this.gvBtnAlawys.Name = "gvBtnAlawys";
             this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 21;
+            this.gvBtnAlawys.VisibleIndex = 22;
             this.gvBtnAlawys.Width = 80;
             // 
             // repositoryItemButtonEdit2
@@ -1289,8 +1415,8 @@
             this.gvMxDel.MinWidth = 80;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 22;
-            this.gvMxDel.Width = 80;
+            this.gvMxDel.VisibleIndex = 23;
+            this.gvMxDel.Width = 103;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -1313,33 +1439,33 @@
             // 
             // gridColumn15
             // 
-            this.gridColumn15.Caption = "澶勭悊鎰忚";
+            this.gridColumn15.Caption = "OA澶勭悊鎰忚";
             this.gridColumn15.FieldName = "clyj";
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 15;
-            this.gridColumn15.Width = 50;
+            this.gridColumn15.VisibleIndex = 16;
+            this.gridColumn15.Width = 89;
             // 
             // gridColumn16
             // 
-            this.gridColumn16.Caption = "鎸戦�夋暟閲�";
+            this.gridColumn16.Caption = "OA鎸戦�夋暟閲�";
             this.gridColumn16.FieldName = "txsl";
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 16;
-            this.gridColumn16.Width = 50;
+            this.gridColumn16.VisibleIndex = 17;
+            this.gridColumn16.Width = 89;
             // 
             // gridColumn2
             // 
-            this.gridColumn2.Caption = "閫夊埆绫诲埆";
+            this.gridColumn2.Caption = "OA閫夊埆绫诲埆";
             this.gridColumn2.FieldName = "xblb";
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 17;
-            this.gridColumn2.Width = 26;
+            this.gridColumn2.VisibleIndex = 18;
+            this.gridColumn2.Width = 44;
             // 
             // gridColumn17
             // 
@@ -1348,8 +1474,8 @@
             this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 23;
-            this.gridColumn17.Width = 26;
+            this.gridColumn17.VisibleIndex = 21;
+            this.gridColumn17.Width = 124;
             // 
             // rptHistory
             // 
@@ -1370,6 +1496,52 @@
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Width = 94;
             // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "绱楠岄��";
+            this.gridColumn19.FieldName = "ljyt";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 12;
+            this.gridColumn19.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "绱浠撻��";
+            this.gridColumn20.FieldName = "ljct";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 13;
+            this.gridColumn20.Width = 94;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "娓呯偣鐘舵��";
+            this.gridColumn21.FieldName = "mxStatue";
+            this.gridColumn21.MinWidth = 24;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 20;
+            // 
+            // xtraTabPageReport
+            // 
+            this.xtraTabPageReport.Controls.Add(this.ucRptCgdhd1);
+            this.xtraTabPageReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources._3dcolumn_16x16;
+            this.xtraTabPageReport.Margin = new System.Windows.Forms.Padding(2);
+            this.xtraTabPageReport.Name = "xtraTabPageReport";
+            this.xtraTabPageReport.Size = new System.Drawing.Size(1550, 570);
+            this.xtraTabPageReport.Text = "鎶ヨ〃";
+            // 
+            // ucRptCgdhd1
+            // 
+            this.ucRptCgdhd1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.ucRptCgdhd1.Location = new System.Drawing.Point(0, 0);
+            this.ucRptCgdhd1.Name = "ucRptCgdhd1";
+            this.ucRptCgdhd1.Size = new System.Drawing.Size(1550, 570);
+            this.ucRptCgdhd1.TabIndex = 0;
+            // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
@@ -1385,7 +1557,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1233, 682);
+            this.ClientSize = new System.Drawing.Size(1552, 682);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
@@ -1419,13 +1591,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_paperBillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_isSrm.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mxStatue.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).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.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -1436,7 +1609,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.lab_paperBillNo)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1445,6 +1621,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptHistory)).EndInit();
+            this.xtraTabPageReport.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -1482,7 +1659,6 @@
         private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraEditors.CheckEdit txt_fstatus;
         private DevExpress.XtraEditors.CheckEdit txt_fType;
@@ -1514,7 +1690,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
         private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
@@ -1528,7 +1703,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
         private DevExpress.XtraEditors.TextEdit txt_guid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
@@ -1545,6 +1719,28 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem lab_paperBillNo;
+        private DevExpress.XtraEditors.TextEdit txt_paperBillNo;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.CheckEdit txt_isSrm;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+
+        private DevExpress.XtraTab.XtraTabPage xtraTabPageReport;
+ 
+
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraEditors.TextEdit txt_mxStatue;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+ 
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private Rpt.UcRptCgdhd ucRptCgdhd1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3