From b2db1fbcea11f4dbdbca91f4ebe72e916fb509f2 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 21 七月 2025 16:28:10 +0800
Subject: [PATCH] 增加按钮

---
 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 1379 +++++++++++++++++++++++++----------------------------------
 1 files changed, 594 insertions(+), 785 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index 0267736..69ce2e2 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -28,6 +28,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();
@@ -35,6 +36,8 @@
             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.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = 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();
@@ -53,32 +56,45 @@
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
-            this.txt_pba013 = new Gs.DevApp.UserControl.UcLookWorkshop();
-            this.txt_erpSczz = new Gs.DevApp.UserControl.UcLookOrg();
-            this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_pba009 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
-            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fstatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_fType = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
+            this.txt_dhdNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_dhdDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fngDesc = new DevExpress.XtraEditors.MemoEdit();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -86,43 +102,25 @@
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
             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.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();
-            this.gvMx1daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            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();
-            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.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -142,35 +140,46 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             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.rptJYBZ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -211,6 +220,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";
@@ -224,18 +234,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.Font = new System.Drawing.Font("Tahoma", 10F);
             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});
@@ -244,7 +254,6 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -255,9 +264,16 @@
             this.gv_checkUser,
             this.gv_checkDate,
             this.gv_pba005,
-            this.gv_pba006,
-            this.gv_pba009,
-            this.gridColumn5});
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn3,
+            this.gridColumn17,
+            this.gridColumn18,
+            this.gridColumn19});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -267,10 +283,9 @@
             // 
             // gv_fstatus
             // 
-            this.gv_fstatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_fstatus.AppearanceCell.Options.UseFont = true;
-            this.gv_fstatus.Caption = "瀹℃牳鏍囪瘑";
-            this.gv_fstatus.FieldName = "fstatus";
+            this.gv_fstatus.Caption = "瀹℃牳";
+            this.gv_fstatus.FieldName = "chkStatus";
             this.gv_fstatus.MaxWidth = 50;
             this.gv_fstatus.MinWidth = 50;
             this.gv_fstatus.Name = "gv_fstatus";
@@ -282,112 +297,173 @@
             // 
             // gridColumn4
             // 
-            this.gridColumn4.Caption = "鐢熶骇缁勭粐";
-            this.gridColumn4.FieldName = "fSubsidiary";
+            this.gridColumn4.Caption = "涓婚敭GUID";
+            this.gridColumn4.FieldName = "guid";
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Tag = "org.fnamber";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 1;
             this.gridColumn4.Width = 250;
             // 
             // gridColumn1
             // 
-            this.gridColumn1.Caption = "杞﹂棿鍚嶇О";
-            this.gridColumn1.FieldName = "dptName";
+            this.gridColumn1.Caption = "绫诲埆";
+            this.gridColumn1.FieldName = "fType";
             this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 2;
+            this.gridColumn1.VisibleIndex = 15;
             this.gridColumn1.Width = 94;
             // 
             // gridColumn2
             // 
-            this.gridColumn2.Caption = "鎺掍骇鍗曞彿";
-            this.gridColumn2.FieldName = "hNo";
+            this.gridColumn2.Caption = "寤虹珛鑰�";
+            this.gridColumn2.FieldName = "createBy";
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 3;
+            this.gridColumn2.VisibleIndex = 10;
             this.gridColumn2.Width = 150;
             // 
             // gv_checkUser
             // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
-            this.gv_checkUser.Caption = "瀹℃牳浜�";
-            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.Caption = "寤虹珛鏃堕棿";
+            this.gv_checkUser.FieldName = "createDate";
             this.gv_checkUser.Name = "gv_checkUser";
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.check_user";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 4;
+            this.gv_checkUser.VisibleIndex = 11;
             this.gv_checkUser.Width = 94;
             // 
             // gv_checkDate
             // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
-            this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡";
-            this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.Caption = "瀹℃牳鑰�";
+            this.gv_checkDate.FieldName = "checkBy";
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 5;
+            this.gv_checkDate.VisibleIndex = 12;
             this.gv_checkDate.Width = 180;
             // 
             // gv_pba005
             // 
