From 557bbc16b5341d4e9ba1352ec48e66fc573b88cb Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 27 五月 2025 15:50:55 +0800
Subject: [PATCH] 检验

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs |  961 ++++++++++++++++++++++++++++++-------------------------
 1 files changed, 525 insertions(+), 436 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index e31c7da..e924cb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -1,4 +1,6 @@
-锘縩amespace Gs.DevApp.DevFrm.Work
+锘縰sing Gs.DevApp.UserControl;
+
+namespace Gs.DevApp.DevFrm.Work
 {
     partial class Frm_Repair
     {
@@ -28,6 +30,7 @@
         /// </summary>
         private void InitializeComponent()
         {
+            this.components = new System.ComponentModel.Container();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -39,7 +42,6 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -50,7 +52,14 @@
             this.gv_userName = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_operationTable = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_msg = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
             this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
             this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -58,17 +67,15 @@
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
-            this.textSelect3 = new Gs.DevApp.DevFrm.Work.textSelect();
-            this.textSelect2 = new Gs.DevApp.DevFrm.Work.textSelect();
-            this.textSelect1 = new Gs.DevApp.DevFrm.Work.textSelect();
+            this.txt_badReson = new Gs.DevApp.UserControl.UcDictionary();
+            this.txt_remark = new Gs.DevApp.UserControl.UcDictionary();
+            this.txt_repairMethd = new Gs.DevApp.UserControl.UcDictionary();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
             this.txt_gx = new DevExpress.XtraEditors.TextEdit();
-            this.txt_czz = new DevExpress.XtraEditors.TextEdit();
+            this.txt_collectBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
-            this.txt_gwm = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_bc = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
             this.txt_sjXt = new DevExpress.XtraEditors.TextEdit();
@@ -83,20 +90,18 @@
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton4 = new DevExpress.XtraEditors.SimpleButton();
             this.simpleButton3 = new DevExpress.XtraEditors.SimpleButton();
-            this.progressBarControl1 = new DevExpress.XtraEditors.ProgressBarControl();
+            this.prog1 = new DevExpress.XtraEditors.ProgressBarControl();
             this.panel2 = new System.Windows.Forms.Panel();
             this.lbSum3 = new System.Windows.Forms.Label();
             this.label4 = new System.Windows.Forms.Label();
@@ -113,34 +118,39 @@
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2tlQty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1depotCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1depotSectionCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1ebelnK3id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lineK3id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -170,11 +180,9 @@
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).BeginInit();
@@ -189,15 +197,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
             this.panel2.SuspendLayout();
             this.panel4.SuspendLayout();
             this.panel1.SuspendLayout();
@@ -261,9 +267,9 @@
             // 
             // split1.Panel2
             // 
-            this.split1.Panel2.Text = "Panel2";
+             this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1251, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -288,7 +294,14 @@
             this.gv_userName,
             this.gv_operationTable,
             this.gridColumn1,
-            this.gv_msg});
+            this.gridColumn22,
+            this.gridColumn11,
+            this.gridColumn13,
+            this.gridColumn18,
+            this.gridColumn19,
+            this.gridColumn20,
+            this.gridColumn21,
+            this.gridColumn23});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -298,8 +311,8 @@
             // gv_operationTime
             // 
             this.gv_operationTime.AppearanceCell.Options.UseFont = true;
-            this.gv_operationTime.Caption = "鎿嶄綔鏃堕棿";
-            this.gv_operationTime.FieldName = "operationTime";
+            this.gv_operationTime.Caption = "鐢熶骇绾垮埆";
+            this.gv_operationTime.FieldName = "sjXt";
             this.gv_operationTime.Name = "gv_operationTime";
             this.gv_operationTime.OptionsColumn.AllowEdit = false;
             this.gv_operationTime.Tag = "query_OPERATION_TIME";
@@ -310,8 +323,8 @@
             // gv_userName
             // 
             this.gv_userName.AppearanceCell.Options.UseFont = true;
-            this.gv_userName.Caption = "鎿嶄綔浜哄憳";
-            this.gv_userName.FieldName = "userName";
+            this.gv_userName.Caption = "鐢熶骇鐘舵��";
+            this.gv_userName.FieldName = "daaStatus";
             this.gv_userName.Name = "gv_userName";
             this.gv_userName.OptionsColumn.AllowEdit = false;
             this.gv_userName.Tag = "query_USER_NAME";
@@ -322,35 +335,104 @@
             // gv_operationTable
             // 
             this.gv_operationTable.AppearanceCell.Options.UseFont = true;
-            this.gv_operationTable.Caption = "鐩稿叧琛�";
-            this.gv_operationTable.FieldName = "operationTable";
+            this.gv_operationTable.Caption = "宸ュ崟鍙�";
+            this.gv_operationTable.FieldName = "daaNo";
             this.gv_operationTable.Name = "gv_operationTable";
             this.gv_operationTable.OptionsColumn.AllowEdit = false;
             this.gv_operationTable.Tag = "query_OPERATION_TABLE";
+            this.gv_operationTable.Visible = true;
+            this.gv_operationTable.VisibleIndex = 2;
             this.gv_operationTable.Width = 100;
             // 
             // gridColumn1
             // 
-            this.gridColumn1.Caption = "鐩稿叧鍗曞彿";
-            this.gridColumn1.FieldName = "abtHno";
+            this.gridColumn1.Caption = "寮傚父鎻愪氦鏃ユ湡";
+            this.gridColumn1.FieldName = "createDate";
             this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 2;
+            this.gridColumn1.VisibleIndex = 3;
             this.gridColumn1.Width = 94;
             // 
-            // gv_msg
+            // gridColumn22
             // 
