From 2fb710372202d0ef4e64a308892169551d3b5110 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 12 十一月 2025 09:52:10 +0800
Subject: [PATCH] 合并领料

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs |  250 ++++++++++++++++++++++++--------------------------
 1 files changed, 120 insertions(+), 130 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs
index d624385..657d19b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_Wwgdhb.Designer.cs
@@ -70,6 +70,8 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_Ck = new Gs.DevApp.UserControl.UcLookCk();
+            this.txt_Supplier = new Gs.DevApp.UserControl.UcLookSupplier();
             this.lbGuid = new System.Windows.Forms.Label();
             this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
             this.txt_erpId = new Gs.DevApp.UserControl.UcLookOrg();
@@ -81,16 +83,18 @@
             this.txt_gds = new DevExpress.XtraEditors.TextEdit();
             this.txt_hbsl = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -109,8 +113,7 @@
             this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
-            this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.none = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa007 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -148,10 +151,7 @@
             this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.txt_Supplier = new Gs.DevApp.UserControl.UcLookSupplier();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_Ck = new Gs.DevApp.UserControl.UcLookCk();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -181,16 +181,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_gds.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_hbsl.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -200,7 +202,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.none)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -208,8 +210,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -557,7 +557,8 @@
             this.layoutMx1.Controls.Add(this.txt_hbsl);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem9});
+            this.layoutControlItem9,
+            this.layoutControlItem11});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutMx1.Name = "layoutMx1";
@@ -566,6 +567,24 @@
             this.layoutMx1.Size = new System.Drawing.Size(985, 176);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // txt_Ck
+            // 
+            this.txt_Ck.IsReadly = false;
+            this.txt_Ck.Location = new System.Drawing.Point(317, 64);
+            this.txt_Ck.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_Ck.Name = "txt_Ck";
+            this.txt_Ck.Size = new System.Drawing.Size(173, 20);
+            this.txt_Ck.TabIndex = 466;
+            // 
+            // txt_Supplier
+            // 
+            this.txt_Supplier.IsReadly = false;
+            this.txt_Supplier.Location = new System.Drawing.Point(76, 64);
+            this.txt_Supplier.Margin = new System.Windows.Forms.Padding(0);
+            this.txt_Supplier.Name = "txt_Supplier";
+            this.txt_Supplier.Size = new System.Drawing.Size(173, 20);
+            this.txt_Supplier.TabIndex = 465;
             // 
             // lbGuid
             // 
@@ -621,18 +640,18 @@
             // 
             // txt_cjr
             // 
-            this.txt_cjr.Location = new System.Drawing.Point(799, 64);
+            this.txt_cjr.Location = new System.Drawing.Point(558, 64);
             this.txt_cjr.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_cjr.Name = "txt_cjr";
             this.txt_cjr.Properties.Appearance.Options.UseFont = true;
-            this.txt_cjr.Size = new System.Drawing.Size(174, 20);
+            this.txt_cjr.Size = new System.Drawing.Size(173, 20);
             this.txt_cjr.StyleController = this.layoutMx1;
             this.txt_cjr.TabIndex = 273;
             this.txt_cjr.Tag = "readonly";
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(558, 64);
+            this.txt_createDate.Location = new System.Drawing.Point(317, 64);
             this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
@@ -643,7 +662,7 @@
             // 
             // txt_fstatus
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(735, 116);
+            this.txt_fstatus.Location = new System.Drawing.Point(735, 64);
             this.txt_fstatus.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_fstatus.Name = "txt_fstatus";
             this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
@@ -680,6 +699,17 @@
             this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem9.TextVisible = false;
             // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_Ck;
+            this.layoutControlItem11.Location = new System.Drawing.Point(241, 52);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem11.Size = new System.Drawing.Size(241, 52);
+            this.layoutControlItem11.Text = "浠撳簱";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(52, 14);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -689,13 +719,12 @@
             this.layoutControlItem7,
             this.layoutControlItem1,
             this.layoutControlItem2,
-            this.layoutControlItem3,
-            this.layoutControlItem5,
             this.layoutControlItem10,
-            this.layoutControlItem6,
             this.layoutControlItem12,
             this.layoutControlItem4,
-            this.layoutControlItem11});
+            this.layoutControlItem3,
+            this.layoutControlItem5,
+            this.layoutControlItem6});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -770,28 +799,6 @@
             this.layoutControlItem2.Text = "鍚堝苟鍗曞彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(52, 14);
             // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_createDate;
-            this.layoutControlItem3.Location = new System.Drawing.Point(482, 52);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(241, 52);
-            this.layoutControlItem3.Text = "鍒涘缓鏃ユ湡 ";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(52, 14);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_cjr;
-            this.layoutControlItem5.Location = new System.Drawing.Point(723, 52);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(242, 52);
-            this.layoutControlItem5.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(52, 14);
-            // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_gds;
@@ -802,18 +809,6 @@
             this.layoutControlItem10.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(52, 14);
             // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_fstatus;