-            this.gv_pba005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_pba005.AppearanceCell.Options.UseFont = true;
-            this.gv_pba005.Caption = "鍒涘缓浜�";
-            this.gv_pba005.FieldName = "pba005";
+            this.gv_pba005.Caption = "瀹℃牳鏃堕棿";
+            this.gv_pba005.FieldName = "checkDate";
             this.gv_pba005.Name = "gv_pba005";
             this.gv_pba005.OptionsColumn.AllowEdit = false;
             this.gv_pba005.Tag = "query_a.pba005";
             this.gv_pba005.Visible = true;
-            this.gv_pba005.VisibleIndex = 6;
+            this.gv_pba005.VisibleIndex = 13;
             this.gv_pba005.Width = 94;
             // 
-            // gv_pba006
+            // gridColumn8
             // 
-            this.gv_pba006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_pba006.AppearanceCell.Options.UseFont = true;
-            this.gv_pba006.Caption = "鍒涘缓鏃堕棿";
-            this.gv_pba006.FieldName = "pba006";
-            this.gv_pba006.Name = "gv_pba006";
-            this.gv_pba006.OptionsColumn.AllowEdit = false;
-            this.gv_pba006.Tag = "query_a.pba006";
-            this.gv_pba006.Visible = true;
-            this.gv_pba006.VisibleIndex = 7;
-            this.gv_pba006.Width = 180;
+            this.gridColumn8.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn8.FieldName = "itemNo";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 5;
+            this.gridColumn8.Width = 94;
             // 
-            // gv_pba009
+            // gridColumn9
             // 
-            this.gv_pba009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_pba009.AppearanceCell.Options.UseFont = true;
-            this.gv_pba009.Caption = "澶囨敞";
-            this.gv_pba009.FieldName = "pba009";
-            this.gv_pba009.Name = "gv_pba009";
-            this.gv_pba009.OptionsColumn.AllowEdit = false;
-            this.gv_pba009.Tag = "query_a.pba009";
-            this.gv_pba009.Visible = true;
-            this.gv_pba009.VisibleIndex = 8;
-            this.gv_pba009.Width = 100;
+            this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn9.FieldName = "itemName";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 6;
+            this.gridColumn9.Width = 94;
             // 
-            // gridColumn5
+            // gridColumn10
             // 
-            this.gridColumn5.Caption = "涓婚敭GUID";
-            this.gridColumn5.FieldName = "guid";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Width = 94;
+            this.gridColumn10.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn10.FieldName = "itemModel";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 7;
+            this.gridColumn10.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "渚涘簲鍟�";
+            this.gridColumn11.FieldName = "gysName";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 8;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn12
+            // 
+            this.gridColumn12.Caption = "鍒拌揣鏃ユ湡";
+            this.gridColumn12.FieldName = "dhdDate";
+            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.Name = "gridColumn12";
+            this.gridColumn12.Visible = true;
+            this.gridColumn12.VisibleIndex = 4;
+            this.gridColumn12.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "鍒拌揣鍗曞彿";
+            this.gridColumn13.FieldName = "dhdNo";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 3;
+            this.gridColumn13.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐗╂枡ID";
+            this.gridColumn3.FieldName = "itemId";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 14;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "寮傚父鍗曞彿";
+            this.gridColumn17.FieldName = "fBillNo";
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 1;
+            this.gridColumn17.Width = 94;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "OA澶勭悊鐘舵��";
+            this.gridColumn18.FieldName = "oaCheckStatusTxt";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 2;
+            this.gridColumn18.Width = 94;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "OA澶勭悊鏃堕棿";
+            this.gridColumn19.FieldName = "oaCheckDate";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 9;
+            this.gridColumn19.Width = 94;
             // 
             // pageBar1
             // 
             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;
@@ -418,29 +494,34 @@
             // 
             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.SplitterPosition = 163;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.btnSelect);