-            this.gv_msg.AppearanceCell.Options.UseFont = true;
-            this.gv_msg.Caption = "鎿嶄綔璇︽儏";
-            this.gv_msg.FieldName = "msg";
-            this.gv_msg.MaxWidth = 800;
-            this.gv_msg.Name = "gv_msg";
-            this.gv_msg.OptionsColumn.AllowEdit = false;
-            this.gv_msg.Tag = "query_MSG";
-            this.gv_msg.Visible = true;
-            this.gv_msg.VisibleIndex = 3;
-            this.gv_msg.Width = 20;
+            this.gridColumn22.Caption = "浜у搧ID";
+            this.gridColumn22.FieldName = "itemId";
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 4;
+            this.gridColumn22.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "浜у搧缂栫爜";
+            this.gridColumn11.FieldName = "itemNo";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 5;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "浜у搧鍚嶇О";
+            this.gridColumn13.FieldName = "itemName";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 6;
+            this.gridColumn13.Width = 94;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "浜у搧瑙勬牸";
+            this.gridColumn18.FieldName = "itemModel";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 7;
+            this.gridColumn18.Width = 94;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "棰勮浜ч噺";
+            this.gridColumn19.FieldName = "daaCl";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 8;
+            this.gridColumn19.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "棰勮寮�宸ユ棩";
+            this.gridColumn20.FieldName = "mesStartProd";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 9;
+            this.gridColumn20.Width = 94;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "涓嶈壇澶囨敞";
+            this.gridColumn21.FieldName = "remark";
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 10;
+            this.gridColumn21.Width = 94;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "宸ュ簭鐐�";
+            this.gridColumn23.FieldName = "processNo";
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 11;
+            this.gridColumn23.Width = 94;
             // 
             // repositoryItemMemoEdit1
             // 
@@ -384,7 +466,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Name = "splitMx1";
+             this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             // 
             // splitMx1.Panel1
             // 
@@ -397,7 +479,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1251, 570);
-            this.splitMx1.SplitterPosition = 245;
+            this.splitMx1.SplitterPosition = 220;
             this.splitMx1.TabIndex = 1;
             // 
             // splitTop1
@@ -419,7 +501,7 @@
             this.splitTop1.Panel2.Controls.Add(this.simpleButton5);
             this.splitTop1.Panel2.Controls.Add(this.simpleButton4);
             this.splitTop1.Panel2.Controls.Add(this.simpleButton3);
-            this.splitTop1.Panel2.Controls.Add(this.progressBarControl1);
+            this.splitTop1.Panel2.Controls.Add(this.prog1);
             this.splitTop1.Panel2.Controls.Add(this.panel2);
             this.splitTop1.Panel2.Controls.Add(this.panel4);
             this.splitTop1.Panel2.Controls.Add(this.panel1);
@@ -427,23 +509,21 @@
             this.splitTop1.Panel2.Controls.Add(this.btnBad);
             this.splitTop1.Panel2.Text = "Panel2";
             this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitTop1.Size = new System.Drawing.Size(1251, 245);
+            this.splitTop1.Size = new System.Drawing.Size(1251, 220);
             this.splitTop1.SplitterPosition = 390;
             this.splitTop1.TabIndex = 0;
             // 
             // layoutMx1
             // 
-            this.layoutMx1.Controls.Add(this.textSelect3);
-            this.layoutMx1.Controls.Add(this.textSelect2);
-            this.layoutMx1.Controls.Add(this.textSelect1);
+            this.layoutMx1.Controls.Add(this.txt_badReson);
+            this.layoutMx1.Controls.Add(this.txt_remark);
+            this.layoutMx1.Controls.Add(this.txt_repairMethd);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_gdbh);
             this.layoutMx1.Controls.Add(this.txt_gx);
-            this.layoutMx1.Controls.Add(this.txt_czz);
+            this.layoutMx1.Controls.Add(this.txt_collectBy);
             this.layoutMx1.Controls.Add(this.txt_barCode);
-            this.layoutMx1.Controls.Add(this.txt_gwm);
             this.layoutMx1.Controls.Add(this.txt_itemNo);
-            this.layoutMx1.Controls.Add(this.txt_bc);
             this.layoutMx1.Controls.Add(this.txt_itemName);
             this.layoutMx1.Controls.Add(this.txt_itemModel);
             this.layoutMx1.Controls.Add(this.txt_sjXt);
