From 1aca87a7186fe6bff1e6aa9501bc3e7daf1159ba Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 11 三月 2025 14:32:33 +0800
Subject: [PATCH] 生产补料

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs |  373 +++++++++++++++++++++++++++-------------------------
 1 files changed, 195 insertions(+), 178 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 586a779..deb473f 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,18 +29,18 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Wompba));
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -87,16 +87,15 @@
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
-            this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.gvMx1daa016 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa006 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa007 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -104,6 +103,7 @@
             this.gvMx1daa011 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa012 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa017 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa019 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -117,13 +117,14 @@
             this.gvMx1daa026 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1isReportcheck = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa014 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1machineNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -163,10 +164,10 @@
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
@@ -558,29 +559,29 @@
             this.layoutControlItem8});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3});
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
             this.Root.Size = new System.Drawing.Size(1105, 116);
             this.Root.TextVisible = false;
             // 
@@ -714,20 +715,20 @@
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1guid,
             this.caaGuid,
-            this.gvMx1fstatus,
-            this.gvMx1daa016,
-            this.gvMx1daa018,
             this.gvMx1daa002,
+            this.gvMx1daa010,
             this.gvMx1daa005,
             this.gvMx1daa003,
             this.gvMx1daa004,
-            this.gvMx1daa010,
+            this.gvMx1daa018,
+            this.gvMx1daa016,
             this.gvMx1daa008,
             this.gvMx1daa006,
             this.gvMx1daa007,
             this.gvMx1daa009,
             this.gvMx1daa011,
             this.gvMx1daa012,
+            this.gvMx1reporttime,
             this.gvMx1daa017,
             this.gvMx1daa019,
             this.gvMx1checkDate,
@@ -741,9 +742,10 @@
             this.gvMx1daa026,
             this.gvMx1isReportcheck,
             this.gvMx1daa014,
-            this.gvMx1reporttime,
             this.gvMx1machineNo,
             this.gridColumn3,
+            this.gvMx1fstatus,
+            this.gridColumn6,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -772,46 +774,75 @@
             this.caaGuid.OptionsColumn.ReadOnly = true;
             this.caaGuid.Width = 94;
             // 
-            // gvMx1fstatus
+            // gvMx1daa002
             // 
-            this.gvMx1fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
-            this.gvMx1fstatus.FieldName = "caa015";
-            this.gvMx1fstatus.MinWidth = 50;
-            this.gvMx1fstatus.Name = "gvMx1fstatus";
-            this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
-            this.gvMx1fstatus.Tag = "query_a.fstatus";
-            this.gvMx1fstatus.Visible = true;
-            this.gvMx1fstatus.VisibleIndex = 0;
-            this.gvMx1fstatus.Width = 76;
+            this.gvMx1daa002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
+            this.gvMx1daa002.FieldName = "daa001";
+            this.gvMx1daa002.MinWidth = 50;
+            this.gvMx1daa002.Name = "gvMx1daa002";
+            this.gvMx1daa002.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa002.Tag = "query_a.daa002";
+            this.gvMx1daa002.Visible = true;
+            this.gvMx1daa002.VisibleIndex = 0;
+            this.gvMx1daa002.Width = 50;
             // 
-            // gvMx1daa016
+            // gvMx1daa010
             // 
-            this.gvMx1daa016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa016.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa016.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿";
-            this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
-            this.gvMx1daa016.FieldName = "mesStartProd";
-            this.gvMx1daa016.MinWidth = 50;
-            this.gvMx1daa016.Name = "gvMx1daa016";
-            this.gvMx1daa016.Tag = "edit";
-            this.gvMx1daa016.Visible = true;
-            this.gvMx1daa016.VisibleIndex = 1;
-            this.gvMx1daa016.Width = 78;
+            this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
+            this.gvMx1daa010.FieldName = "daa021";
+            this.gvMx1daa010.MinWidth = 50;
+            this.gvMx1daa010.Name = "gvMx1daa010";
+            this.gvMx1daa010.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa010.Tag = "query_a.daa010";
+            this.gvMx1daa010.Visible = true;
+            this.gvMx1daa010.VisibleIndex = 1;
+            this.gvMx1daa010.Width = 50;
             // 
-            // repositoryItemDateEdit2
+            // gvMx1daa005
             // 
