From b54d247ffc912c4af1c96fe05bc6ca1630a77be0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 03 四月 2025 23:58:51 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs | 1390 +++++++++++++++++++++++----------------------------------
 1 files changed, 574 insertions(+), 816 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index 237cca7..19211c4 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -37,6 +37,7 @@
             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.XtraLayout.RowDefinition rowDefinition6 = 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();
@@ -58,32 +59,43 @@
             this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = 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.gridColumn14 = 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.txt_pba009 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_remark = 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.textEdit1 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit2 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit5 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit6 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit7 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit8 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit9 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit10 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit11 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit12 = new DevExpress.XtraEditors.TextEdit();
-            this.comboBoxEdit1 = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.textEdit13 = new DevExpress.XtraEditors.TextEdit();
-            this.comboBoxEdit2 = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.textEdit14 = new DevExpress.XtraEditors.TextEdit();
-            this.textEdit15 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_chkStatus = 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_qty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_chooseQty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_handSuggestion = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_chooseType = new DevExpress.XtraEditors.TextEdit();
+            this.txt_handResult = new DevExpress.XtraEditors.ComboBoxEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
-            this.txt_hNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_chooseGoodQty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_chooseBadQty = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -95,7 +107,6 @@
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -106,6 +117,9 @@
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -117,43 +131,16 @@
             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.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.textEdit3 = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.textEdit4 = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -174,27 +161,28 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.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.textEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit7.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit8.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit9.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit10.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit11.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit12.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit13.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit2.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit14.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit15.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.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_qty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -206,7 +194,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
@@ -217,24 +204,24 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).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.repositoryItemButtonEdit1)).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.rptJYBZ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             this.SuspendLayout();
             // 
@@ -296,7 +283,7 @@
             // 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";
@@ -309,7 +296,7 @@
             // 
             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[] {
@@ -322,7 +309,17 @@
             this.gv_pba005,
             this.gv_pba006,
             this.gv_pba009,
-            this.gridColumn5});
+            this.gridColumn5,
+            this.gridColumn3,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9,
+            this.gridColumn10,
+            this.gridColumn11,
+            this.gridColumn12,
+            this.gridColumn13,
+            this.gridColumn14});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -332,10 +329,10 @@
             // 
             // 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.FieldName = "chkStatus";
             this.gv_fstatus.MaxWidth = 50;
             this.gv_fstatus.MinWidth = 50;
             this.gv_fstatus.Name = "gv_fstatus";
@@ -347,106 +344,204 @@
             // 
             // 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 = 1;
             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 = 2;
             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 = 3;
             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 = 4;
             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 = 5;
             this.gv_pba005.Width = 94;
             // 
             // gv_pba006
             // 
-            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.Caption = "澶勭疆鎰忚";
+            this.gv_pba006.FieldName = "handSuggestion";
             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.VisibleIndex = 6;
             this.gv_pba006.Width = 180;
             // 
             // gv_pba009
             // 
-            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.Caption = "閫夊埆绫诲埆";
+            this.gv_pba009.FieldName = "chooseType";
             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.VisibleIndex = 7;
             this.gv_pba009.Width = 100;
             // 
             // gridColumn5
             // 
-            this.gridColumn5.Caption = "涓婚敭GUID";
-            this.gridColumn5.FieldName = "guid";
+            this.gridColumn5.Caption = "閫夊埆鏁伴噺";
+            this.gridColumn5.FieldName = "chooseQty";
             this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Width = 94;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "閫夊埆鑹搧鏁�";
+            this.gridColumn3.FieldName = "chooseGoodQty";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 8;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "閫夊埆涓嶈壇鍝佹暟";
+            this.gridColumn6.FieldName = "chooseBadQty";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 9;
+            this.gridColumn6.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鍒ゅ畾缁撴灉";
+            this.gridColumn7.FieldName = "handResult";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 10;
+            this.gridColumn7.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn8.FieldName = "itemNo";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 11;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn9.FieldName = "itemName";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 12;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn10.FieldName = "itemModel";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 13;
+            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 = 14;
+            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 = 15;
+            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 = 16;
+            this.gridColumn13.Width = 94;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "妫�楠屽崟鍙�";
+            this.gridColumn14.FieldName = "jydNo";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 17;
+            this.gridColumn14.Width = 94;
             // 
             // pageBar1
             // 