@@ -456,33 +536,39 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(981, 0, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(849, 245);
+            this.layoutMx1.Size = new System.Drawing.Size(849, 220);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
-            // textSelect3
+            // txt_badReson
             // 
-            this.textSelect3.BtnTxt = "涓嶈壇鍘熷洜";
-            this.textSelect3.Location = new System.Drawing.Point(12, 180);
-            this.textSelect3.Name = "textSelect3";
-            this.textSelect3.Size = new System.Drawing.Size(410, 53);
-            this.textSelect3.TabIndex = 26;
+            this.txt_badReson.BtnTxt = "涓嶈壇鍘熷洜";
+            this.txt_badReson.Location = new System.Drawing.Point(12, 154);
+            this.txt_badReson.Name = "txt_badReson";
+            this.txt_badReson.Size = new System.Drawing.Size(410, 54);
+            this.txt_badReson.TabIndex = 26;
+            this.txt_badReson.TextTxt = "";
+            this.txt_badReson.WhereTxt = "s_type=\'鐜板満缁翠慨涓嶈壇鍘熷洜\'";
             // 
-            // textSelect2
+            // txt_remark
             // 
-            this.textSelect2.BtnTxt = "涓嶈壇鐜板儚";
-            this.textSelect2.Location = new System.Drawing.Point(12, 124);
-            this.textSelect2.Name = "textSelect2";
-            this.textSelect2.Size = new System.Drawing.Size(410, 52);
-            this.textSelect2.TabIndex = 25;
+            this.txt_remark.BtnTxt = "涓嶈壇鐜拌薄";
+            this.txt_remark.Location = new System.Drawing.Point(12, 96);
+            this.txt_remark.Name = "txt_remark";
+            this.txt_remark.Size = new System.Drawing.Size(410, 54);
+            this.txt_remark.TabIndex = 25;
+            this.txt_remark.TextTxt = "";
+            this.txt_remark.WhereTxt = "s_type=\'鐜板満缁翠慨涓嶈壇鐜拌薄\'";
             // 
-            // textSelect1
+            // txt_repairMethd
             // 
-            this.textSelect1.BtnTxt = "涓嶈壇瀵圭瓥";
-            this.textSelect1.Location = new System.Drawing.Point(426, 124);
-            this.textSelect1.Name = "textSelect1";
-            this.textSelect1.Size = new System.Drawing.Size(411, 109);
-            this.textSelect1.TabIndex = 24;
+            this.txt_repairMethd.BtnTxt = "涓嶈壇瀵圭瓥";
+            this.txt_repairMethd.Location = new System.Drawing.Point(426, 96);
+            this.txt_repairMethd.Name = "txt_repairMethd";
+            this.txt_repairMethd.Size = new System.Drawing.Size(411, 112);
+            this.txt_repairMethd.TabIndex = 24;
+            this.txt_repairMethd.TextTxt = "";
+            this.txt_repairMethd.WhereTxt = "s_type=\'鐜板満缁翠慨涓嶈壇瀵圭瓥\'";
             // 
             // lbGuid
             // 
@@ -503,38 +589,29 @@
             // 
             // txt_gx
             // 
-            this.txt_gx.Location = new System.Drawing.Point(84, 68);
+            this.txt_gx.Location = new System.Drawing.Point(498, 68);
             this.txt_gx.Name = "txt_gx";
             this.txt_gx.Properties.ReadOnly = true;
             this.txt_gx.Size = new System.Drawing.Size(131, 24);
             this.txt_gx.StyleController = this.layoutMx1;
             this.txt_gx.TabIndex = 5;
             // 
-            // txt_czz
+            // txt_collectBy
             // 
-            this.txt_czz.Location = new System.Drawing.Point(291, 12);
-            this.txt_czz.Name = "txt_czz";
-            this.txt_czz.Properties.ReadOnly = true;
-            this.txt_czz.Size = new System.Drawing.Size(131, 24);
-            this.txt_czz.StyleController = this.layoutMx1;
-            this.txt_czz.TabIndex = 6;
+            this.txt_collectBy.Location = new System.Drawing.Point(705, 68);
+            this.txt_collectBy.Name = "txt_collectBy";
+            this.txt_collectBy.Properties.ReadOnly = true;
+            this.txt_collectBy.Size = new System.Drawing.Size(132, 24);
+            this.txt_collectBy.StyleController = this.layoutMx1;
+            this.txt_collectBy.TabIndex = 6;
             // 
             // txt_barCode
             // 
-            this.txt_barCode.Location = new System.Drawing.Point(84, 96);
+            this.txt_barCode.Location = new System.Drawing.Point(84, 68);
             this.txt_barCode.Name = "txt_barCode";
             this.txt_barCode.Size = new System.Drawing.Size(338, 24);
             this.txt_barCode.StyleController = this.layoutMx1;
             this.txt_barCode.TabIndex = 7;
-            // 
-            // txt_gwm
-            // 
-            this.txt_gwm.Location = new System.Drawing.Point(705, 68);
-            this.txt_gwm.Name = "txt_gwm";
-            this.txt_gwm.Properties.ReadOnly = true;
-            this.txt_gwm.Size = new System.Drawing.Size(132, 24);
-            this.txt_gwm.StyleController = this.layoutMx1;
-            this.txt_gwm.TabIndex = 9;
             // 
             // txt_itemNo
             // 
@@ -544,15 +621,6 @@
             this.txt_itemNo.Size = new System.Drawing.Size(131, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 10;
-            // 
-            // txt_bc
-            // 
-            this.txt_bc.Location = new System.Drawing.Point(705, 12);
-            this.txt_bc.Name = "txt_bc";
-            this.txt_bc.Properties.ReadOnly = true;
-            this.txt_bc.Size = new System.Drawing.Size(132, 24);
-            this.txt_bc.StyleController = this.layoutMx1;
-            this.txt_bc.TabIndex = 11;
             // 
             // txt_itemName
             // 
@@ -574,7 +642,7 @@
             // 
             // txt_sjXt
             // 
-            this.txt_sjXt.Location = new System.Drawing.Point(498, 12);
+            this.txt_sjXt.Location = new System.Drawing.Point(291, 12);
             this.txt_sjXt.Name = "txt_sjXt";
             this.txt_sjXt.Properties.ReadOnly = true;
             this.txt_sjXt.Size = new System.Drawing.Size(131, 24);
@@ -583,7 +651,7 @@
             // 
             // txt_yjDate
             // 
-            this.txt_yjDate.Location = new System.Drawing.Point(291, 68);
+            this.txt_yjDate.Location = new System.Drawing.Point(498, 12);
             this.txt_yjDate.Name = "txt_yjDate";
             this.txt_yjDate.Properties.ReadOnly = true;
             this.txt_yjDate.Size = new System.Drawing.Size(131, 24);
@@ -592,10 +660,10 @@
             // 
             // txt_sjDate
             // 
-            this.txt_sjDate.Location = new System.Drawing.Point(498, 68);
+            this.txt_sjDate.Location = new System.Drawing.Point(705, 12);
             this.txt_sjDate.Name = "txt_sjDate";
             this.txt_sjDate.Properties.ReadOnly = true;
-            this.txt_sjDate.Size = new System.Drawing.Size(131, 24);
+            this.txt_sjDate.Size = new System.Drawing.Size(132, 24);
             this.txt_sjDate.StyleController = this.layoutMx1;
             this.txt_sjDate.TabIndex = 18;
             // 
@@ -622,13 +690,11 @@
             this.layoutControlItem7,
             this.layoutControlItem10,
             this.layoutControlItem11,
-            this.layoutControlItem14,
-            this.layoutControlItem15,
-            this.layoutControlItem6,
             this.layoutControlItem9,
-            this.layoutControlItem8,
             this.layoutControlItem2,
             this.layoutControlItem13,
+            this.layoutControlItem14,
+            this.layoutControlItem15,
             this.layoutControlItem3});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