-            this.layoutMx1.Controls.Add(this.txt_pba013);
-            this.layoutMx1.Controls.Add(this.txt_erpSczz);
-            this.layoutMx1.Controls.Add(this.txt_hNo);
-            this.layoutMx1.Controls.Add(this.txt_pba009);
-            this.layoutMx1.Controls.Add(this.txt_checkUser);
-            this.layoutMx1.Controls.Add(this.txt_checkDate);
-            this.layoutMx1.Controls.Add(this.txt_fstatus);
+            this.layoutMx1.Controls.Add(this.txt_fType);
+            this.layoutMx1.Controls.Add(this.txt_itemNo);
+            this.layoutMx1.Controls.Add(this.txt_itemName);
+            this.layoutMx1.Controls.Add(this.txt_itemModel);
+            this.layoutMx1.Controls.Add(this.txt_dhdNo);
+            this.layoutMx1.Controls.Add(this.txt_gysNo);
+            this.layoutMx1.Controls.Add(this.txt_gysName);
+            this.layoutMx1.Controls.Add(this.txt_guid);
+            this.layoutMx1.Controls.Add(this.txt_fBillNo);
+            this.layoutMx1.Controls.Add(this.txt_dhdDate);
+            this.layoutMx1.Controls.Add(this.txt_fngDesc);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem9});
+            this.layoutControlItem9,
+            this.layoutControlItem24});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(816, 394, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 109);
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 163);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -453,83 +534,93 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // btnSelect
+            // txt_fType
             // 
-            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 76);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(101, 27);
-            this.btnSelect.StyleController = this.layoutMx1;
-            this.btnSelect.TabIndex = 456;
-            this.btnSelect.Text = "閫夊彇鎶曟枡鍗�";
+            this.txt_fType.Location = new System.Drawing.Point(927, 12);
+            this.txt_fType.Name = "txt_fType";
+            this.txt_fType.Size = new System.Drawing.Size(187, 24);
+            this.txt_fType.StyleController = this.layoutMx1;
+            this.txt_fType.TabIndex = 462;
             // 
-            // txt_pba013
+            // txt_itemNo
             // 
-            this.txt_pba013.IsReadly = false;
-            this.txt_pba013.Location = new System.Drawing.Point(89, 44);
-            this.txt_pba013.Name = "txt_pba013";
-            this.txt_pba013.Size = new System.Drawing.Size(195, 28);
-            this.txt_pba013.TabIndex = 459;
+            this.txt_itemNo.Location = new System.Drawing.Point(99, 40);
+            this.txt_itemNo.Name = "txt_itemNo";
+            this.txt_itemNo.Size = new System.Drawing.Size(185, 24);
+            this.txt_itemNo.StyleController = this.layoutMx1;
+            this.txt_itemNo.TabIndex = 464;
             // 
-            // txt_erpSczz
+            // txt_itemName
             // 
-            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(195, 28);
-            this.txt_erpSczz.TabIndex = 460;
+            this.txt_itemName.Location = new System.Drawing.Point(375, 40);
+            this.txt_itemName.Name = "txt_itemName";
+            this.txt_itemName.Size = new System.Drawing.Size(185, 24);
+            this.txt_itemName.StyleController = this.layoutMx1;
+            this.txt_itemName.TabIndex = 465;
             // 
-            // txt_hNo
+            // txt_itemModel
             // 
-            this.txt_hNo.Location = new System.Drawing.Point(365, 12);
-            this.txt_hNo.Name = "txt_hNo";
-            this.txt_hNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_hNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_hNo.Size = new System.Drawing.Size(195, 28);
-            this.txt_hNo.StyleController = this.layoutMx1;
-            this.txt_hNo.TabIndex = 458;
-            this.txt_hNo.Tag = "readonly";
+            this.txt_itemModel.Location = new System.Drawing.Point(651, 40);
+            this.txt_itemModel.Name = "txt_itemModel";
+            this.txt_itemModel.Size = new System.Drawing.Size(463, 24);
+            this.txt_itemModel.StyleController = this.layoutMx1;
+            this.txt_itemModel.TabIndex = 466;
             // 
-            // txt_pba009
+            // txt_dhdNo
             // 
-            this.txt_pba009.Location = new System.Drawing.Point(365, 44);
-            this.txt_pba009.Name = "txt_pba009";
-            this.txt_pba009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_pba009.Properties.Appearance.Options.UseFont = true;
-            this.txt_pba009.Size = new System.Drawing.Size(471, 28);
-            this.txt_pba009.StyleController = this.layoutMx1;
-            this.txt_pba009.TabIndex = 240;
+            this.txt_dhdNo.Location = new System.Drawing.Point(375, 12);
+            this.txt_dhdNo.Name = "txt_dhdNo";
+            this.txt_dhdNo.Size = new System.Drawing.Size(185, 24);
+            this.txt_dhdNo.StyleController = this.layoutMx1;
+            this.txt_dhdNo.TabIndex = 467;
             // 