@@ -484,33 +579,34 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 169;
+            this.splitMx1.SplitterPosition = 201;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_pba009);
+            this.layoutMx1.Controls.Add(this.txt_remark);
             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.textEdit1);
-            this.layoutMx1.Controls.Add(this.textEdit2);
-            this.layoutMx1.Controls.Add(this.textEdit5);
-            this.layoutMx1.Controls.Add(this.textEdit6);
-            this.layoutMx1.Controls.Add(this.textEdit7);
-            this.layoutMx1.Controls.Add(this.textEdit8);
-            this.layoutMx1.Controls.Add(this.textEdit9);
-            this.layoutMx1.Controls.Add(this.textEdit10);
-            this.layoutMx1.Controls.Add(this.textEdit11);
-            this.layoutMx1.Controls.Add(this.textEdit12);
-            this.layoutMx1.Controls.Add(this.comboBoxEdit1);
-            this.layoutMx1.Controls.Add(this.textEdit13);
-            this.layoutMx1.Controls.Add(this.comboBoxEdit2);
-            this.layoutMx1.Controls.Add(this.textEdit14);
-            this.layoutMx1.Controls.Add(this.textEdit15);
+            this.layoutMx1.Controls.Add(this.txt_chkStatus);
+            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_qty);
+            this.layoutMx1.Controls.Add(this.txt_chooseQty);
+            this.layoutMx1.Controls.Add(this.txt_handSuggestion);
+            this.layoutMx1.Controls.Add(this.txt_chooseType);
+            this.layoutMx1.Controls.Add(this.txt_handResult);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_guid);
-            this.layoutMx1.Controls.Add(this.txt_hNo);
+            this.layoutMx1.Controls.Add(this.txt_fBillNo);
+            this.layoutMx1.Controls.Add(this.txt_chooseGoodQty);
+            this.layoutMx1.Controls.Add(this.txt_chooseBadQty);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem9,
@@ -519,7 +615,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(706, 510, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 169);
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 201);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -532,152 +628,170 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_pba009
+            // txt_remark
             // 