@@ -659,8 +725,6 @@
             rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition7.Height = 100D;
             rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
@@ -668,9 +732,8 @@
             rowDefinition4,
             rowDefinition5,
             rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.Root.Size = new System.Drawing.Size(849, 245);
+            rowDefinition7});
+            this.Root.Size = new System.Drawing.Size(849, 220);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -685,37 +748,37 @@
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_barCode;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem4.Size = new System.Drawing.Size(414, 28);
             this.layoutControlItem4.Text = "鎵拷婧爜";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem18
             // 
-            this.layoutControlItem18.Control = this.textSelect1;
-            this.layoutControlItem18.Location = new System.Drawing.Point(414, 112);
+            this.layoutControlItem18.Control = this.txt_repairMethd;
+            this.layoutControlItem18.Location = new System.Drawing.Point(414, 84);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem18.OptionsTableLayoutItem.RowSpan = 4;
-            this.layoutControlItem18.Size = new System.Drawing.Size(415, 113);
+            this.layoutControlItem18.Size = new System.Drawing.Size(415, 116);
             this.layoutControlItem18.Text = "涓嶈壇瀵圭瓥";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem18.TextVisible = false;
             // 
             // layoutControlItem16
             // 
-            this.layoutControlItem16.Control = this.textSelect2;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem16.Control = this.txt_remark;
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(414, 56);
+            this.layoutControlItem16.Size = new System.Drawing.Size(414, 58);
             this.layoutControlItem16.Text = "涓嶈壇鐜板儚";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem16.TextVisible = false;
@@ -753,13 +816,46 @@
             this.layoutControlItem11.Text = "浜у搧瑙勬牸";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
             // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_badReson;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 142);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
+            this.layoutControlItem9.Size = new System.Drawing.Size(414, 58);
+            this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem9.TextVisible = false;
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_gx;
+            this.layoutControlItem2.Location = new System.Drawing.Point(414, 56);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem2.Size = new System.Drawing.Size(207, 28);
+            this.layoutControlItem2.Text = "涓婃姤宸ュ簭";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_sjXt;
+            this.layoutControlItem13.Location = new System.Drawing.Point(207, 0);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem13.Size = new System.Drawing.Size(207, 28);
+            this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_yjDate;
-            this.layoutControlItem14.Location = new System.Drawing.Point(207, 56);
+            this.layoutControlItem14.Location = new System.Drawing.Point(414, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem14.Size = new System.Drawing.Size(207, 28);
             this.layoutControlItem14.Text = "璁″垝鏃堕棿";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
@@ -767,83 +863,29 @@
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_sjDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(414, 56);
+            this.layoutControlItem15.Location = new System.Drawing.Point(621, 0);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(207, 28);
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(208, 28);
             this.layoutControlItem15.Text = "瀹為檯鏃堕棿";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_gwm;
-            this.layoutControlItem6.Location = new System.Drawing.Point(621, 56);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(208, 28);
-            this.layoutControlItem6.Text = "閫佷慨宀椾綅";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.textSelect3;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 168);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(414, 57);
-            this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem9.TextVisible = false;
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_bc;
-            this.layoutControlItem8.Location = new System.Drawing.Point(621, 0);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(208, 28);
-            this.layoutControlItem8.Text = "鐝";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_gx;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 56);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(207, 28);
-            this.layoutControlItem2.Text = "鎿嶄綔宸ュ簭";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_sjXt;
-            this.layoutControlItem13.Location = new System.Drawing.Point(414, 0);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(207, 28);
-            this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
-            // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txt_czz;
-            this.layoutControlItem3.Location = new System.Drawing.Point(207, 0);
+            this.layoutControlItem3.Control = this.txt_collectBy;
+            this.layoutControlItem3.Location = new System.Drawing.Point(621, 56);
             this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(207, 28);
-            this.layoutControlItem3.Text = "鎿嶄綔鍛樺伐";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(208, 28);
+            this.layoutControlItem3.Text = "涓婃姤鍛樺伐";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // simpleButton7
             // 
             this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton7.Appearance.Options.UseBackColor = true;
-            this.simpleButton7.Location = new System.Drawing.Point(95, 117);
+            this.simpleButton7.Location = new System.Drawing.Point(95, 109);
             this.simpleButton7.Name = "simpleButton7";
             this.simpleButton7.Size = new System.Drawing.Size(61, 43);
             this.simpleButton7.TabIndex = 10;
@@ -853,7 +895,7 @@
             // 
             this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton6.Appearance.Options.UseBackColor = true;
-            this.simpleButton6.Location = new System.Drawing.Point(317, 118);
+            this.simpleButton6.Location = new System.Drawing.Point(317, 110);
             this.simpleButton6.Name = "simpleButton6";
             this.simpleButton6.Size = new System.Drawing.Size(61, 43);
             this.simpleButton6.TabIndex = 9;
@@ -863,7 +905,7 @@
             // 
             this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton5.Appearance.Options.UseBackColor = true;
-            this.simpleButton5.Location = new System.Drawing.Point(169, 117);
+            this.simpleButton5.Location = new System.Drawing.Point(169, 109);
             this.simpleButton5.Name = "simpleButton5";
             this.simpleButton5.Size = new System.Drawing.Size(61, 43);
             this.simpleButton5.TabIndex = 8;