-            this.repositoryItemDateEdit2.AutoHeight = false;
-            this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
+            this.gvMx1daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
+            this.gvMx1daa005.FieldName = "itemNo";
+            this.gvMx1daa005.MinWidth = 50;
+            this.gvMx1daa005.Name = "gvMx1daa005";
+            this.gvMx1daa005.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa005.Tag = "query_a.daa005";
+            this.gvMx1daa005.Visible = true;
+            this.gvMx1daa005.VisibleIndex = 2;
+            this.gvMx1daa005.Width = 50;
+            // 
+            // gvMx1daa003
+            // 
+            this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
+            this.gvMx1daa003.FieldName = "daa003";
+            this.gvMx1daa003.MinWidth = 50;
+            this.gvMx1daa003.Name = "gvMx1daa003";
+            this.gvMx1daa003.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa003.Tag = "query_a.daa003";
+            this.gvMx1daa003.Visible = true;
+            this.gvMx1daa003.VisibleIndex = 3;
+            this.gvMx1daa003.Width = 50;
+            // 
+            // gvMx1daa004
+            // 
+            this.gvMx1daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
+            this.gvMx1daa004.FieldName = "daa004";
+            this.gvMx1daa004.MinWidth = 50;
+            this.gvMx1daa004.Name = "gvMx1daa004";
+            this.gvMx1daa004.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa004.Tag = "query_a.daa004";
+            this.gvMx1daa004.Visible = true;
+            this.gvMx1daa004.VisibleIndex = 4;
+            this.gvMx1daa004.Width = 50;
             // 
             // gvMx1daa018
             // 
@@ -828,7 +859,7 @@
             this.gvMx1daa018.Name = "gvMx1daa018";
             this.gvMx1daa018.Tag = "edit";
             this.gvMx1daa018.Visible = true;
-            this.gvMx1daa018.VisibleIndex = 2;
+            this.gvMx1daa018.VisibleIndex = 5;
             this.gvMx1daa018.Width = 50;
             // 
             // repositoryItemDateEdit3
@@ -840,75 +871,32 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
             // 
-            // gvMx1daa002
+            // gvMx1daa016
             // 
-            this.gvMx1daa002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
-            this.gvMx1daa002.FieldName = "daa001";
-            this.gvMx1daa002.MinWidth = 50;
-            this.gvMx1daa002.Name = "gvMx1daa002";
-            this.gvMx1daa002.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa002.Tag = "query_a.daa002";
-            this.gvMx1daa002.Visible = true;
-            this.gvMx1daa002.VisibleIndex = 3;
-            this.gvMx1daa002.Width = 50;
+            this.gvMx1daa016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1daa016.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1daa016.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa016.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1daa016.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1daa016.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1daa016.Caption = "棰勮寮�宸ユ棩鏃堕棿";
+            this.gvMx1daa016.ColumnEdit = this.repositoryItemDateEdit2;
+            this.gvMx1daa016.FieldName = "mesStartProd";
+            this.gvMx1daa016.MinWidth = 50;
+            this.gvMx1daa016.Name = "gvMx1daa016";
+            this.gvMx1daa016.Tag = "edit";
+            this.gvMx1daa016.Visible = true;
+            this.gvMx1daa016.VisibleIndex = 6;
+            this.gvMx1daa016.Width = 78;
             // 
-            // gvMx1daa005
+            // repositoryItemDateEdit2
             // 
-            this.gvMx1daa005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
-            this.gvMx1daa005.FieldName = "itemNo";
-            this.gvMx1daa005.MinWidth = 50;
-            this.gvMx1daa005.Name = "gvMx1daa005";
-            this.gvMx1daa005.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa005.Tag = "query_a.daa005";
-            this.gvMx1daa005.Visible = true;
-            this.gvMx1daa005.VisibleIndex = 4;
-            this.gvMx1daa005.Width = 50;
-            // 
-            // gvMx1daa003
-            // 
-            this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
-            this.gvMx1daa003.FieldName = "daa003";
-            this.gvMx1daa003.MinWidth = 50;
-            this.gvMx1daa003.Name = "gvMx1daa003";
-            this.gvMx1daa003.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa003.Tag = "query_a.daa003";
-            this.gvMx1daa003.Visible = true;
-            this.gvMx1daa003.VisibleIndex = 5;
-            this.gvMx1daa003.Width = 50;
-            // 
-            // gvMx1daa004
-            // 
-            this.gvMx1daa004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
-            this.gvMx1daa004.FieldName = "daa004";
-            this.gvMx1daa004.MinWidth = 50;
-            this.gvMx1daa004.Name = "gvMx1daa004";
-            this.gvMx1daa004.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa004.Tag = "query_a.daa004";
-            this.gvMx1daa004.Visible = true;
-            this.gvMx1daa004.VisibleIndex = 6;
-            this.gvMx1daa004.Width = 50;
-            // 
-            // gvMx1daa010
-            // 
-            this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
-            this.gvMx1daa010.FieldName = "daa021";
-            this.gvMx1daa010.MinWidth = 50;
-            this.gvMx1daa010.Name = "gvMx1daa010";
-            this.gvMx1daa010.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa010.Tag = "query_a.daa010";
-            this.gvMx1daa010.Visible = true;
-            this.gvMx1daa010.VisibleIndex = 7;
-            this.gvMx1daa010.Width = 50;
+            this.repositoryItemDateEdit2.AutoHeight = false;
+            this.repositoryItemDateEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
             // 
             // gvMx1daa008
             // 
@@ -922,7 +910,7 @@
             this.gvMx1daa008.OptionsColumn.ReadOnly = true;
             this.gvMx1daa008.Tag = "query_a.daa008";
             this.gvMx1daa008.Visible = true;