-            this.txt_pba009.Location = new System.Drawing.Point(148, 140);
-            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(402, 28);
-            this.txt_pba009.TabIndex = 240;
+            this.txt_remark.Location = new System.Drawing.Point(114, 172);
+            this.txt_remark.Name = "txt_remark";
+           
+            this.txt_remark.Properties.Appearance.Options.UseFont = true;
+            this.txt_remark.Size = new System.Drawing.Size(436, 28);
+            this.txt_remark.StyleController = this.layoutMx1;
+            this.txt_remark.TabIndex = 240;
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(961, 12);
+            this.txt_checkUser.Location = new System.Drawing.Point(927, 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(132, 28);
+            this.txt_checkUser.Size = new System.Drawing.Size(166, 28);
+            this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 273;
             this.txt_checkUser.Tag = "readonly";
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(961, 44);
+            this.txt_checkDate.Location = new System.Drawing.Point(927, 44);
             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(132, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(166, 28);
+            this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 267;
             this.txt_checkDate.Tag = "readonly";
             // 
-            // txt_fstatus
+            // txt_chkStatus
             // 
-            this.txt_fstatus.Location = new System.Drawing.Point(825, 76);
-            this.txt_fstatus.Name = "txt_fstatus";
-            this.txt_fstatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_fstatus.Size = new System.Drawing.Size(268, 24);
-            this.txt_fstatus.TabIndex = 461;
+            this.txt_chkStatus.Location = new System.Drawing.Point(825, 76);
+            this.txt_chkStatus.Name = "txt_chkStatus";
+            this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
+            this.txt_chkStatus.Size = new System.Drawing.Size(268, 24);
+            this.txt_chkStatus.StyleController = this.layoutMx1;
+            this.txt_chkStatus.TabIndex = 461;
             // 
-            // textEdit1
+            // txt_fType
             // 
-            this.textEdit1.Location = new System.Drawing.Point(419, 12);
-            this.textEdit1.Name = "textEdit1";
-            this.textEdit1.Size = new System.Drawing.Size(131, 24);
-            this.textEdit1.TabIndex = 462;
+            this.txt_fType.Location = new System.Drawing.Point(385, 12);
+            this.txt_fType.Name = "txt_fType";
+            this.txt_fType.Size = new System.Drawing.Size(165, 24);
+            this.txt_fType.StyleController = this.layoutMx1;
+            this.txt_fType.TabIndex = 462;
             // 
-            // textEdit2
+            // txt_itemNo
             // 
-            this.textEdit2.Location = new System.Drawing.Point(148, -27);
-            this.textEdit2.Name = "textEdit2";
-            this.textEdit2.Size = new System.Drawing.Size(131, 24);
-            this.textEdit2.StyleController = this.layoutMx1;
-            this.textEdit2.TabIndex = 463;
+            this.txt_itemNo.Location = new System.Drawing.Point(114, 44);
+            this.txt_itemNo.Name = "txt_itemNo";
+            this.txt_itemNo.Size = new System.Drawing.Size(165, 24);
+            this.txt_itemNo.StyleController = this.layoutMx1;
+            this.txt_itemNo.TabIndex = 464;
             // 
-            // textEdit5
+            // txt_itemName
             // 
-            this.textEdit5.Location = new System.Drawing.Point(148, 44);
-            this.textEdit5.Name = "textEdit5";
-            this.textEdit5.Size = new System.Drawing.Size(131, 24);
-            this.textEdit5.TabIndex = 464;
+            this.txt_itemName.Location = new System.Drawing.Point(385, 44);
+            this.txt_itemName.Name = "txt_itemName";
+            this.txt_itemName.Size = new System.Drawing.Size(165, 24);
+            this.txt_itemName.StyleController = this.layoutMx1;
+            this.txt_itemName.TabIndex = 465;
             // 
-            // textEdit6
+            // txt_itemModel
             // 
-            this.textEdit6.Location = new System.Drawing.Point(419, 44);
-            this.textEdit6.Name = "textEdit6";
-            this.textEdit6.Size = new System.Drawing.Size(131, 24);
-            this.textEdit6.TabIndex = 465;
+            this.txt_itemModel.Location = new System.Drawing.Point(656, 44);
+            this.txt_itemModel.Name = "txt_itemModel";
+            this.txt_itemModel.Size = new System.Drawing.Size(165, 24);
+            this.txt_itemModel.StyleController = this.layoutMx1;
+            this.txt_itemModel.TabIndex = 466;
             // 
-            // textEdit7
+            // txt_dhdNo
             // 
-            this.textEdit7.Location = new System.Drawing.Point(690, 44);
-            this.textEdit7.Name = "textEdit7";
-            this.textEdit7.Size = new System.Drawing.Size(131, 24);
-            this.textEdit7.TabIndex = 466;
+            this.txt_dhdNo.Location = new System.Drawing.Point(656, 12);
+            this.txt_dhdNo.Name = "txt_dhdNo";
+            this.txt_dhdNo.Size = new System.Drawing.Size(165, 24);
+            this.txt_dhdNo.StyleController = this.layoutMx1;
+            this.txt_dhdNo.TabIndex = 467;
             // 
-            // textEdit8
+            // txt_gysNo
             // 
-            this.textEdit8.Location = new System.Drawing.Point(690, 12);
-            this.textEdit8.Name = "textEdit8";
-            this.textEdit8.Size = new System.Drawing.Size(131, 24);
-            this.textEdit8.TabIndex = 467;
+            this.txt_gysNo.Location = new System.Drawing.Point(656, 76);
+            this.txt_gysNo.Name = "txt_gysNo";
+            this.txt_gysNo.Size = new System.Drawing.Size(165, 24);
+            this.txt_gysNo.StyleController = this.layoutMx1;
+            this.txt_gysNo.TabIndex = 468;
             // 
-            // textEdit9
+            // txt_gysName
             // 
-            this.textEdit9.Location = new System.Drawing.Point(690, 76);
-            this.textEdit9.Name = "textEdit9";
-            this.textEdit9.Size = new System.Drawing.Size(131, 24);
-            this.textEdit9.TabIndex = 468;
+            this.txt_gysName.Location = new System.Drawing.Point(656, 108);
+            this.txt_gysName.Name = "txt_gysName";
+            this.txt_gysName.Size = new System.Drawing.Size(165, 24);
+            this.txt_gysName.StyleController = this.layoutMx1;
+            this.txt_gysName.TabIndex = 469;
             // 
-            // textEdit10
+            // txt_qty
             // 
-            this.textEdit10.Location = new System.Drawing.Point(690, 108);
-            this.textEdit10.Name = "textEdit10";
-            this.textEdit10.Size = new System.Drawing.Size(131, 24);
-            this.textEdit10.TabIndex = 469;
+            this.txt_qty.Location = new System.Drawing.Point(114, 76);
+            this.txt_qty.Name = "txt_qty";
+            this.txt_qty.Size = new System.Drawing.Size(165, 24);
+            this.txt_qty.StyleController = this.layoutMx1;
+            this.txt_qty.TabIndex = 470;
             // 
-            // textEdit11
+            // txt_chooseQty
             // 
-            this.textEdit11.Location = new System.Drawing.Point(148, 76);
-            this.textEdit11.Name = "textEdit11";
-            this.textEdit11.Size = new System.Drawing.Size(131, 24);
-            this.textEdit11.TabIndex = 470;
+            this.txt_chooseQty.Location = new System.Drawing.Point(114, 108);
+            this.txt_chooseQty.Name = "txt_chooseQty";
+            this.txt_chooseQty.Size = new System.Drawing.Size(165, 24);
+            this.txt_chooseQty.StyleController = this.layoutMx1;
+            this.txt_chooseQty.TabIndex = 471;
             // 
-            // textEdit12
+            // txt_handSuggestion
             // 
-            this.textEdit12.Location = new System.Drawing.Point(148, 108);
-            this.textEdit12.Name = "textEdit12";
-            this.textEdit12.Size = new System.Drawing.Size(131, 24);
-            this.textEdit12.TabIndex = 471;
-            // 
-            // comboBoxEdit1
-            // 
-            this.comboBoxEdit1.Location = new System.Drawing.Point(419, 76);
-            this.comboBoxEdit1.Name = "comboBoxEdit1";
-            this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_handSuggestion.Location = new System.Drawing.Point(385, 76);
+            this.txt_handSuggestion.Name = "txt_handSuggestion";
+            this.txt_handSuggestion.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.comboBoxEdit1.Size = new System.Drawing.Size(131, 24);
-            this.comboBoxEdit1.TabIndex = 472;
+            this.txt_handSuggestion.Properties.Items.AddRange(new object[] {
+            "-璇烽�夋嫨-",
+            "鍔犱弗",
+            "鏀惧"});
+            this.txt_handSuggestion.Size = new System.Drawing.Size(165, 24);
+            this.txt_handSuggestion.StyleController = this.layoutMx1;
+            this.txt_handSuggestion.TabIndex = 472;
             // 
-            // textEdit13
+            // txt_chooseType
             // 
-            this.textEdit13.Location = new System.Drawing.Point(419, 108);
-            this.textEdit13.Name = "textEdit13";
-            this.textEdit13.Size = new System.Drawing.Size(131, 24);
-            this.textEdit13.TabIndex = 473;
+            this.txt_chooseType.Location = new System.Drawing.Point(385, 108);
+            this.txt_chooseType.Name = "txt_chooseType";
+            this.txt_chooseType.Size = new System.Drawing.Size(165, 24);
+            this.txt_chooseType.StyleController = this.layoutMx1;
+            this.txt_chooseType.TabIndex = 473;
             // 
-            // comboBoxEdit2
+            // txt_handResult
             // 
-            this.comboBoxEdit2.Location = new System.Drawing.Point(690, 140);
-            this.comboBoxEdit2.Name = "comboBoxEdit2";
-            this.comboBoxEdit2.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.txt_handResult.Location = new System.Drawing.Point(656, 140);
+            this.txt_handResult.Name = "txt_handResult";
+            this.txt_handResult.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.comboBoxEdit2.Size = new System.Drawing.Size(131, 24);
-            this.comboBoxEdit2.TabIndex = 474;
+            this.txt_handResult.Properties.Items.AddRange(new object[] {
+            "-璇烽�夋嫨-",
+            "OK",
+            "NG"});
+            this.txt_handResult.Size = new System.Drawing.Size(165, 24);
+            this.txt_handResult.StyleController = this.layoutMx1;
+            this.txt_handResult.TabIndex = 474;
             // 
-            // textEdit14
+            // txt_createBy
             // 
-            this.textEdit14.Location = new System.Drawing.Point(961, 108);
-            this.textEdit14.Name = "textEdit14";
-            this.textEdit14.Size = new System.Drawing.Size(132, 24);
-            this.textEdit14.TabIndex = 475;
+            this.txt_createBy.Location = new System.Drawing.Point(927, 108);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Size = new System.Drawing.Size(166, 24);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 475;
             // 
-            // textEdit15
+            // txt_createDate
             // 
-            this.textEdit15.Location = new System.Drawing.Point(961, 140);
-            this.textEdit15.Name = "textEdit15";
-            this.textEdit15.Size = new System.Drawing.Size(132, 24);
-            this.textEdit15.TabIndex = 476;
+            this.txt_createDate.Location = new System.Drawing.Point(927, 140);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Size = new System.Drawing.Size(166, 24);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 476;
             // 
             // txt_guid
             // 
@@ -687,12 +801,29 @@
             this.txt_guid.StyleController = this.layoutMx1;
             this.txt_guid.TabIndex = 477;
             // 
-            // txt_hNo
+            // txt_fBillNo
             // 
-            this.txt_hNo.Location = new System.Drawing.Point(148, 12);
-            this.txt_hNo.Name = "txt_hNo";
-            this.txt_hNo.Size = new System.Drawing.Size(131, 24);
-            this.txt_hNo.TabIndex = 478;
+            this.txt_fBillNo.Location = new System.Drawing.Point(114, 12);
+            this.txt_fBillNo.Name = "txt_fBillNo";
+            this.txt_fBillNo.Size = new System.Drawing.Size(165, 24);
+            this.txt_fBillNo.StyleController = this.layoutMx1;
+            this.txt_fBillNo.TabIndex = 478;
+            // 
+            // txt_chooseGoodQty
+            // 
+            this.txt_chooseGoodQty.Location = new System.Drawing.Point(114, 140);
+            this.txt_chooseGoodQty.Name = "txt_chooseGoodQty";
+            this.txt_chooseGoodQty.Size = new System.Drawing.Size(165, 24);
+            this.txt_chooseGoodQty.StyleController = this.layoutMx1;
+            this.txt_chooseGoodQty.TabIndex = 479;
+            // 
+            // txt_chooseBadQty
+            // 
+            this.txt_chooseBadQty.Location = new System.Drawing.Point(385, 140);
+            this.txt_chooseBadQty.Name = "txt_chooseBadQty";
+            this.txt_chooseBadQty.Size = new System.Drawing.Size(165, 24);
+            this.txt_chooseBadQty.StyleController = this.layoutMx1;
+            this.txt_chooseBadQty.TabIndex = 480;
             // 
             // layoutControlItem9
             // 
@@ -730,7 +861,6 @@
             this.layoutControlItem15,
             this.layoutControlItem16,
             this.layoutControlItem17,
-            this.layoutControlItem7,
             this.layoutControlItem18,
             this.layoutControlItem19,
             this.layoutControlItem20,
@@ -740,7 +870,10 @@
             this.layoutControlItem14,
             this.layoutControlItem22,
             this.layoutControlItem23,
-            this.layoutControlItem2});
+            this.layoutControlItem2,
+            this.layoutControlItem7,
+            this.layoutControlItem25,
+            this.layoutControlItem26});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -766,13 +899,16 @@
             rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition5.Height = 100D;
             rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
             rowDefinition3,
             rowDefinition4,