-            this.layoutControlItem6.Location = new System.Drawing.Point(723, 104);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(242, 52);
-            this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
-            // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_hbsl;
@@ -823,6 +818,50 @@
             this.layoutControlItem12.Size = new System.Drawing.Size(242, 52);
             this.layoutControlItem12.Text = "鍚堝苟鏁伴噺";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(52, 14);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_Supplier;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 52);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(241, 52);
+            this.layoutControlItem4.Text = "渚涘簲鍟�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(52, 14);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_createDate;
+            this.layoutControlItem3.Location = new System.Drawing.Point(241, 52);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(241, 52);
+            this.layoutControlItem3.Text = "鍒涘缓鏃ユ湡 ";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(52, 14);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_cjr;
+            this.layoutControlItem5.Location = new System.Drawing.Point(482, 52);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem5.Size = new System.Drawing.Size(241, 52);
+            this.layoutControlItem5.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(52, 14);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fstatus;
+            this.layoutControlItem6.Location = new System.Drawing.Point(723, 52);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(242, 52);
+            this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem6.TextVisible = false;
             // 
             // tabMx
             // 
@@ -857,7 +896,7 @@
             this.repositoryItemDateEdit1,
             this.repositoryItemDateEdit2,
             this.repositoryItemButtonEdit1,
-            this.rptJYBZ,
+            this.none,
             this.repositoryItemDateEdit3});
             this.gcMx1.Size = new System.Drawing.Size(983, 230);
             this.gcMx1.TabIndex = 0;
@@ -882,7 +921,7 @@
             this.gvMx1daa006,
             this.gvMx1daa016,
             this.gvMx1daa018,
-            this.gvMx1daa012,
+            this.gridColumn16,
             this.gvMx1daa002,
             this.gvMx1daa007,
             this.gvMx1daa009,
@@ -1088,33 +1127,15 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
             // 
-            // gvMx1daa012
+            // none
             // 
-            this.gvMx1daa012.AppearanceCell.ForeColor = System.Drawing.Color.Black;
-            this.gvMx1daa012.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa012.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1daa012.AppearanceHeader.ForeColor = System.Drawing.Color.Black;
-            this.gvMx1daa012.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1daa012.Caption = "渚涘簲鍟�";
-            this.gvMx1daa012.ColumnEdit = this.rptJYBZ;
-            this.gvMx1daa012.FieldName = "gys";
-            this.gvMx1daa012.MinWidth = 131;
-            this.gvMx1daa012.Name = "gvMx1daa012";
-            this.gvMx1daa012.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa012.Tag = "";
-            this.gvMx1daa012.Visible = true;
-            this.gvMx1daa012.VisibleIndex = 12;
-            this.gvMx1daa012.Width = 134;
-            // 
-            // rptJYBZ
-            // 
-            this.rptJYBZ.AutoHeight = false;
-            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.none.AutoHeight = false;
+            this.none.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYBZ.Name = "rptJYBZ";
-            this.rptJYBZ.NullText = "-璇烽�夋嫨-";
-            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.rptJYBZ.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
+            this.none.Name = "none";
+            this.none.NullText = "-璇烽�夋嫨-";
+            this.none.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.none.SelectedIndexChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
             // 
             // gvMx1daa002
             // 
@@ -1551,44 +1572,13 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // txt_Supplier
+            // gridColumn16
             // 
-            this.txt_Supplier.IsReadly = false;
-            this.txt_Supplier.Location = new System.Drawing.Point(76, 64);
-            this.txt_Supplier.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_Supplier.Name = "txt_Supplier";
-            this.txt_Supplier.Size = new System.Drawing.Size(173, 20);
-            this.txt_Supplier.TabIndex = 465;
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_Supplier;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 52);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(241, 52);
-            this.layoutControlItem4.Text = "渚涘簲鍟�";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(52, 14);
-            // 
-            // txt_Ck
-            // 
-            this.txt_Ck.IsReadly = false;
-            this.txt_Ck.Location = new System.Drawing.Point(317, 64);
-            this.txt_Ck.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_Ck.Name = "txt_Ck";
-            this.txt_Ck.Size = new System.Drawing.Size(173, 20);
-            this.txt_Ck.TabIndex = 466;
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_Ck;
-            this.layoutControlItem11.Location = new System.Drawing.Point(241, 52);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(241, 52);
-            this.layoutControlItem11.Text = "浠撳簱";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(52, 14);
+            this.gridColumn16.Caption = "渚涘簲鍟�";
+            this.gridColumn16.FieldName = "gys";
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 12;
             // 
             // Frm_Wwgdhb
             // 
@@ -1630,16 +1620,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_gds.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_hbsl.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1649,7 +1641,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.none)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
@@ -1657,8 +1649,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1714,8 +1704,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa007;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa009;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox none;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa017;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa019;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
@@ -1744,11 +1733,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraEditors.TextEdit txt_hbsl;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
@@ -1772,5 +1758,9 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private UserControl.UcLookCk txt_Ck;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3