From 1544b9ba3902d93a3d701db3656227cc3b46dce8 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 01 八月 2025 14:45:09 +0800
Subject: [PATCH] 过站bug

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs |  291 ++++++++++++---------------------------------------------
 1 files changed, 62 insertions(+), 229 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 06c171e..46b7b08 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -105,26 +105,14 @@
             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();
-            this.gvMx1checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa020 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa021 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa022 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa023 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa024 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa025 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa026 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1isReportcheck = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa014 = 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.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -171,9 +159,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
@@ -692,11 +679,11 @@
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemDateEdit1,
             this.repositoryItemDateEdit2,
             this.repositoryItemButtonEdit1,
             this.rptJYBZ,
-            this.repositoryItemDateEdit3});
+            this.repositoryItemDateEdit3,
+            this.repositoryItemComboBox1});
             this.gcMx1.Size = new System.Drawing.Size(1124, 417);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -724,24 +711,12 @@
             this.gvMx1daa011,
             this.gvMx1daa012,
             this.gvMx1reporttime,
-            this.gvMx1daa017,
-            this.gvMx1daa019,
-            this.gvMx1checkDate,
-            this.gvMx1checkUser,
-            this.gvMx1daa020,
-            this.gvMx1daa021,
-            this.gvMx1daa022,
-            this.gvMx1daa023,
-            this.gvMx1daa024,
-            this.gvMx1daa025,
-            this.gvMx1daa026,
-            this.gvMx1isReportcheck,
             this.gvMx1daa014,
-            this.gvMx1machineNo,
             this.gridColumn3,
             this.gvMx1fstatus,
             this.gridColumn6,
-            this.gvMxDel});
+            this.gvMxDel,
+            this.gridColumn7});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -840,14 +815,14 @@
             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.Caption = "Mes棰勮寮�宸�";
             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 = 5;
+            this.gvMx1daa016.VisibleIndex = 6;
             this.gvMx1daa016.Width = 78;
             // 
             // repositoryItemDateEdit2
@@ -857,6 +832,11 @@
             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.DisplayFormat.FormatString = "D";
+            this.repositoryItemDateEdit2.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.repositoryItemDateEdit2.EditFormat.FormatString = "D";
+            this.repositoryItemDateEdit2.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
+            this.repositoryItemDateEdit2.MaskSettings.Set("mask", "D");
             this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
             // 
             // gvMx1daa018
@@ -866,14 +846,14 @@
             this.gvMx1daa018.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1daa018.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1daa018.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1daa018.Caption = "棰勮瀹屽伐鏃堕棿";
+            this.gvMx1daa018.Caption = "Mes棰勮瀹屽伐";
             this.gvMx1daa018.ColumnEdit = this.repositoryItemDateEdit3;
             this.gvMx1daa018.FieldName = "mesEndProd";
             this.gvMx1daa018.MinWidth = 50;
             this.gvMx1daa018.Name = "gvMx1daa018";
             this.gvMx1daa018.Tag = "edit";
             this.gvMx1daa018.Visible = true;
-            this.gvMx1daa018.VisibleIndex = 6;
+            this.gvMx1daa018.VisibleIndex = 7;
             this.gvMx1daa018.Width = 50;
             // 
             // repositoryItemDateEdit3
@@ -896,7 +876,7 @@
             this.gvMx1daa008.OptionsColumn.ReadOnly = true;
             this.gvMx1daa008.Tag = "query_a.daa008";
             this.gvMx1daa008.Visible = true;
-            this.gvMx1daa008.VisibleIndex = 7;
+            this.gvMx1daa008.VisibleIndex = 8;
             this.gvMx1daa008.Width = 50;
             // 
             // gvMx1daa006
@@ -910,7 +890,7 @@
             this.gvMx1daa006.OptionsColumn.ReadOnly = true;
             this.gvMx1daa006.Tag = "query_a.daa006";
             this.gvMx1daa006.Visible = true;