-            rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1105, 180);
+            rowDefinition5,
+            rowDefinition6});
+            this.Root.Size = new System.Drawing.Size(1105, 212);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem5
@@ -783,139 +919,128 @@
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
             this.layoutControlItem5.Text = "瀹℃牳浜�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem1
             // 
-            this.layoutControlItem1.Control = this.textEdit1;
+            this.layoutControlItem1.Control = this.txt_fType;
             this.layoutControlItem1.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem1.Text = "寮傚父绫诲瀷";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem11
             // 
-            this.layoutControlItem11.Control = this.textEdit5;
+            this.layoutControlItem11.Control = this.txt_itemNo;
             this.layoutControlItem11.Location = new System.Drawing.Point(0, 32);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem12
             // 
-            this.layoutControlItem12.Control = this.textEdit6;
+            this.layoutControlItem12.Control = this.txt_itemName;
             this.layoutControlItem12.Location = new System.Drawing.Point(271, 32);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem13
             // 
-            this.layoutControlItem13.Control = this.textEdit7;
+            this.layoutControlItem13.Control = this.txt_itemModel;
             this.layoutControlItem13.Location = new System.Drawing.Point(542, 32);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem13.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
-            this.layoutControlItem15.Control = this.textEdit9;
+            this.layoutControlItem15.Control = this.txt_gysNo;
             this.layoutControlItem15.Location = new System.Drawing.Point(542, 64);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
