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 |  455 +++++++++++++++-----------------------------------------
 1 files changed, 126 insertions(+), 329 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
index 5efa506..46b7b08 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Wompba.Designer.cs
@@ -29,6 +29,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -92,10 +93,10 @@
             this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa004 = 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.gvMx1daa018 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit3 = 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,27 +105,16 @@
             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();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -164,14 +154,13 @@
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).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.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();
             // 
@@ -213,6 +202,7 @@
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -226,18 +216,18 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 551;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 4;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 512);
+            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -246,7 +236,6 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -269,7 +258,6 @@
             // 
             // gv_fstatus
             // 
-            
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
             this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
             this.gv_fstatus.FieldName = "fstatus";
@@ -314,7 +302,6 @@
             // 
             // gv_checkUser
             // 
-           
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜�";
             this.gv_checkUser.FieldName = "checkUser";
@@ -327,7 +314,6 @@
             // 
             // gv_checkDate
             // 
-            
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡";
             this.gv_checkDate.FieldName = "checkDate";
@@ -340,7 +326,6 @@
             // 
             // gv_pba005
             // 
-            
             this.gv_pba005.AppearanceCell.Options.UseFont = true;
             this.gv_pba005.Caption = "鍒涘缓浜�";
             this.gv_pba005.FieldName = "pba005";
@@ -353,7 +338,6 @@
             // 
             // gv_pba006
             // 
-            
             this.gv_pba006.AppearanceCell.Options.UseFont = true;
             this.gv_pba006.Caption = "鍒涘缓鏃堕棿";
             this.gv_pba006.FieldName = "pba006";
@@ -366,7 +350,6 @@
             // 
             // gv_pba009
             // 
-            
             this.gv_pba009.AppearanceCell.Options.UseFont = true;
             this.gv_pba009.Caption = "澶囨敞";
             this.gv_pba009.FieldName = "pba009";
@@ -389,7 +372,7 @@
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 512);
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
@@ -420,6 +403,7 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
             this.splitMx1.SplitterPosition = 109;
             this.splitMx1.TabIndex = 0;
@@ -458,7 +442,7 @@
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 76);
+            this.btnSelect.Location = new System.Drawing.Point(12, 74);
             this.btnSelect.Name = "btnSelect";
             this.btnSelect.Size = new System.Drawing.Size(101, 27);
             this.btnSelect.StyleController = this.layoutMx1;
@@ -468,9 +452,9 @@
             // txt_pba013
             // 
             this.txt_pba013.IsReadly = false;
-            this.txt_pba013.Location = new System.Drawing.Point(89, 44);
+            this.txt_pba013.Location = new System.Drawing.Point(89, 43);
             this.txt_pba013.Name = "txt_pba013";
-            this.txt_pba013.Size = new System.Drawing.Size(190, 28);
+            this.txt_pba013.Size = new System.Drawing.Size(190, 24);
             this.txt_pba013.TabIndex = 459;
             // 
             // txt_erpSczz
@@ -478,27 +462,25 @@
             this.txt_erpSczz.IsReadly = false;
             this.txt_erpSczz.Location = new System.Drawing.Point(89, 12);
             this.txt_erpSczz.Name = "txt_erpSczz";
-            this.txt_erpSczz.Size = new System.Drawing.Size(190, 28);
+            this.txt_erpSczz.Size = new System.Drawing.Size(190, 24);
             this.txt_erpSczz.TabIndex = 460;
             // 
             // txt_hNo
             // 
             this.txt_hNo.Location = new System.Drawing.Point(360, 12);
             this.txt_hNo.Name = "txt_hNo";
-           
             this.txt_hNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_hNo.Size = new System.Drawing.Size(190, 28);
+            this.txt_hNo.Size = new System.Drawing.Size(190, 24);
             this.txt_hNo.StyleController = this.layoutMx1;
             this.txt_hNo.TabIndex = 458;
             this.txt_hNo.Tag = "readonly";
             // 
             // txt_pba009
             // 
-            this.txt_pba009.Location = new System.Drawing.Point(360, 44);
+            this.txt_pba009.Location = new System.Drawing.Point(360, 43);
             this.txt_pba009.Name = "txt_pba009";
-          
             this.txt_pba009.Properties.Appearance.Options.UseFont = true;
-            this.txt_pba009.Size = new System.Drawing.Size(461, 28);
+            this.txt_pba009.Size = new System.Drawing.Size(461, 24);
             this.txt_pba009.StyleController = this.layoutMx1;
             this.txt_pba009.TabIndex = 240;
             // 
@@ -506,9 +488,8 @@
             // 
             this.txt_checkUser.Location = new System.Drawing.Point(902, 12);
             this.txt_checkUser.Name = "txt_checkUser";
-            
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(191, 28);
+            this.txt_checkUser.Size = new System.Drawing.Size(191, 24);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 273;
             this.txt_checkUser.Tag = "readonly";
@@ -517,16 +498,15 @@
             // 
             this.txt_checkDate.Location = new System.Drawing.Point(631, 12);
             this.txt_checkDate.Name = "txt_checkDate";