-            // txt_checkUser
+            // txt_gysNo
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(917, 12);
-            this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(197, 28);
-            this.txt_checkUser.StyleController = this.layoutMx1;
-            this.txt_checkUser.TabIndex = 273;
-            this.txt_checkUser.Tag = "readonly";
+            this.txt_gysNo.Location = new System.Drawing.Point(99, 68);
+            this.txt_gysNo.Name = "txt_gysNo";
+            this.txt_gysNo.Size = new System.Drawing.Size(185, 24);
+            this.txt_gysNo.StyleController = this.layoutMx1;
+            this.txt_gysNo.TabIndex = 468;
             // 
-            // txt_checkDate
+            // txt_gysName
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(641, 12);
-            this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(195, 28);
-            this.txt_checkDate.StyleController = this.layoutMx1;
-            this.txt_checkDate.TabIndex = 267;
-            this.txt_checkDate.Tag = "readonly";
+            this.txt_gysName.Location = new System.Drawing.Point(375, 68);
+            this.txt_gysName.Name = "txt_gysName";
+            this.txt_gysName.Size = new System.Drawing.Size(461, 24);
+            this.txt_gysName.StyleController = this.layoutMx1;
+            this.txt_gysName.TabIndex = 469;
             // 
-            // txt_fstatus
+            // txt_guid
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(840, 44);
-            this.txt_fstatus.Name = "txt_fstatus";
-            this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_fstatus.Size = new System.Drawing.Size(274, 24);
-            this.txt_fstatus.StyleController = this.layoutMx1;
-            this.txt_fstatus.TabIndex = 461;
+            this.txt_guid.Location = new System.Drawing.Point(927, 180);
+            this.txt_guid.Name = "txt_guid";
+            this.txt_guid.Size = new System.Drawing.Size(187, 24);
+            this.txt_guid.StyleController = this.layoutMx1;
+            this.txt_guid.TabIndex = 477;
+            // 
+            // txt_fBillNo
+            // 
+            this.txt_fBillNo.Location = new System.Drawing.Point(99, 12);
+            this.txt_fBillNo.Name = "txt_fBillNo";
+            this.txt_fBillNo.Size = new System.Drawing.Size(185, 24);
+            this.txt_fBillNo.StyleController = this.layoutMx1;
+            this.txt_fBillNo.TabIndex = 478;
+            // 
+            // txt_dhdDate
+            // 
+            this.txt_dhdDate.Location = new System.Drawing.Point(651, 12);
+            this.txt_dhdDate.Name = "txt_dhdDate";
+            this.txt_dhdDate.Size = new System.Drawing.Size(185, 24);
+            this.txt_dhdDate.StyleController = this.layoutMx1;
+            this.txt_dhdDate.TabIndex = 481;
+            // 
+            // txt_fngDesc
+            // 
+            this.txt_fngDesc.Location = new System.Drawing.Point(99, 97);
+            this.txt_fngDesc.Name = "txt_fngDesc";
+            this.txt_fngDesc.Size = new System.Drawing.Size(1015, 54);
+            this.txt_fngDesc.StyleController = this.layoutMx1;
+            this.txt_fngDesc.TabIndex = 485;
             // 
             // layoutControlItem9
             // 
@@ -543,19 +634,32 @@
             this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem9.TextVisible = false;
             // 
+            // layoutControlItem24
+            // 
+            this.layoutControlItem24.Control = this.txt_guid;
+            this.layoutControlItem24.Location = new System.Drawing.Point(828, 168);
+            this.layoutControlItem24.Name = "layoutControlItem24";
+            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem24.Size = new System.Drawing.Size(278, 34);
+            this.layoutControlItem24.Text = "涓婚敭Guid";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(50, 20);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
             this.layoutControlItem2,
-            this.layoutControlItem3,
+            this.layoutControlItem14,
             this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem6,