-            this.layoutControlItem16.Control = this.textEdit10;
+            this.layoutControlItem16.Control = this.txt_gysName;
             this.layoutControlItem16.Location = new System.Drawing.Point(542, 96);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
-            this.layoutControlItem17.Control = this.textEdit11;
+            this.layoutControlItem17.Control = this.txt_qty;
             this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem17.Text = "鏉ユ枡鏁伴噺";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(124, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_pba009;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 128);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
-            this.layoutControlItem7.Text = "寮傚父澶囨敞";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem18
             // 
-            this.layoutControlItem18.Control = this.textEdit12;
+            this.layoutControlItem18.Control = this.txt_chooseQty;
             this.layoutControlItem18.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem18.Text = "閫夊埆鏁伴噺";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem19
             // 
-            this.layoutControlItem19.Control = this.comboBoxEdit1;
+            this.layoutControlItem19.Control = this.txt_handSuggestion;
             this.layoutControlItem19.Location = new System.Drawing.Point(271, 64);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem19.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem19.Text = "澶勭疆鎰忚";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem20
             // 
-            this.layoutControlItem20.Control = this.textEdit13;
+            this.layoutControlItem20.Control = this.txt_chooseType;
             this.layoutControlItem20.Location = new System.Drawing.Point(271, 96);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem20.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem20.Text = "閫夊埆绫诲埆";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem21
             // 