-            this.gvMx1daa006.VisibleIndex = 8;
+            this.gvMx1daa006.VisibleIndex = 9;
             this.gvMx1daa006.Width = 50;
             // 
             // gvMx1daa007
@@ -924,7 +904,7 @@
             this.gvMx1daa007.OptionsColumn.ReadOnly = true;
             this.gvMx1daa007.Tag = "query_a.daa007";
             this.gvMx1daa007.Visible = true;
-            this.gvMx1daa007.VisibleIndex = 9;
+            this.gvMx1daa007.VisibleIndex = 10;
             this.gvMx1daa007.Width = 50;
             // 
             // gvMx1daa009
@@ -938,7 +918,7 @@
             this.gvMx1daa009.OptionsColumn.ReadOnly = true;
             this.gvMx1daa009.Tag = "query_a.daa009";
             this.gvMx1daa009.Visible = true;
-            this.gvMx1daa009.VisibleIndex = 10;
+            this.gvMx1daa009.VisibleIndex = 11;
             this.gvMx1daa009.Width = 50;
             // 
             // gvMx1daa011
@@ -955,7 +935,7 @@
             this.gvMx1daa011.Name = "gvMx1daa011";
             this.gvMx1daa011.Tag = "yz_quantity_0_edit";
             this.gvMx1daa011.Visible = true;
-            this.gvMx1daa011.VisibleIndex = 11;
+            this.gvMx1daa011.VisibleIndex = 12;
             this.gvMx1daa011.Width = 60;
             // 
             // gvMx1daa012
@@ -972,7 +952,7 @@
             this.gvMx1daa012.Name = "gvMx1daa012";
             this.gvMx1daa012.Tag = "edit";
             this.gvMx1daa012.Visible = true;
-            this.gvMx1daa012.VisibleIndex = 12;
+            this.gvMx1daa012.VisibleIndex = 13;
             this.gvMx1daa012.Width = 153;
             // 
             // rptJYBZ
@@ -998,150 +978,8 @@
             this.gvMx1reporttime.Name = "gvMx1reporttime";
             this.gvMx1reporttime.Tag = "edit";
             this.gvMx1reporttime.Visible = true;
-            this.gvMx1reporttime.VisibleIndex = 13;
+            this.gvMx1reporttime.VisibleIndex = 14;
             this.gvMx1reporttime.Width = 102;
