From f23d33d0cf77a73d449cd7c38effda9e50c8fda4 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 06 三月 2025 08:13:37 +0800
Subject: [PATCH] 版面

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  151 ++++++++++++++++++++++++++++++++++----------------
 1 files changed, 103 insertions(+), 48 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 5e50eab..5e8ba3f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -98,7 +98,7 @@
             this.txt_daa016 = new DevExpress.XtraEditors.TextEdit();
             this.gv_daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_daa015 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
             this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_daa013 = new DevExpress.XtraEditors.LabelControl();
             this.txt_dptName = new DevExpress.XtraEditors.TextEdit();
@@ -144,6 +144,12 @@
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = 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.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -179,8 +185,6 @@
             this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -191,7 +195,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa017.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).BeginInit();
@@ -235,7 +239,7 @@
             this.gvMx2itemSname.Name = "gvMx2itemSname";
             this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 8;
+            this.gvMx2itemSname.VisibleIndex = 6;
             this.gvMx2itemSname.Width = 94;
             // 
             // gvMx2unit
@@ -248,7 +252,7 @@
             this.gvMx2unit.Name = "gvMx2unit";
             this.gvMx2unit.Tag = "query_a.UNIT";
             this.gvMx2unit.Visible = true;
-            this.gvMx2unit.VisibleIndex = 6;
+            this.gvMx2unit.VisibleIndex = 4;
             this.gvMx2unit.Width = 94;
             // 
             // gvMx2createDate
@@ -261,7 +265,7 @@
             this.gvMx2createDate.Name = "gvMx2createDate";
             this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
             this.gvMx2createDate.Visible = true;
-            this.gvMx2createDate.VisibleIndex = 5;
+            this.gvMx2createDate.VisibleIndex = 9;
             this.gvMx2createDate.Width = 94;
             // 
             // gvMx2createBy
@@ -274,7 +278,7 @@
             this.gvMx2createBy.Name = "gvMx2createBy";
             this.gvMx2createBy.Tag = "query_a.CREATE_BY";
             this.gvMx2createBy.Visible = true;
-            this.gvMx2createBy.VisibleIndex = 4;
+            this.gvMx2createBy.VisibleIndex = 8;
             this.gvMx2createBy.Width = 94;
             // 
             // gvMx2quantity
@@ -345,12 +349,12 @@
             this.gridColumn19,
             this.gvMx2itemBarcode,
             this.gvMx2quantity,
-            this.gvMx2createBy,
-            this.gvMx2createDate,
             this.gvMx2unit,
             this.gridColumn18,
             this.gvMx2itemSname,
             this.gridColumn17,
+            this.gvMx2createBy,
+            this.gvMx2createDate,
             this.gvBtnAlawys});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
@@ -361,6 +365,7 @@
             // gridColumn20
             // 
             this.gridColumn20.Caption = "鎶ュ伐鏍囪瘑";
+            this.gridColumn20.FieldName = "isBg";
             this.gridColumn20.MaxWidth = 50;
             this.gridColumn20.MinWidth = 50;
             this.gridColumn20.Name = "gridColumn20";
@@ -371,6 +376,7 @@
             // gridColumn19
             // 
             this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
+            this.gridColumn19.FieldName = "isRk";
             this.gridColumn19.MaxWidth = 50;
             this.gridColumn19.MinWidth = 50;
             this.gridColumn19.Name = "gridColumn19";
@@ -385,7 +391,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 7;
+            this.gridColumn18.VisibleIndex = 5;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn17
@@ -395,7 +401,7 @@
             this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 9;
+            this.gridColumn17.VisibleIndex = 7;
             this.gridColumn17.Width = 94;
             // 
             // gvBtnAlawys
@@ -870,8 +876,8 @@
             this.gv_daa027.AppearanceCell.Options.UseFont = true;
             this.gv_daa027.AppearanceHeader.Options.UseTextOptions = true;
             this.gv_daa027.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gv_daa027.Caption = "澶囨枡鏍囪瘑";
-            this.gv_daa027.FieldName = "daa027";
+            this.gv_daa027.Caption = "澶囨枡瀹屾垚";
+            this.gv_daa027.FieldName = "daa027Chk";
             this.gv_daa027.MaxWidth = 50;
             this.gv_daa027.MinWidth = 50;
             this.gv_daa027.Name = "gv_daa027";
@@ -1007,22 +1013,22 @@
             this.lb_daa015.TabIndex = 267;
             this.lb_daa015.Text = "鐢熶骇绾垮埆";
             // 