-            this.layoutControlItem21.Control = this.comboBoxEdit2;
+            this.layoutControlItem21.Control = this.txt_handResult;
             this.layoutControlItem21.Location = new System.Drawing.Point(542, 128);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem21.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem21.Text = "鍒ゅ畾";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
-            this.layoutControlItem6.Control = this.txt_fstatus;
+            this.layoutControlItem6.Control = this.txt_chkStatus;
             this.layoutControlItem6.Location = new System.Drawing.Point(813, 64);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -934,47 +1059,80 @@
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem3.Size = new System.Drawing.Size(272, 32);
             this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem14
             // 
-            this.layoutControlItem14.Control = this.textEdit8;
+            this.layoutControlItem14.Control = this.txt_dhdNo;
             this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem22
             // 
-            this.layoutControlItem22.Control = this.textEdit14;
+            this.layoutControlItem22.Control = this.txt_createBy;
             this.layoutControlItem22.Location = new System.Drawing.Point(813, 96);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem22.Size = new System.Drawing.Size(272, 32);
             this.layoutControlItem22.Text = "鍒涘缓浜�";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem23
             // 
-            this.layoutControlItem23.Control = this.textEdit15;
+            this.layoutControlItem23.Control = this.txt_createDate;
             this.layoutControlItem23.Location = new System.Drawing.Point(813, 128);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem23.Size = new System.Drawing.Size(272, 32);
             this.layoutControlItem23.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