-            // 
-            // gvMx1daa017
-            // 
-            this.gvMx1daa017.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa017.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa017.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1daa017.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa017.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1daa017.Caption = "璁″垝浜烘暟";
-            this.gvMx1daa017.FieldName = "planPersonnel";
-            this.gvMx1daa017.MinWidth = 50;
-            this.gvMx1daa017.Name = "gvMx1daa017";
-            this.gvMx1daa017.Tag = "yz_quantity_0";
-            this.gvMx1daa017.Width = 50;
-            // 
-            // gvMx1daa019
-            // 
-            this.gvMx1daa019.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa019.Caption = "鎺掍骇鏃ユ湡";
-            this.gvMx1daa019.FieldName = "daa024";
-            this.gvMx1daa019.MinWidth = 50;
-            this.gvMx1daa019.Name = "gvMx1daa019";
-            this.gvMx1daa019.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa019.Tag = "query_a.daa019";
-            this.gvMx1daa019.Width = 50;
-            // 
-            // gvMx1checkDate
-            // 
-            this.gvMx1checkDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx1checkDate.Caption = "绾夸綋绫诲埆";
-            this.gvMx1checkDate.FieldName = "lineType";
-            this.gvMx1checkDate.MinWidth = 50;
-            this.gvMx1checkDate.Name = "gvMx1checkDate";
-            this.gvMx1checkDate.OptionsColumn.ReadOnly = true;
-            this.gvMx1checkDate.Tag = "query_a.check_date";
-            this.gvMx1checkDate.Width = 50;
-            // 
-            // gvMx1checkUser
-            // 
-            this.gvMx1checkUser.AppearanceCell.Options.UseFont = true;
-            this.gvMx1checkUser.Caption = "鏍囧噯浜烘暟";
-            this.gvMx1checkUser.FieldName = "personnel";
-            this.gvMx1checkUser.MinWidth = 50;
-            this.gvMx1checkUser.Name = "gvMx1checkUser";
-            this.gvMx1checkUser.OptionsColumn.ReadOnly = true;
-            this.gvMx1checkUser.Tag = "query_a.check_user";
-            this.gvMx1checkUser.Width = 50;
-            // 
-            // gvMx1daa020
-            // 
-            this.gvMx1daa020.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa020.Caption = "鏍囧噯宸ユ椂";
-            this.gvMx1daa020.FieldName = "prodHour";
-            this.gvMx1daa020.MinWidth = 50;
-            this.gvMx1daa020.Name = "gvMx1daa020";
-            this.gvMx1daa020.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa020.Tag = "query_a.daa020";
-            this.gvMx1daa020.Width = 50;
-            // 
-            // gvMx1daa021
-            // 
-            this.gvMx1daa021.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa021.Caption = "鍗曚汉灏忔椂浜ц兘";
-            this.gvMx1daa021.FieldName = "personHourCapactity";
-            this.gvMx1daa021.MinWidth = 50;
-            this.gvMx1daa021.Name = "gvMx1daa021";
-            this.gvMx1daa021.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa021.Tag = "query_a.daa021";
-            this.gvMx1daa021.Width = 50;
-            // 
-            // gvMx1daa022
-            // 
-            this.gvMx1daa022.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa022.Caption = "鐞嗚鏍囦骇";
-            this.gvMx1daa022.FieldName = "theCapactity";
-            this.gvMx1daa022.MinWidth = 50;
-            this.gvMx1daa022.Name = "gvMx1daa022";
-            this.gvMx1daa022.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa022.Tag = "query_a.daa022";
-            this.gvMx1daa022.Width = 50;
-            // 
-            // gvMx1daa023
-            // 
-            this.gvMx1daa023.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa023.Caption = "璁″垝鏍囧噯浜ц兘";
-            this.gvMx1daa023.FieldName = "planCapactity";
-            this.gvMx1daa023.MinWidth = 50;
-            this.gvMx1daa023.Name = "gvMx1daa023";
-            this.gvMx1daa023.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa023.Tag = "query_a.daa023";
-            this.gvMx1daa023.Width = 50;
-            // 
-            // gvMx1daa024
-            // 
-            this.gvMx1daa024.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa024.Caption = "鍒嗛挓";
-            this.gvMx1daa024.FieldName = "theMin";
-            this.gvMx1daa024.MinWidth = 50;
-            this.gvMx1daa024.Name = "gvMx1daa024";
-            this.gvMx1daa024.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa024.Tag = "query_a.daa024";
-            this.gvMx1daa024.Width = 50;
-            // 
-            // gvMx1daa025
-            // 
-            this.gvMx1daa025.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa025.Caption = "灏忔椂";
-            this.gvMx1daa025.FieldName = "theHour";
-            this.gvMx1daa025.MinWidth = 50;
-            this.gvMx1daa025.Name = "gvMx1daa025";
-            this.gvMx1daa025.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa025.Tag = "query_a.daa025";
-            this.gvMx1daa025.Width = 50;
-            // 
-            // gvMx1daa026
-            // 
-            this.gvMx1daa026.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa026.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa026.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1daa026.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa026.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1daa026.Caption = "鎹㈢嚎鏃堕棿";
-            this.gvMx1daa026.FieldName = "changeLineTime";
-            this.gvMx1daa026.MinWidth = 50;
-            this.gvMx1daa026.Name = "gvMx1daa026";
-            this.gvMx1daa026.Tag = "yz_quantity_0";
-            this.gvMx1daa026.Width = 50;
-            // 
-            // gvMx1isReportcheck
-            // 
-            this.gvMx1isReportcheck.AppearanceCell.ForeColor = System.Drawing.Color.Black;
-            this.gvMx1isReportcheck.AppearanceCell.Options.UseFont = true;
-            this.gvMx1isReportcheck.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1isReportcheck.AppearanceHeader.ForeColor = System.Drawing.Color.Black;
-            this.gvMx1isReportcheck.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1isReportcheck.Caption = "浼戞伅鏃堕棿";
-            this.gvMx1isReportcheck.FieldName = "restTime";
-            this.gvMx1isReportcheck.MinWidth = 50;
-            this.gvMx1isReportcheck.Name = "gvMx1isReportcheck";
-            this.gvMx1isReportcheck.OptionsColumn.ReadOnly = true;
-            this.gvMx1isReportcheck.Tag = "query_a.is_reportcheck";
-            this.gvMx1isReportcheck.Width = 50;
             // 
             // gvMx1daa014
             // 