@@ -873,7 +915,7 @@
             // 
             this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton4.Appearance.Options.UseBackColor = true;
-            this.simpleButton4.Location = new System.Drawing.Point(243, 117);
+            this.simpleButton4.Location = new System.Drawing.Point(243, 109);
             this.simpleButton4.Name = "simpleButton4";
             this.simpleButton4.Size = new System.Drawing.Size(61, 43);
             this.simpleButton4.TabIndex = 7;
@@ -883,18 +925,19 @@
             // 
             this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton3.Appearance.Options.UseBackColor = true;
-            this.simpleButton3.Location = new System.Drawing.Point(21, 117);
+            this.simpleButton3.Location = new System.Drawing.Point(21, 109);
             this.simpleButton3.Name = "simpleButton3";
             this.simpleButton3.Size = new System.Drawing.Size(61, 43);
             this.simpleButton3.TabIndex = 6;
             this.simpleButton3.Text = "鐗╂枡";
             // 
-            // progressBarControl1
+            // prog1
             // 
-            this.progressBarControl1.Location = new System.Drawing.Point(21, 87);
-            this.progressBarControl1.Name = "progressBarControl1";
-            this.progressBarControl1.Size = new System.Drawing.Size(359, 22);
-            this.progressBarControl1.TabIndex = 5;
+            this.prog1.Location = new System.Drawing.Point(21, 79);
+            this.prog1.Name = "prog1";
+            this.prog1.Properties.ShowTitle = true;
+            this.prog1.Size = new System.Drawing.Size(359, 22);
+            this.prog1.TabIndex = 5;
             // 
             // panel2
             // 
@@ -903,13 +946,13 @@
             this.panel2.Controls.Add(this.label4);
             this.panel2.Location = new System.Drawing.Point(281, 7);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(99, 71);
+            this.panel2.Size = new System.Drawing.Size(99, 64);
             this.panel2.TabIndex = 3;
             // 
             // lbSum3
             // 
             this.lbSum3.AutoSize = true;
-            this.lbSum3.Location = new System.Drawing.Point(45, 46);
+            this.lbSum3.Location = new System.Drawing.Point(45, 37);
             this.lbSum3.Name = "lbSum3";
             this.lbSum3.Size = new System.Drawing.Size(16, 18);
             this.lbSum3.TabIndex = 1;
@@ -931,13 +974,13 @@
             this.panel4.Controls.Add(this.label8);
             this.panel4.Location = new System.Drawing.Point(151, 7);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(99, 71);
+            this.panel4.Size = new System.Drawing.Size(99, 64);
             this.panel4.TabIndex = 2;
             // 
             // lbSum2
             // 
             this.lbSum2.AutoSize = true;
-            this.lbSum2.Location = new System.Drawing.Point(45, 46);
+            this.lbSum2.Location = new System.Drawing.Point(45, 37);
             this.lbSum2.Name = "lbSum2";
             this.lbSum2.Size = new System.Drawing.Size(16, 18);
             this.lbSum2.TabIndex = 1;
@@ -959,13 +1002,13 @@
             this.panel1.Controls.Add(this.label1);
             this.panel1.Location = new System.Drawing.Point(21, 7);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(99, 71);
+            this.panel1.Size = new System.Drawing.Size(99, 64);
             this.panel1.TabIndex = 0;
             // 
             // lbSum1
             // 
             this.lbSum1.AutoSize = true;
-            this.lbSum1.Location = new System.Drawing.Point(45, 46);
+            this.lbSum1.Location = new System.Drawing.Point(45, 37);
             this.lbSum1.Name = "lbSum1";
             this.lbSum1.Size = new System.Drawing.Size(16, 18);
             this.lbSum1.TabIndex = 1;
@@ -984,9 +1027,9 @@
             // 
             this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
             this.btnGood.Appearance.Options.UseBackColor = true;
-            this.btnGood.Location = new System.Drawing.Point(21, 167);
+            this.btnGood.Location = new System.Drawing.Point(21, 159);
             this.btnGood.Name = "btnGood";
-            this.btnGood.Size = new System.Drawing.Size(166, 75);
+            this.btnGood.Size = new System.Drawing.Size(166, 58);
             this.btnGood.TabIndex = 19;
             this.btnGood.Text = "OK";
             // 
@@ -994,9 +1037,9 @@
             // 
             this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
             this.btnBad.Appearance.Options.UseBackColor = true;
-            this.btnBad.Location = new System.Drawing.Point(212, 167);
+            this.btnBad.Location = new System.Drawing.Point(212, 159);
             this.btnBad.Name = "btnBad";
-            this.btnBad.Size = new System.Drawing.Size(166, 75);
+            this.btnBad.Size = new System.Drawing.Size(166, 58);
             this.btnBad.TabIndex = 20;
             this.btnBad.Text = "NG";
             // 
@@ -1006,7 +1049,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(1251, 313);
+            this.tabMx.Size = new System.Drawing.Size(1251, 338);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1016,7 +1059,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1249, 281);
+            this.tabMxPage1.Size = new System.Drawing.Size(1249, 306);
             this.tabMxPage1.Text = "宸蹭慨鐞嗘槑缁�";
             // 
             // gcMx1
@@ -1025,7 +1068,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1249, 281);
+            this.gcMx1.Size = new System.Drawing.Size(1249, 306);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1035,18 +1078,20 @@
             this.gvMx1.Appearance.Row.Options.UseFont = true;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn12,
+            this.gridColumn24,
             this.gvMx2status,
             this.gvMx2pbillNo,
             this.gvMx2itemNo,
             this.gridColumn5,
             this.gridColumn6,
             this.gridColumn3,
-            this.gvMx2tlQty,
-            this.gridColumn2,
-            this.gridColumn4,
             this.gridColumn7,