-            // txt_daa015
+            // txt_lineName
             // 
-            this.txt_daa015.Location = new System.Drawing.Point(343, 111);
-            this.txt_daa015.Name = "txt_daa015";
-            this.txt_daa015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_daa015.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa015.Size = new System.Drawing.Size(159, 28);
-            this.txt_daa015.TabIndex = 267;
-            this.txt_daa015.Tag = "readonly";
+            this.txt_lineName.Location = new System.Drawing.Point(343, 111);
+            this.txt_lineName.Name = "txt_lineName";
+            this.txt_lineName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
+            this.txt_lineName.Size = new System.Drawing.Size(159, 28);
+            this.txt_lineName.TabIndex = 267;
+            this.txt_lineName.Tag = "readonly";
             // 
             // gv_daa015
             // 
             this.gv_daa015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa015.AppearanceCell.Options.UseFont = true;
             this.gv_daa015.Caption = "鐢熶骇绾垮埆";
-            this.gv_daa015.FieldName = "daa015";
+            this.gv_daa015.FieldName = "lineName";
             this.gv_daa015.MinWidth = 50;
             this.gv_daa015.Name = "gv_daa015";
             this.gv_daa015.OptionsColumn.AllowEdit = false;
@@ -1415,7 +1421,11 @@
             this.gv_mesStartProd,
             this.gv_mesEndProd,
             this.gridColumn21,
-            this.gridColumn22});
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn25,
+            this.gridColumn26});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -1533,6 +1543,7 @@
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn3.FieldName = "itemNo";
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
@@ -1562,12 +1573,72 @@
             // gridColumn2
             // 
             this.gridColumn2.Caption = "瀹為檯绾垮埆";
-            this.gridColumn2.FieldName = "sjXt";
+            this.gridColumn2.FieldName = "sjlineName";
             this.gridColumn2.MinWidth = 50;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 25;
             this.gridColumn2.Width = 94;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "鎺掍骇浜�";
+            this.gridColumn21.FieldName = "pcUser";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 32;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "鎺掍骇鏃堕棿";
+            this.gridColumn22.FieldName = "pcDate";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 33;
+            this.gridColumn22.Width = 94;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "GUID";
+            this.gridColumn23.FieldName = "guid";
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 34;
+            this.gridColumn23.Width = 94;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鎺掍骇缂栧彿";
+            this.gridColumn24.FieldName = "pcHNo";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 35;
+            this.gridColumn24.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "浠诲姟鍗曞彿";
+            this.gridColumn25.FieldName = "daa021";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 36;
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.Caption = "棣栦欢妫�楠岀粨鏋�";
+            this.gridColumn26.FieldName = "daa026";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 37;
+            this.gridColumn26.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -1660,7 +1731,7 @@
             this.panel1.Controls.Add(this.lb_daa016);
             this.panel1.Controls.Add(this.txt_daa016);
             this.panel1.Controls.Add(this.lb_daa015);
-            this.panel1.Controls.Add(this.txt_daa015);
+            this.panel1.Controls.Add(this.txt_lineName);
             this.panel1.Controls.Add(this.lb_daa013);
             this.panel1.Controls.Add(this.txt_dptName);
             this.panel1.Controls.Add(this.lb_daa011);
@@ -1968,26 +2039,6 @@
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Visible = false;
             // 
-            // gridColumn21
-            // 
-            this.gridColumn21.Caption = "鎺掍骇浜�";
-            this.gridColumn21.FieldName = "pcUser";
-            this.gridColumn21.MinWidth = 25;
-            this.gridColumn21.Name = "gridColumn21";
-            this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 32;
-            this.gridColumn21.Width = 94;
-            // 
-            // gridColumn22
-            // 
-            this.gridColumn22.Caption = "鎺掍骇鏃堕棿";
-            this.gridColumn22.FieldName = "pcDate";
-            this.gridColumn22.MinWidth = 25;
-            this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 33;
-            this.gridColumn22.Width = 94;
-            // 
             // Frm_Womdaa
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2007,7 +2058,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa017.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa016.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa011.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa010.Properties)).EndInit();
@@ -2112,7 +2163,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa016;
 
         private DevExpress.XtraEditors.LabelControl lb_daa015;
-        private DevExpress.XtraEditors.TextEdit txt_daa015;
+        private DevExpress.XtraEditors.TextEdit txt_lineName;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
 
         private DevExpress.XtraEditors.LabelControl lb_daa013;
@@ -2205,5 +2256,9 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3