-            this.layoutControlItem2.Control = this.txt_hNo;
+            this.layoutControlItem2.Control = this.txt_fBillNo;
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(124, 18);
+            this.layoutControlItem2.Text = "鍗曟嵁缂栧彿";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_remark;
+            this.layoutControlItem7.Location = new System.Drawing.Point(0, 160);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem7.Size = new System.Drawing.Size(542, 32);
+            this.layoutControlItem7.Text = "寮傚父澶囨敞";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_chooseGoodQty;
+            this.layoutControlItem25.Location = new System.Drawing.Point(0, 128);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem25.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem25.Text = "閫夊埆鑹搧鏁�";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.txt_chooseBadQty;
+            this.layoutControlItem26.Location = new System.Drawing.Point(271, 128);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem26.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem26.Text = "閫夊埆涓嶈壇鍝佹暟";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -982,7 +1140,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, 389);
+            this.tabMx.Size = new System.Drawing.Size(1126, 357);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -991,7 +1149,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 357);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 325);
             this.tabMxPage1.Text = "閫夊埆鏄庣粏";
             // 
             // gcMx1
@@ -1006,7 +1164,7 @@
             this.repositoryItemButtonEdit1,
             this.rptJYBZ,
             this.repositoryItemDateEdit3});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 357);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 325);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1024,32 +1182,8 @@
             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.gridColumn6,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -1059,7 +1193,7 @@
             // 
             // 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";
@@ -1071,8 +1205,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;
@@ -1080,10 +1214,10 @@
             // 
             // 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;
@@ -1094,10 +1228,10 @@
             // 
             // gvMx1daa010
             // 
-            this.gvMx1daa010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa010.Caption = "浠诲姟鍗曞彿";
-            this.gvMx1daa010.FieldName = "daa021";
+            this.gvMx1daa010.Caption = "鎵规";
+            this.gvMx1daa010.FieldName = "batch";
             this.gvMx1daa010.MinWidth = 50;
             this.gvMx1daa010.Name = "gvMx1daa010";
             this.gvMx1daa010.OptionsColumn.ReadOnly = true;
@@ -1108,10 +1242,10 @@
             // 
             // 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;
@@ -1122,10 +1256,10 @@
             // 
             // gvMx1daa003
             // 
-            this.gvMx1daa003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+           
             this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa003.Caption = "浜у搧鍚嶇О";
-            this.gvMx1daa003.FieldName = "daa003";
+            this.gvMx1daa003.Caption = "涓嶈壇椤圭洰";
+            this.gvMx1daa003.FieldName = "badItem";
             this.gvMx1daa003.MinWidth = 50;
             this.gvMx1daa003.Name = "gvMx1daa003";
             this.gvMx1daa003.OptionsColumn.ReadOnly = true;
@@ -1136,10 +1270,10 @@
             // 
             // 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;
@@ -1148,406 +1282,37 @@
             this.gvMx1daa004.VisibleIndex = 4;
             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 = 5;
             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;
             // 
             // 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.FieldName = "remark";
             this.gvMx1reporttime.MinWidth = 50;
             this.gvMx1reporttime.Name = "gvMx1reporttime";
             this.gvMx1reporttime.Tag = "edit";
             this.gvMx1reporttime.Visible = true;
-            this.gvMx1reporttime.VisibleIndex = 13;
+            this.gvMx1reporttime.VisibleIndex = 6;
             this.gvMx1reporttime.Width = 102;
-            // 
-            // gvMx1daa017
-            // 
-            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;
-            // 
-            // gvMx1daa019
-            // 
-            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;
-            // 
-            // gvMx1checkDate
-            // 
-            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;
-            // 
-            // repositoryItemDateEdit1
-            // 
-            this.repositoryItemDateEdit1.AutoHeight = false;
-            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
-            // 
-            // gridColumn3
-            // 
-            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
             // 
@@ -1556,7 +1321,7 @@
             this.gvMxDel.MinWidth = 80;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 17;
+            this.gvMxDel.VisibleIndex = 7;
             this.gvMxDel.Width = 84;
             // 
             // repositoryItemButtonEdit1