-            this.layoutControlItem7,
-            this.layoutControlItem8});
+            this.layoutControlItem11,
+            this.layoutControlItem1,
+            this.layoutControlItem12,
+            this.layoutControlItem13,
+            this.layoutControlItem15,
+            this.layoutControlItem16,
+            this.layoutControlItem3});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -577,99 +681,124 @@
             rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition3.Height = 100D;
             rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
-            rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1126, 116);
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5});
+            this.Root.Size = new System.Drawing.Size(1126, 163);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem1
-            // 
-            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(276, 32);
-            this.layoutControlItem1.Text = "鐢熶骇缁勭粐";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.txt_hNo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem2.Control = this.txt_fBillNo;
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem2.Text = "鎺掍骇缂栧彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+            this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem2.Text = "寮傚父缂栧彿";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem3
+            // layoutControlItem14
             // 
-            this.layoutControlItem3.Control = this.txt_checkDate;
-            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
+            this.layoutControlItem14.Control = this.txt_dhdNo;
+            this.layoutControlItem14.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem4
             // 
-            this.layoutControlItem4.Control = this.txt_pba013;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem4.Control = this.txt_dhdDate;
+            this.layoutControlItem4.Location = new System.Drawing.Point(552, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem4.Text = "宸ヤ綔杞﹂棿";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem4.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem5
+            // layoutControlItem11
             // 
-            this.layoutControlItem5.Control = this.txt_checkUser;
-            this.layoutControlItem5.Location = new System.Drawing.Point(828, 0);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(278, 32);
-            this.layoutControlItem5.Text = "瀹℃牳浜�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+            this.layoutControlItem11.Control = this.txt_itemNo;
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem11.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem6
+            // layoutControlItem1
             // 
-            this.layoutControlItem6.Control = this.txt_fstatus;
-            this.layoutControlItem6.Location = new System.Drawing.Point(828, 32);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(278, 32);
-            this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
+            this.layoutControlItem1.Control = this.txt_fType;
+            this.layoutControlItem1.Location = new System.Drawing.Point(828, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem1.Size = new System.Drawing.Size(278, 28);
+            this.layoutControlItem1.Text = "寮傚父绫诲瀷";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem7
+            // layoutControlItem12
             // 
-            this.layoutControlItem7.Control = this.txt_pba009;
-            this.layoutControlItem7.Location = new System.Drawing.Point(276, 32);
-            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(552, 32);
-            this.layoutControlItem7.Text = "鎺掍骇澶囨敞";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
+            this.layoutControlItem12.Control = this.txt_itemName;
+            this.layoutControlItem12.Location = new System.Drawing.Point(276, 28);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem12.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
             // 
-            // layoutControlItem8
+            // layoutControlItem13
             // 
-            this.layoutControlItem8.Control = this.btnSelect;
-            this.layoutControlItem8.Location = new System.Drawing.Point(0, 64);
-            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(276, 32);
-            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
-            this.layoutControlItem8.Text = "閫夋嫨鎶曟枡鍗�";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem8.TextVisible = false;
+            this.layoutControlItem13.Control = this.txt_itemModel;
+            this.layoutControlItem13.Location = new System.Drawing.Point(552, 28);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem13.Size = new System.Drawing.Size(554, 28);
+            this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_gysNo;
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_gysName;
+            this.layoutControlItem16.Location = new System.Drawing.Point(276, 56);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(552, 29);
+            this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_fngDesc;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 85);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(1106, 58);
+            this.layoutControlItem3.Text = "寮傚父鎻忚堪";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
             // tabMx
             // 
@@ -677,7 +806,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 449);
+            this.tabMx.Size = new System.Drawing.Size(1126, 395);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -686,8 +815,8 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
-            this.tabMxPage1.Text = "浠诲姟鍗曟槑缁�";
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 363);
+            this.tabMxPage1.Text = "寮傚父鏄庣粏";
             // 
             // gcMx1
             // 
@@ -701,7 +830,7 @@
             this.repositoryItemButtonEdit1,
             this.rptJYBZ,
             this.repositoryItemDateEdit3});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 417);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 363);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -715,37 +844,16 @@
             this.gvMx1guid,
             this.caaGuid,
             this.gvMx1daa002,