+            this.gridColumn2,
+            this.gridColumn26,
+            this.gridColumn15,
+            this.gridColumn4,
             this.gridColumn14,
-            this.gridColumn15});
+            this.gridColumn25});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1062,6 +1107,16 @@
             this.gridColumn12.OptionsColumn.ReadOnly = true;
             this.gridColumn12.Width = 94;
             // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "浜х嚎";
+            this.gridColumn24.FieldName = "lineName";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 0;
+            this.gridColumn24.Width = 94;
+            // 
             // gvMx2status
             // 
             this.gvMx2status.AppearanceCell.Options.UseFont = true;
@@ -1072,7 +1127,7 @@
             this.gvMx2status.OptionsColumn.ReadOnly = true;
             this.gvMx2status.Tag = "query_a.status";
             this.gvMx2status.Visible = true;
-            this.gvMx2status.VisibleIndex = 0;
+            this.gvMx2status.VisibleIndex = 1;
             this.gvMx2status.Width = 71;
             // 
             // gvMx2pbillNo
@@ -1084,7 +1139,7 @@
             this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
             this.gvMx2pbillNo.Tag = "query_a.pbill_no";
             this.gvMx2pbillNo.Visible = true;
-            this.gvMx2pbillNo.VisibleIndex = 1;
+            this.gvMx2pbillNo.VisibleIndex = 2;
             this.gvMx2pbillNo.Width = 91;
             // 
             // gvMx2itemNo
@@ -1096,7 +1151,7 @@
             this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
             this.gvMx2itemNo.Tag = "query_a.item_no";
             this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 2;
+            this.gvMx2itemNo.VisibleIndex = 3;
             this.gvMx2itemNo.Width = 91;
             // 
             // gridColumn5
@@ -1106,7 +1161,7 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 3;
+            this.gridColumn5.VisibleIndex = 4;
             this.gridColumn5.Width = 91;
             // 
             // gridColumn6
@@ -1116,7 +1171,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.VisibleIndex = 5;
             this.gridColumn6.Width = 91;
             // 
             // gridColumn3
@@ -1129,74 +1184,82 @@
             this.gridColumn3.VisibleIndex = 6;
             this.gridColumn3.Width = 91;
             // 
-            // gvMx2tlQty
+            // gridColumn7
             // 
-            this.gvMx2tlQty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2tlQty.Caption = "鍗曚綅";
-            this.gvMx2tlQty.FieldName = "dwName";
-            this.gvMx2tlQty.Name = "gvMx2tlQty";
-            this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
-            this.gvMx2tlQty.Tag = "query_a.tl_qty";
-            this.gvMx2tlQty.Visible = true;
-            this.gvMx2tlQty.VisibleIndex = 5;
-            this.gvMx2tlQty.Width = 91;
+            this.gridColumn7.Caption = "淇悊鐘舵��";
+            this.gridColumn7.FieldName = "repairResult";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 7;
+            this.gridColumn7.Width = 91;
             // 
             // gridColumn2
             // 
-            this.gridColumn2.Caption = "宸ュ簭";
+            this.gridColumn2.Caption = "閫佷慨宸ュ簭";
             this.gridColumn2.FieldName = "processNo";
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 7;
+            this.gridColumn2.VisibleIndex = 8;
             this.gridColumn2.Width = 91;
             // 
-            // gridColumn4
+            // gridColumn26
             // 
-            this.gridColumn4.Caption = "澶囨敞";
-            this.gridColumn4.FieldName = "remark";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 8;
-            this.gridColumn4.Width = 91;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "缁撴灉";
-            this.gridColumn7.FieldName = "checkResult";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 9;
-            this.gridColumn7.Width = 91;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.Caption = "鍒涘缓浜�";
-            this.gridColumn14.FieldName = "createBy";
-            this.gridColumn14.MinWidth = 25;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 10;
-            this.gridColumn14.Width = 91;
+            this.gridColumn26.Caption = "閫佷慨鍛�";
+            this.gridColumn26.FieldName = "collectByName";
+            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 9;
+            this.gridColumn26.Width = 94;
             // 
             // gridColumn15
             // 
-            this.gridColumn15.Caption = "鍒涘缓鏃堕棿";
+            this.gridColumn15.Caption = "閫佷慨鏃堕棿";
             this.gridColumn15.FieldName = "createDate";
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 11;
+            this.gridColumn15.VisibleIndex = 10;
             this.gridColumn15.Width = 113;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "涓嶈壇鐜拌薄";
+            this.gridColumn4.FieldName = "remark";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 11;
+            this.gridColumn4.Width = 91;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "涓嶈壇鍘熷洜";
+            this.gridColumn14.FieldName = "badReson";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 12;
+            this.gridColumn14.Width = 94;
+            // 
+            // gridColumn25
+            // 
+            this.gridColumn25.Caption = "涓嶈壇瀵圭瓥";
+            this.gridColumn25.FieldName = "repairMethd";
+            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.Name = "gridColumn25";
+            this.gridColumn25.Visible = true;
+            this.gridColumn25.VisibleIndex = 13;
+            this.gridColumn25.Width = 94;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1249, 281);
-            this.tabMxPage2.Text = "鏈慨鐞嗘槑缁�";
+            this.tabMxPage2.Size = new System.Drawing.Size(1249, 306);
+            this.tabMxPage2.Text = "寰呬慨鐞嗘槑缁�";
             // 
             // gcMx2
             // 
@@ -1204,7 +1267,7 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1249, 281);
+            this.gcMx2.Size = new System.Drawing.Size(1249, 306);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1213,160 +1276,182 @@
             // 
             this.gvMx2.Appearance.Row.Options.UseFont = true;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1itemBarcode,
-            this.gvMx1itemNo,
             this.gridColumn8,
             this.gridColumn9,