-            this.gvMx1daa008.VisibleIndex = 8;
+            this.gvMx1daa008.VisibleIndex = 7;
             this.gvMx1daa008.Width = 50;
             // 
             // gvMx1daa006
@@ -937,7 +925,7 @@
             this.gvMx1daa006.OptionsColumn.ReadOnly = true;
             this.gvMx1daa006.Tag = "query_a.daa006";
             this.gvMx1daa006.Visible = true;
-            this.gvMx1daa006.VisibleIndex = 9;
+            this.gvMx1daa006.VisibleIndex = 8;
             this.gvMx1daa006.Width = 50;
             // 
             // gvMx1daa007
@@ -952,7 +940,7 @@
             this.gvMx1daa007.OptionsColumn.ReadOnly = true;
             this.gvMx1daa007.Tag = "query_a.daa007";
             this.gvMx1daa007.Visible = true;
-            this.gvMx1daa007.VisibleIndex = 10;
+            this.gvMx1daa007.VisibleIndex = 9;
             this.gvMx1daa007.Width = 50;
             // 
             // gvMx1daa009
@@ -967,7 +955,7 @@
             this.gvMx1daa009.OptionsColumn.ReadOnly = true;
             this.gvMx1daa009.Tag = "query_a.daa009";
             this.gvMx1daa009.Visible = true;
-            this.gvMx1daa009.VisibleIndex = 11;
+            this.gvMx1daa009.VisibleIndex = 10;
             this.gvMx1daa009.Width = 50;
             // 
             // gvMx1daa011
@@ -985,7 +973,7 @@
             this.gvMx1daa011.Name = "gvMx1daa011";
             this.gvMx1daa011.Tag = "yz_quantity_0_edit";
             this.gvMx1daa011.Visible = true;
-            this.gvMx1daa011.VisibleIndex = 12;
+            this.gvMx1daa011.VisibleIndex = 11;
             this.gvMx1daa011.Width = 60;
             // 
             // gvMx1daa012
@@ -1003,7 +991,7 @@
             this.gvMx1daa012.Name = "gvMx1daa012";
             this.gvMx1daa012.Tag = "edit";
             this.gvMx1daa012.Visible = true;
-            this.gvMx1daa012.VisibleIndex = 13;
+            this.gvMx1daa012.VisibleIndex = 12;
             this.gvMx1daa012.Width = 153;
             // 
             // rptJYBZ
@@ -1012,6 +1000,26 @@
             this.rptJYBZ.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);
+            // 
+            // gvMx1reporttime
+            // 
+            this.gvMx1reporttime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
+            this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
+            this.gvMx1reporttime.Caption = "澶囨敞";
+            this.gvMx1reporttime.FieldName = "daa009";
+            this.gvMx1reporttime.MinWidth = 50;
+            this.gvMx1reporttime.Name = "gvMx1reporttime";
+            this.gvMx1reporttime.Tag = "edit";
+            this.gvMx1reporttime.Visible = true;
+            this.gvMx1reporttime.VisibleIndex = 13;
+            this.gvMx1reporttime.Width = 102;
             // 
             // gvMx1daa017
             // 
@@ -1181,23 +1189,6 @@
             this.gvMx1daa014.VisibleIndex = 14;
             this.gvMx1daa014.Width = 51;
             // 
-            // gvMx1reporttime
-            // 
-            this.gvMx1reporttime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
-            this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1reporttime.Caption = "澶囨敞";
-            this.gvMx1reporttime.FieldName = "daa009";
-            this.gvMx1reporttime.MinWidth = 50;
-            this.gvMx1reporttime.Name = "gvMx1reporttime";
-            this.gvMx1reporttime.Tag = "edit";
-            this.gvMx1reporttime.Visible = true;
-            this.gvMx1reporttime.VisibleIndex = 15;
-            this.gvMx1reporttime.Width = 102;
-            // 
             // gvMx1machineNo
             // 
             this.gvMx1machineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -1231,6 +1222,20 @@
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Width = 94;
             // 
+            // gvMx1fstatus
+            // 
+            this.gvMx1fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
+            this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
+            this.gvMx1fstatus.FieldName = "caa015";
+            this.gvMx1fstatus.MinWidth = 50;
+            this.gvMx1fstatus.Name = "gvMx1fstatus";
+            this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
+            this.gvMx1fstatus.Tag = "query_a.fstatus";
+            this.gvMx1fstatus.Visible = true;
+            this.gvMx1fstatus.VisibleIndex = 15;
+            this.gvMx1fstatus.Width = 76;
+            // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
@@ -1238,18 +1243,19 @@
             this.gvMxDel.MinWidth = 80;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 16;
+            this.gvMxDel.VisibleIndex = 17;
             this.gvMxDel.Width = 84;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // picCheckBox
             // 
@@ -1261,6 +1267,16 @@
             this.picCheckBox.TabIndex = 7;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "娆″簭";
+            this.gridColumn6.FieldName = "scheduleOrder";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 16;
+            this.gridColumn6.Width = 94;
             // 
             // Frm_Wompba
             // 
@@ -1311,10 +1327,10 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
@@ -1406,5 +1422,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3