-            this.gvMx1daa010,
-            this.gvMx1daa005,
-            this.gvMx1daa003,
-            this.gvMx1daa004,
-            this.gvMx1daa018,
-            this.gvMx1daa016,
-            this.gvMx1daa008,
-            this.gvMx1daa006,
-            this.gvMx1daa007,
-            this.gvMx1daa009,
-            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.gridColumn5,
             this.gridColumn6,
-            this.gvMxDel});
+            this.gvMx1daa005,
+            this.gridColumn7,
+            this.gvMx1daa004,
+            this.gvMx1daa008,
+            this.gvMx1reporttime,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -754,7 +862,6 @@
             // 
             // gvMx1guid
             // 
-            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid";
             this.gvMx1guid.FieldName = "guid";
@@ -766,8 +873,8 @@
             // 
             // caaGuid
             // 
-            this.caaGuid.Caption = "caaGuid";
-            this.caaGuid.FieldName = "caaGuid";
+            this.caaGuid.Caption = "鐖朵翰GUID";
+            this.caaGuid.FieldName = "pGuid";
             this.caaGuid.MinWidth = 25;
             this.caaGuid.Name = "caaGuid";
             this.caaGuid.OptionsColumn.ReadOnly = true;
@@ -775,10 +882,9 @@
             // 
             // gvMx1daa002
             // 
-            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.Caption = "搴忓彿";
+            this.gvMx1daa002.FieldName = "fSeq";
             this.gvMx1daa002.MinWidth = 50;
             this.gvMx1daa002.Name = "gvMx1daa002";
             this.gvMx1daa002.OptionsColumn.ReadOnly = true;
@@ -787,26 +893,31 @@
             this.gvMx1daa002.VisibleIndex = 0;
             this.gvMx1daa002.Width = 50;
             // 
-            // gvMx1daa010
+            // gridColumn5
             // 
-            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;
+            this.gridColumn5.Caption = "妫�楠屽崟鍙�";
+            this.gridColumn5.FieldName = "releaseNo";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 1;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "妫�楠屾棩鏈�";
+            this.gridColumn6.FieldName = "jyDate";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 94;
             // 
             // gvMx1daa005
             // 
-            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.Caption = "鎵规鏁伴噺";
+            this.gvMx1daa005.FieldName = "batchQty";
             this.gvMx1daa005.MinWidth = 50;
             this.gvMx1daa005.Name = "gvMx1daa005";
             this.gvMx1daa005.OptionsColumn.ReadOnly = true;
@@ -815,394 +926,88 @@
             this.gvMx1daa005.VisibleIndex = 2;
             this.gvMx1daa005.Width = 50;
             // 
-            // gvMx1daa003
+            // gridColumn7
             // 
-            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;
+            this.gridColumn7.Caption = "鎶芥牱鏁�";
+            this.gridColumn7.FieldName = "chouQty";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 3;
+            this.gridColumn7.Width = 94;
             // 
             // 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.Caption = "涓嶈壇鏁�";
+            this.gvMx1daa004.FieldName = "badQty";
             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.VisibleIndex = 5;
             this.gvMx1daa004.Width = 50;
-            // 
-            // gvMx1daa018
-            // 
-            this.gvMx1daa018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.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 = 5;
-            this.gvMx1daa018.Width = 50;
-            // 
-            // repositoryItemDateEdit3
-            // 
-            this.repositoryItemDateEdit3.AutoHeight = false;
-            this.repositoryItemDateEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
-            // 
-            // gvMx1daa016
-            // 
-            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;
-            // 
-            // 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.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1daa008.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa008.Caption = "宸ュ崟鎬绘暟";
-            this.gvMx1daa008.FieldName = "caa012";
+            this.gvMx1daa008.Caption = "涓嶈壇鐜�";
+            this.gvMx1daa008.FieldName = "badProb";
             this.gvMx1daa008.MaxWidth = 50;
             this.gvMx1daa008.MinWidth = 50;
             this.gvMx1daa008.Name = "gvMx1daa008";
             this.gvMx1daa008.OptionsColumn.ReadOnly = true;
             this.gvMx1daa008.Tag = "query_a.daa008";
             this.gvMx1daa008.Visible = true;