@@ -1153,32 +991,8 @@
             this.gvMx1daa014.OptionsColumn.ReadOnly = true;
             this.gvMx1daa014.Tag = "query_a.daa014";
             this.gvMx1daa014.Visible = true;
-            this.gvMx1daa014.VisibleIndex = 14;
+            this.gvMx1daa014.VisibleIndex = 15;
             this.gvMx1daa014.Width = 51;
-            // 
-            // gvMx1machineNo
-            // 
-            this.gvMx1machineNo.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1machineNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1machineNo.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1machineNo.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1machineNo.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1machineNo.Caption = "棰勮澶囨枡鏃堕棿";
-            this.gvMx1machineNo.ColumnEdit = this.repositoryItemDateEdit1;
-            this.gvMx1machineNo.FieldName = "prepareTime";
-            this.gvMx1machineNo.MinWidth = 50;
-            this.gvMx1machineNo.Name = "gvMx1machineNo";
-            this.gvMx1machineNo.Tag = "query_a.machine_no";
-            this.gvMx1machineNo.Width = 200;
-            // 
-            // repositoryItemDateEdit1
-            // 
-            this.repositoryItemDateEdit1.AutoHeight = false;
-            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
             // 
             // gridColumn3
             // 
@@ -1198,7 +1012,7 @@
             this.gvMx1fstatus.OptionsColumn.ReadOnly = true;
             this.gvMx1fstatus.Tag = "query_a.fstatus";
             this.gvMx1fstatus.Visible = true;
-            this.gvMx1fstatus.VisibleIndex = 15;
+            this.gvMx1fstatus.VisibleIndex = 16;
             this.gvMx1fstatus.Width = 76;
             // 
             // gridColumn6
@@ -1208,7 +1022,7 @@
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 16;
+            this.gridColumn6.VisibleIndex = 17;
             this.gridColumn6.Width = 94;
             // 
             // gvMxDel
@@ -1218,7 +1032,7 @@
             this.gvMxDel.MinWidth = 80;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 17;
+            this.gvMxDel.VisibleIndex = 18;
             this.gvMxDel.Width = 84;
             // 
             // repositoryItemButtonEdit1
@@ -1231,6 +1045,38 @@
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn7.Caption = "鐢熶骇绫诲瀷";
+            this.gridColumn7.ColumnEdit = this.repositoryItemComboBox1;
+            this.gridColumn7.FieldName = "daa025";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Tag = "edit";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.Width = 94;
+            // 
+            // repositoryItemComboBox1
+            // 
+            this.repositoryItemComboBox1.AutoHeight = false;
+            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox1.Items.AddRange(new object[] {
+            "F-閲忎骇",
+            "S-璇曚骇",
+            "C-鎷嗘満杩斿伐",
+            "W-缁翠慨杩斿伐",
+            "G-杩斿伐",
+            "O-澶栧彂"});
+            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            this.repositoryItemComboBox1.NullText = "-璇烽�夋嫨-";
+            this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // picCheckBox
             // 
@@ -1297,9 +1143,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
@@ -1363,22 +1208,8 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa017;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa019;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1checkUser;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa020;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa021;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa022;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa023;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa024;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa025;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa026;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1isReportcheck;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa014;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1machineNo;
-        private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
@@ -1389,5 +1220,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3