@@ -1570,6 +1335,42 @@
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
+            // repositoryItemDateEdit1
+            // 
+            this.repositoryItemDateEdit1.AutoHeight = false;
+            this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
+            // 
+            // 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";
+            // 
+            // 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
             // 
             this.picCheckBox.Location = new System.Drawing.Point(1024, 55);
@@ -1580,48 +1381,19 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.textEdit2;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // textEdit3
-            // 
-            this.textEdit3.Location = new System.Drawing.Point(419, -27);
-            this.textEdit3.Name = "textEdit3";
-            this.textEdit3.Size = new System.Drawing.Size(131, 24);
-            this.textEdit3.TabIndex = 464;
-            // 
             // layoutControlItem8
             // 
-            this.layoutControlItem8.Control = this.textEdit3;
-            this.layoutControlItem8.Location = new System.Drawing.Point(271, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // textEdit4
-            // 
-            this.textEdit4.Location = new System.Drawing.Point(698, -27);
-            this.textEdit4.Name = "textEdit4";
-            this.textEdit4.Size = new System.Drawing.Size(123, 24);
-            this.textEdit4.TabIndex = 465;
+            this.layoutControlItem8.Size = new System.Drawing.Size(0, 0);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(50, 20);
             // 
             // layoutControlItem10
             // 
-            this.layoutControlItem10.Control = this.textEdit4;
-            this.layoutControlItem10.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem10.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
             // 
             // MesQcExceptional
             // 
@@ -1652,27 +1424,28 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pba009.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.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.textEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit5.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit7.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit8.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit9.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit10.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit11.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit12.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit13.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.comboBoxEdit2.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit14.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit15.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.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_qty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_hNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1684,7 +1457,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
@@ -1695,24 +1467,24 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).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.repositoryItemButtonEdit1)).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.rptJYBZ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit3.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit4.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             this.ResumeLayout(false);
 
@@ -1742,8 +1514,8 @@
         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.XtraEditors.CheckEdit txt_fstatus;
+        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1751,10 +1523,7 @@
         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;
@@ -1762,66 +1531,40 @@
         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.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraEditors.TextEdit txt_fType;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraEditors.TextEdit textEdit2;
-        private DevExpress.XtraEditors.TextEdit textEdit3;
-        private DevExpress.XtraEditors.TextEdit textEdit4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraEditors.TextEdit textEdit5;
-        private DevExpress.XtraEditors.TextEdit textEdit6;
-        private DevExpress.XtraEditors.TextEdit textEdit7;
+        private DevExpress.XtraEditors.TextEdit txt_itemNo;
+        private DevExpress.XtraEditors.TextEdit txt_itemName;
+        private DevExpress.XtraEditors.TextEdit txt_itemModel;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraEditors.TextEdit textEdit8;
-        private DevExpress.XtraEditors.TextEdit textEdit9;
-        private DevExpress.XtraEditors.TextEdit textEdit10;
-        private DevExpress.XtraEditors.TextEdit textEdit11;
-        private DevExpress.XtraEditors.TextEdit textEdit12;
-        private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit1;
-        private DevExpress.XtraEditors.TextEdit textEdit13;
+        private DevExpress.XtraEditors.TextEdit txt_dhdNo;
+        private DevExpress.XtraEditors.TextEdit txt_gysNo;
+        private DevExpress.XtraEditors.TextEdit txt_gysName;
+        private DevExpress.XtraEditors.TextEdit txt_qty;
+        private DevExpress.XtraEditors.TextEdit txt_chooseQty;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_handSuggestion;
+        private DevExpress.XtraEditors.TextEdit txt_chooseType;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraEditors.ComboBoxEdit comboBoxEdit2;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_handResult;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraEditors.TextEdit textEdit14;
-        private DevExpress.XtraEditors.TextEdit textEdit15;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraEditors.TextEdit txt_guid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
@@ -1829,7 +1572,22 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
-        private DevExpress.XtraEditors.TextEdit txt_hNo;
+        private DevExpress.XtraEditors.TextEdit txt_fBillNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraEditors.TextEdit txt_chooseGoodQty;
+        private DevExpress.XtraEditors.TextEdit txt_chooseBadQty;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        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.XtraGrid.Columns.GridColumn gridColumn14;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3