-            this.gvMx1quantity,
             this.gridColumn10,
-            this.gvMx1depotCode,
-            this.gvMx1depotSectionCode,
-            this.gvMx1ebelnK3id,
-            this.gvMx1lineK3id,
             this.gridColumn16,
-            this.gridColumn17});
+            this.gridColumn17,
+            this.gridColumn27,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn30,
+            this.gridColumn31,
+            this.gridColumn32,
+            this.gridColumn33,
+            this.gridColumn34,
+            this.gridColumn35,
+            this.gridColumn36});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid ";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
-            // 
-            // gvMx1itemBarcode
-            // 
-            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜 ";
-            this.gvMx1itemBarcode.FieldName = "itemBarcode";
-            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
-            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx1itemBarcode.Visible = true;
-            this.gvMx1itemBarcode.VisibleIndex = 1;
-            this.gvMx1itemBarcode.Width = 94;
-            // 
-            // gvMx1itemNo
-            // 
-            this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1itemNo.Caption = "鐗╂枡缂栫爜";
-            this.gvMx1itemNo.FieldName = "itemNo";
-            this.gvMx1itemNo.Name = "gvMx1itemNo";
-            this.gvMx1itemNo.Tag = "query_a.ITEM_NO";
-            this.gvMx1itemNo.Visible = true;
-            this.gvMx1itemNo.VisibleIndex = 0;
-            this.gvMx1itemNo.Width = 94;
-            // 
             // gridColumn8
             // 
-            this.gridColumn8.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn8.FieldName = "itemName";
+            this.gridColumn8.Caption = "guid";
+            this.gridColumn8.FieldName = "guid";
+            this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 2;
+            this.gridColumn8.OptionsColumn.ReadOnly = true;
             this.gridColumn8.Width = 94;
             // 
             // gridColumn9
             // 
-            this.gridColumn9.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn9.FieldName = "itemModel";
+            this.gridColumn9.Caption = "浜х嚎";
+            this.gridColumn9.FieldName = "lineName";
+            this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 3;
+            this.gridColumn9.VisibleIndex = 0;
             this.gridColumn9.Width = 94;
-            // 
-            // gvMx1quantity
-            // 
-            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx1quantity.Caption = "鏁伴噺";
-            this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 50;
-            this.gvMx1quantity.Name = "gvMx1quantity";
-            this.gvMx1quantity.Tag = "query_a.QUANTITY";
-            this.gvMx1quantity.Visible = true;
-            this.gvMx1quantity.VisibleIndex = 4;
-            this.gvMx1quantity.Width = 94;
             // 
             // gridColumn10
             // 
-            this.gridColumn10.Caption = "鍗曚綅";
-            this.gridColumn10.FieldName = "kcUnit";
-            this.gridColumn10.MinWidth = 50;
+            this.gridColumn10.AppearanceCell.Options.UseFont = true;
+            this.gridColumn10.Caption = "宸ュ崟缂栧彿";
+            this.gridColumn10.FieldName = "gdbh";
+            this.gridColumn10.MinWidth = 10;
             this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.OptionsColumn.ReadOnly = true;
+            this.gridColumn10.Tag = "query_a.status";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 5;
-            this.gridColumn10.Width = 94;
-            // 
-            // gvMx1depotCode
-            // 
-            this.gvMx1depotCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx1depotCode.Caption = "浠撳簱缂栫爜 ";
-            this.gvMx1depotCode.FieldName = "depotCode";
-            this.gvMx1depotCode.Name = "gvMx1depotCode";
-            this.gvMx1depotCode.Tag = "query_a.DEPOT_CODE";
-            this.gvMx1depotCode.Visible = true;
-            this.gvMx1depotCode.VisibleIndex = 6;
-            this.gvMx1depotCode.Width = 94;
-            // 
-            // gvMx1depotSectionCode
-            // 
-            this.gvMx1depotSectionCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx1depotSectionCode.Caption = "璐т綅缂栫爜 ";
-            this.gvMx1depotSectionCode.FieldName = "depotSectionCode";
-            this.gvMx1depotSectionCode.Name = "gvMx1depotSectionCode";
-            this.gvMx1depotSectionCode.Tag = "query_a.DEPOT_SECTION_CODE";
-            this.gvMx1depotSectionCode.Visible = true;
-            this.gvMx1depotSectionCode.VisibleIndex = 7;
-            this.gvMx1depotSectionCode.Width = 94;
-            // 
-            // gvMx1ebelnK3id
-            // 
-            this.gvMx1ebelnK3id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1ebelnK3id.Caption = "閲囪喘璁㈠崟ID ";
-            this.gvMx1ebelnK3id.FieldName = "ebelnK3id";
-            this.gvMx1ebelnK3id.Name = "gvMx1ebelnK3id";
-            this.gvMx1ebelnK3id.Tag = "query_a.EBELN_K3ID";
-            this.gvMx1ebelnK3id.Visible = true;
-            this.gvMx1ebelnK3id.VisibleIndex = 8;
-            this.gvMx1ebelnK3id.Width = 94;
-            // 
-            // gvMx1lineK3id
-            // 
-            this.gvMx1lineK3id.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lineK3id.Caption = "閲囪喘璁㈠崟琛孖D ";
-            this.gvMx1lineK3id.FieldName = "lineK3id";
-            this.gvMx1lineK3id.Name = "gvMx1lineK3id";
-            this.gvMx1lineK3id.Tag = "query_a.LINE_K3ID";
-            this.gvMx1lineK3id.Visible = true;
-            this.gvMx1lineK3id.VisibleIndex = 9;
-            this.gvMx1lineK3id.Width = 94;
+            this.gridColumn10.VisibleIndex = 1;
+            this.gridColumn10.Width = 71;
             // 
             // gridColumn16
             // 