-            this.gvMx1daa008.VisibleIndex = 7;
+            this.gvMx1daa008.VisibleIndex = 6;
             this.gvMx1daa008.Width = 50;
-            // 
-            // gvMx1daa006
-            // 
-            this.gvMx1daa006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa006.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa006.Caption = "鍗曚綅";
-            this.gvMx1daa006.FieldName = "fname";
-            this.gvMx1daa006.MaxWidth = 50;
-            this.gvMx1daa006.MinWidth = 50;
-            this.gvMx1daa006.Name = "gvMx1daa006";
-            this.gvMx1daa006.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa006.Tag = "query_a.daa006";
-            this.gvMx1daa006.Visible = true;
-            this.gvMx1daa006.VisibleIndex = 8;
-            this.gvMx1daa006.Width = 50;
-            // 
-            // gvMx1daa007
-            // 
-            this.gvMx1daa007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa007.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa007.Caption = "宸叉帓";
-            this.gvMx1daa007.FieldName = "yp";
-            this.gvMx1daa007.MaxWidth = 50;
-            this.gvMx1daa007.MinWidth = 50;
-            this.gvMx1daa007.Name = "gvMx1daa007";
-            this.gvMx1daa007.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa007.Tag = "query_a.daa007";
-            this.gvMx1daa007.Visible = true;
-            this.gvMx1daa007.VisibleIndex = 9;
-            this.gvMx1daa007.Width = 50;
-            // 
-            // gvMx1daa009
-            // 
-            this.gvMx1daa009.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa009.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa009.Caption = "鏈帓";
-            this.gvMx1daa009.FieldName = "wp";
-            this.gvMx1daa009.MaxWidth = 50;
-            this.gvMx1daa009.MinWidth = 50;
-            this.gvMx1daa009.Name = "gvMx1daa009";
-            this.gvMx1daa009.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa009.Tag = "query_a.daa009";
-            this.gvMx1daa009.Visible = true;
-            this.gvMx1daa009.VisibleIndex = 10;
-            this.gvMx1daa009.Width = 50;
-            // 
-            // gvMx1daa011
-            // 
-            this.gvMx1daa011.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa011.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa011.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa011.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1daa011.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa011.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1daa011.Caption = "鏈鎺掓暟閲�";
-            this.gvMx1daa011.FieldName = "daa008";
-            this.gvMx1daa011.MaxWidth = 50;
-            this.gvMx1daa011.MinWidth = 60;
-            this.gvMx1daa011.Name = "gvMx1daa011";
-            this.gvMx1daa011.Tag = "yz_quantity_0_edit";
-            this.gvMx1daa011.Visible = true;
-            this.gvMx1daa011.VisibleIndex = 11;
-            this.gvMx1daa011.Width = 60;
-            // 
-            // gvMx1daa012
-            // 
-            this.gvMx1daa012.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa012.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa012.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa012.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1daa012.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1daa012.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1daa012.Caption = "绾垮埆缂栫爜";
-            this.gvMx1daa012.ColumnEdit = this.rptJYBZ;
-            this.gvMx1daa012.FieldName = "daa015LineName";
-            this.gvMx1daa012.MinWidth = 150;
-            this.gvMx1daa012.Name = "gvMx1daa012";
-            this.gvMx1daa012.Tag = "edit";
-            this.gvMx1daa012.Visible = true;
-            this.gvMx1daa012.VisibleIndex = 12;
-            this.gvMx1daa012.Width = 153;
-            // 
-            // rptJYBZ
-            // 
-            this.rptJYBZ.AutoHeight = false;
-            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.Caption = "閫夊埆绫诲瀷";
+            this.gvMx1reporttime.FieldName = "chooseType";
             this.gvMx1reporttime.MinWidth = 50;
             this.gvMx1reporttime.Name = "gvMx1reporttime";
             this.gvMx1reporttime.Tag = "edit";
             this.gvMx1reporttime.Visible = true;
-            this.gvMx1reporttime.VisibleIndex = 13;
+            this.gvMx1reporttime.VisibleIndex = 7;
             this.gvMx1reporttime.Width = 102;
             // 
-            // gvMx1daa017
+            // gridColumn14
             // 