-            
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(190, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(190, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 267;
             this.txt_checkDate.Tag = "readonly";
             // 
             // txt_fstatus
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(825, 44);
+            this.txt_fstatus.Location = new System.Drawing.Point(825, 43);
             this.txt_fstatus.Name = "txt_fstatus";
             this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
             this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
@@ -584,7 +564,7 @@
             rowDefinition1,
             rowDefinition2,
             rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1105, 116);
+            this.Root.Size = new System.Drawing.Size(1105, 113);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -592,7 +572,7 @@
             this.layoutControlItem1.Control = this.txt_erpSczz;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem1.Text = "鐢熶骇缁勭粐";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
             // 
@@ -602,7 +582,7 @@
             this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem2.Text = "鎺掍骇缂栧彿";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
             // 
@@ -612,17 +592,17 @@
             this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_pba013;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
             // 
@@ -632,18 +612,18 @@
             this.layoutControlItem5.Location = new System.Drawing.Point(813, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem5.Text = "瀹℃牳浜�";
+            this.layoutControlItem5.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem5.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_fstatus;
-            this.layoutControlItem6.Location = new System.Drawing.Point(813, 32);
+            this.layoutControlItem6.Location = new System.Drawing.Point(813, 31);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
             this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem6.TextVisible = false;
@@ -651,24 +631,24 @@
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_pba009;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 32);
+            this.layoutControlItem7.Location = new System.Drawing.Point(271, 31);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
             this.layoutControlItem7.Text = "鎺掍骇澶囨敞";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.btnSelect;
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 64);
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 62);
             this.layoutControlItem8.MaxSize = new System.Drawing.Size(105, 31);
             this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Text = "閫夋嫨鎶曟枡鍗�";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
@@ -699,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[] {
@@ -731,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;
@@ -757,9 +725,8 @@
             // 
             // gvMx1guid
             // 
-           
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid";
+            this.gvMx1guid.Caption = "鏄庣粏Guid";
             this.gvMx1guid.FieldName = "guid";
             this.gvMx1guid.MinWidth = 50;
             this.gvMx1guid.Name = "gvMx1guid";
@@ -778,7 +745,6 @@
             // 
             // gvMx1daa002
             // 
-            
             this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa002.Caption = "宸ュ崟鍗曞彿";
             this.gvMx1daa002.FieldName = "daa001";
@@ -792,7 +758,6 @@
             // 
             // gvMx1daa010
             // 
-           
             this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
             this.gvMx1daa010.FieldName = "daa021";
@@ -806,7 +771,6 @@
             // 
             // gvMx1daa005
             // 
-           
             this.gvMx1daa005.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa005.Caption = "鐗╂枡缂栫爜";
             this.gvMx1daa005.FieldName = "itemNo";
@@ -820,7 +784,6 @@
             // 
             // gvMx1daa003
             // 
-           
             this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
             this.gvMx1daa003.FieldName = "daa003";
@@ -834,7 +797,6 @@
             // 
             // gvMx1daa004
             // 
-            
             this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa004.Caption = "浜у搧瑙勬牸";
             this.gvMx1daa004.FieldName = "daa004";
@@ -846,22 +808,52 @@
             this.gvMx1daa004.VisibleIndex = 4;
             this.gvMx1daa004.Width = 50;
             // 
+            // gvMx1daa016
+            // 
+            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 = "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 = 6;
+            this.gvMx1daa016.Width = 78;
+            // 
+            // repositoryItemDateEdit2
+            // 
+            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.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
             // 
-          
             this.gvMx1daa018.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1daa018.AppearanceCell.Options.UseFont = true;
             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
@@ -873,36 +865,8 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
             // 
-            // gvMx1daa016
-            // 
-           
-            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 = 5;
-            this.gvMx1daa016.Width = 78;
-            // 
-            // repositoryItemDateEdit2
-            // 
-            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
             // 
-           
             this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa008.Caption = "宸ュ崟鎬绘暟";
             this.gvMx1daa008.FieldName = "caa012";
@@ -912,12 +876,11 @@
             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
             // 
-          
             this.gvMx1daa006.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa006.Caption = "鍗曚綅";
             this.gvMx1daa006.FieldName = "fname";
@@ -927,12 +890,11 @@
             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
             // 
-           
             this.gvMx1daa007.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa007.Caption = "宸叉帓";
             this.gvMx1daa007.FieldName = "yp";
@@ -942,12 +904,11 @@
             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
             // 
-        
             this.gvMx1daa009.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa009.Caption = "鏈帓";
             this.gvMx1daa009.FieldName = "wp";
@@ -957,12 +918,11 @@
             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
             // 
-            
             this.gvMx1daa011.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1daa011.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa011.AppearanceCell.Options.UseForeColor = true;
@@ -975,12 +935,11 @@
             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
             // 
-          
             this.gvMx1daa012.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1daa012.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa012.AppearanceCell.Options.UseForeColor = true;
@@ -993,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
@@ -1008,7 +967,6 @@
             // 
             // gvMx1reporttime
             // 
-         
             this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
             this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true;
@@ -1020,166 +978,11 @@
             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
             // 
-           
             this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa014.Caption = "鎶曟枡鍗曞崟鍙�";
             this.gvMx1daa014.FieldName = "daa014";
@@ -1188,33 +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
             // 
@@ -1226,7 +1004,6 @@
             // 
             // gvMx1fstatus
             // 
-          
             this.gvMx1fstatus.AppearanceCell.Options.UseFont = true;
             this.gvMx1fstatus.Caption = "闇�姹傚崟鍙�";
             this.gvMx1fstatus.FieldName = "caa015";
@@ -1235,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
@@ -1245,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
@@ -1255,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
@@ -1268,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
             // 
@@ -1329,14 +1138,13 @@
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).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.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);
 
@@ -1400,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;
@@ -1425,5 +1219,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         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