-            this.gridColumn16.Caption = "鍒涘缓浜�";
-            this.gridColumn16.FieldName = "createBy";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.AppearanceCell.Options.UseFont = true;
+            this.gridColumn16.Caption = "杩芥函鐮�";
+            this.gridColumn16.FieldName = "barCode";
             this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.OptionsColumn.ReadOnly = true;
+            this.gridColumn16.Tag = "query_a.pbill_no";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 10;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.VisibleIndex = 2;
+            this.gridColumn16.Width = 91;
             // 
             // gridColumn17
             // 
-            this.gridColumn17.Caption = "鍒涘缓鏃堕棿";
-            this.gridColumn17.FieldName = "createDate";
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.AppearanceCell.Options.UseFont = true;
+            this.gridColumn17.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn17.FieldName = "itemNo";
             this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.OptionsColumn.ReadOnly = true;
+            this.gridColumn17.Tag = "query_a.item_no";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 11;
-            this.gridColumn17.Width = 94;
+            this.gridColumn17.VisibleIndex = 3;
+            this.gridColumn17.Width = 91;
+            // 
+            // gridColumn27
+            // 
+            this.gridColumn27.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn27.FieldName = "itemName";
+            this.gridColumn27.Name = "gridColumn27";
+            this.gridColumn27.OptionsColumn.ReadOnly = true;
+            this.gridColumn27.Visible = true;
+            this.gridColumn27.VisibleIndex = 4;
+            this.gridColumn27.Width = 91;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn28.FieldName = "itemModel";
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.OptionsColumn.ReadOnly = true;
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 5;
+            this.gridColumn28.Width = 91;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "鏁伴噺";
+            this.gridColumn29.FieldName = "quantity";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 6;
+            this.gridColumn29.Width = 91;
+            // 
+            // gridColumn30
+            // 
+            this.gridColumn30.Caption = "淇悊鐘舵��";
+            this.gridColumn30.FieldName = "repairResult";
+            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.Name = "gridColumn30";
+            this.gridColumn30.Visible = true;
+            this.gridColumn30.VisibleIndex = 7;
+            this.gridColumn30.Width = 91;
+            // 
+            // gridColumn31
+            // 
+            this.gridColumn31.Caption = "閫佷慨宸ュ簭";
+            this.gridColumn31.FieldName = "processNo";
+            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.Name = "gridColumn31";
+            this.gridColumn31.Visible = true;
+            this.gridColumn31.VisibleIndex = 8;
+            this.gridColumn31.Width = 91;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "閫佷慨鍛�";
+            this.gridColumn32.FieldName = "collectByName";
+            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 9;
+            this.gridColumn32.Width = 94;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.Caption = "閫佷慨鏃堕棿";
+            this.gridColumn33.FieldName = "createDate";
+            this.gridColumn33.MinWidth = 25;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.Visible = true;
+            this.gridColumn33.VisibleIndex = 10;
+            this.gridColumn33.Width = 113;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "涓嶈壇鐜拌薄";
+            this.gridColumn34.FieldName = "remark";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 11;
+            this.gridColumn34.Width = 91;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "涓嶈壇鍘熷洜";
+            this.gridColumn35.FieldName = "badReson";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 12;
+            this.gridColumn35.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.Caption = "涓嶈壇瀵圭瓥";
+            this.gridColumn36.FieldName = "repairMethd";
+            this.gridColumn36.MinWidth = 25;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 13;
+            this.gridColumn36.Width = 94;
             // 
             // Frm_Repair
             // 
@@ -1406,11 +1491,9 @@
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_czz.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gwm.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_bc.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_sjXt.Properties)).EndInit();
@@ -1425,15 +1508,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.progressBarControl1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
             this.panel2.ResumeLayout(false);
             this.panel2.PerformLayout();
             this.panel4.ResumeLayout(false);
@@ -1462,7 +1543,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_userName;
         private DevExpress.XtraGrid.Columns.GridColumn gv_operationTable;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_msg;
         private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
         private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit2;
         private UserControls.Data.UcPageBar pageBar1;
@@ -1472,11 +1552,9 @@
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraEditors.TextEdit txt_gdbh;
         private DevExpress.XtraEditors.TextEdit txt_gx;
-        private DevExpress.XtraEditors.TextEdit txt_czz;
+        private DevExpress.XtraEditors.TextEdit txt_collectBy;
         private DevExpress.XtraEditors.TextEdit txt_barCode;
-        private DevExpress.XtraEditors.TextEdit txt_gwm;
         private DevExpress.XtraEditors.TextEdit txt_itemNo;
-        private DevExpress.XtraEditors.TextEdit txt_bc;
         private DevExpress.XtraEditors.TextEdit txt_itemName;
         private DevExpress.XtraEditors.TextEdit txt_itemModel;
         private DevExpress.XtraEditors.TextEdit txt_sjXt;
@@ -1492,7 +1570,7 @@
         private DevExpress.XtraEditors.SimpleButton simpleButton5;
         private DevExpress.XtraEditors.SimpleButton simpleButton4;
         private DevExpress.XtraEditors.SimpleButton simpleButton3;
-        private DevExpress.XtraEditors.ProgressBarControl progressBarControl1;
+        private DevExpress.XtraEditors.ProgressBarControl prog1;
         private System.Windows.Forms.Panel panel2;
         private System.Windows.Forms.Label lbSum3;
         private System.Windows.Forms.Label label4;
@@ -1513,45 +1591,56 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2tlQty;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
-        private DevExpress.XtraGrid.GridControl gcMx2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1depotSectionCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnK3id;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lineK3id;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private textSelect textSelect1;
+        private UcDictionary txt_repairMethd;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private textSelect textSelect3;
-        private textSelect textSelect2;
+        private UcDictionary txt_badReson;
+        private UcDictionary txt_remark;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+        private DevExpress.Utils.ToolTipController tips;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3