-            this.gvMx1daa017.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            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;
+            this.gridColumn14.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn14.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn14.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn14.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn14.Caption = "澶勭疆鎰忚";
+            this.gridColumn14.FieldName = "handResult";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 8;
+            this.gridColumn14.Width = 94;
             // 
-            // gvMx1daa019
+            // gridColumn15
             // 
-            this.gvMx1daa019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            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;
+            this.gridColumn15.Caption = "閫夊埆鏁伴噺";
+            this.gridColumn15.FieldName = "chooseQty";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 9;
+            this.gridColumn15.Width = 94;
             // 
-            // gvMx1checkDate
+            // gridColumn16
             // 
-            this.gvMx1checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            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.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1daa014.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa014.Caption = "鎶曟枡鍗曞崟鍙�";
-            this.gvMx1daa014.FieldName = "daa014";
-            this.gvMx1daa014.MinWidth = 50;
-            this.gvMx1daa014.Name = "gvMx1daa014";
-            this.gvMx1daa014.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa014.Tag = "query_a.daa014";
-            this.gvMx1daa014.Visible = true;
-            this.gvMx1daa014.VisibleIndex = 14;
-            this.gvMx1daa014.Width = 51;
-            // 
-            // gvMx1machineNo
-            // 
-            this.gvMx1machineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            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;
+            this.gridColumn16.Caption = "涓嶅悎鏍兼弿杩�";
+            this.gridColumn16.FieldName = "fngDesc";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 10;
+            this.gridColumn16.Width = 94;
             // 
             // repositoryItemDateEdit1
             // 
@@ -1213,47 +1018,14 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
             // 
-            // gridColumn3
+            // repositoryItemDateEdit2
             // 
-            this.gridColumn3.Caption = "绾夸綋ID";
-            this.gridColumn3.FieldName = "daa015";
-            this.gridColumn3.MinWidth = 25;
-            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;
-            // 
-            // 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;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 80;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 17;
-            this.gvMxDel.Width = 84;
+            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";
             // 
             // repositoryItemButtonEdit1
             // 
@@ -1264,7 +1036,24 @@
             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)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+            // 
+            // rptJYBZ
+            // 
+            this.rptJYBZ.AutoHeight = false;
+            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;
+            // 
+            // repositoryItemDateEdit3
+            // 
+            this.repositoryItemDateEdit3.AutoHeight = false;
+            this.repositoryItemDateEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit3.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit3.Name = "repositoryItemDateEdit3";
             // 
             // picCheckBox
             // 
@@ -1275,6 +1064,20 @@
             this.picCheckBox.TabIndex = 7;
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.Size = new System.Drawing.Size(0, 0);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(50, 20);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
             // 
             // MesQcExceptional
             // 
@@ -1305,35 +1108,46 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fstatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_dhdDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             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.rptJYBZ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1352,26 +1166,12 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private UserControl.UcLookOrg txt_erpSczz;
-        private UserControl.UcLookWorkshop txt_pba013;
-        private DevExpress.XtraEditors.TextEdit txt_hNo;
-        private DevExpress.XtraEditors.SimpleButton btnSelect;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_checkUser;
-        private DevExpress.XtraEditors.TextEdit txt_checkDate;
-        private DevExpress.XtraEditors.TextEdit txt_pba009;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraEditors.CheckEdit txt_fstatus;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1379,47 +1179,56 @@
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
         private DevExpress.XtraGrid.Columns.GridColumn caaGuid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa016;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit2;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa018;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa006;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa007;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa009;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa011;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa012;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
-        private DevExpress.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;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraEditors.TextEdit txt_fType;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraEditors.TextEdit txt_itemNo;
+        private DevExpress.XtraEditors.TextEdit txt_itemName;
+        private DevExpress.XtraEditors.TextEdit txt_itemModel;
+        private DevExpress.XtraEditors.TextEdit txt_dhdNo;
+        private DevExpress.XtraEditors.TextEdit txt_gysNo;
+        private DevExpress.XtraEditors.TextEdit txt_gysName;
+        private DevExpress.XtraEditors.TextEdit txt_guid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+        private DevExpress.XtraEditors.TextEdit txt_fBillNo;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_dhdDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraEditors.MemoEdit txt_fngDesc;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3