From d4e0269da1cc87d42918cdda6afaa005b6c47a0e Mon Sep 17 00:00:00 2001
From: lg <123456>
Date: 星期三, 19 十一月 2025 13:40:46 +0800
Subject: [PATCH] 按大类维护

---
 DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs |  602 ++++++++++++++++++++++++------------------------------
 1 files changed, 268 insertions(+), 334 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
index 2634e0d..2657df0 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -31,17 +31,17 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -62,7 +62,6 @@
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn19 = 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();
@@ -76,7 +75,7 @@
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
             this.txt_processNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_createByName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_barCode111 = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
@@ -156,6 +155,7 @@
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -185,7 +185,7 @@
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barCode111.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
@@ -235,10 +235,9 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1566, 98);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1253, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -246,11 +245,10 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
-            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1566, 736);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1253, 602);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -259,9 +257,8 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1564, 698);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1251, 570);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -270,7 +267,6 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
-            this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -283,22 +279,20 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1564, 698);
+            this.split1.Size = new System.Drawing.Size(1251, 570);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
-            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Name = "gcMain1";
             this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemMemoEdit1,
             this.repositoryItemMemoEdit2});
-            this.gcMain1.Size = new System.Drawing.Size(1564, 635);
+            this.gcMain1.Size = new System.Drawing.Size(1251, 519);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -322,7 +316,6 @@
             this.gridColumn38,
             this.gridColumn3,
             this.gridColumn19});
-            this.gridView1.DetailHeight = 428;
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -334,153 +327,140 @@
             this.gv_operationTime.AppearanceCell.Options.UseFont = true;
             this.gv_operationTime.Caption = "鐢熶骇绾垮埆";
             this.gv_operationTime.FieldName = "lineName";
-            this.gv_operationTime.MinWidth = 25;
             this.gv_operationTime.Name = "gv_operationTime";
             this.gv_operationTime.OptionsColumn.AllowEdit = false;
             this.gv_operationTime.Tag = "query_OPERATION_TIME";
             this.gv_operationTime.Visible = true;
             this.gv_operationTime.VisibleIndex = 1;
-            this.gv_operationTime.Width = 225;
+            this.gv_operationTime.Width = 180;
             // 
             // gv_userName
             // 
             this.gv_userName.AppearanceCell.Options.UseFont = true;
             this.gv_userName.Caption = "鐢熶骇鐘舵��";
             this.gv_userName.FieldName = "daaStatus";
-            this.gv_userName.MinWidth = 25;
             this.gv_userName.Name = "gv_userName";
             this.gv_userName.OptionsColumn.AllowEdit = false;
             this.gv_userName.Tag = "query_USER_NAME";
             this.gv_userName.Visible = true;
             this.gv_userName.VisibleIndex = 2;
-            this.gv_userName.Width = 117;
+            this.gv_userName.Width = 94;
             // 
             // gv_operationTable
             // 
             this.gv_operationTable.AppearanceCell.Options.UseFont = true;
             this.gv_operationTable.Caption = "宸ュ崟鍙�";
             this.gv_operationTable.FieldName = "daaNo";
-            this.gv_operationTable.MinWidth = 25;
             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 = 0;
-            this.gv_operationTable.Width = 125;
+            this.gv_operationTable.Width = 100;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "涓婃姤鏃堕棿";
             this.gridColumn1.FieldName = "createDate";
-            this.gridColumn1.MinWidth = 31;
+            this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 4;
-            this.gridColumn1.Width = 117;
+            this.gridColumn1.Width = 94;
             // 
             // gridColumn22
             // 
             this.gridColumn22.Caption = "浜у搧ID";
             this.gridColumn22.FieldName = "itemId";
-            this.gridColumn22.MinWidth = 31;
+            this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Width = 117;
+            this.gridColumn22.Width = 94;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "浜у搧缂栫爜";
             this.gridColumn11.FieldName = "itemNo";
-            this.gridColumn11.MinWidth = 31;
+            this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 6;
-            this.gridColumn11.Width = 117;
+            this.gridColumn11.Width = 94;
             // 
             // gridColumn13
             // 
             this.gridColumn13.Caption = "浜у搧鍚嶇О";
             this.gridColumn13.FieldName = "itemName";
-            this.gridColumn13.MinWidth = 31;
+            this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 7;
-            this.gridColumn13.Width = 117;
+            this.gridColumn13.Width = 94;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "浜у搧瑙勬牸";
             this.gridColumn18.FieldName = "itemModel";
-            this.gridColumn18.MinWidth = 31;
+            this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 8;
-            this.gridColumn18.Width = 117;
+            this.gridColumn18.Width = 94;
             // 
             // gridColumn20
             // 
             this.gridColumn20.Caption = "Mes棰勮寮�宸�";
             this.gridColumn20.FieldName = "mesStartProd";
-            this.gridColumn20.MinWidth = 31;
+            this.gridColumn20.MinWidth = 25;
             this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Width = 117;
+            this.gridColumn20.Width = 94;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "涓嶈壇鎻忚堪";
             this.gridColumn21.FieldName = "badDescription";
-            this.gridColumn21.MinWidth = 31;
+            this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 5;
-            this.gridColumn21.Width = 117;
+            this.gridColumn21.Width = 94;
             // 
             // gridColumn23
             // 
             this.gridColumn23.Caption = "涓婃姤宸ュ簭";
             this.gridColumn23.FieldName = "processNo";
-            this.gridColumn23.MinWidth = 31;
+            this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
             this.gridColumn23.VisibleIndex = 3;
-            this.gridColumn23.Width = 117;
+            this.gridColumn23.Width = 94;
             // 
             // gridColumn37
             // 
             this.gridColumn37.Caption = "杩芥函鐮�";
             this.gridColumn37.FieldName = "barCode";
-            this.gridColumn37.MinWidth = 31;
+            this.gridColumn37.MinWidth = 25;
             this.gridColumn37.Name = "gridColumn37";
             this.gridColumn37.Visible = true;
             this.gridColumn37.VisibleIndex = 9;
-            this.gridColumn37.Width = 117;
+            this.gridColumn37.Width = 94;
             // 
             // gridColumn38
             // 
             this.gridColumn38.Caption = "涓婚敭Guid";
             this.gridColumn38.FieldName = "guid";
-            this.gridColumn38.MinWidth = 31;
+            this.gridColumn38.MinWidth = 25;
             this.gridColumn38.Name = "gridColumn38";
-            this.gridColumn38.Width = 117;
+            this.gridColumn38.Width = 94;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "淇悊鐘舵��";
             this.gridColumn3.FieldName = "repairResult";
-            this.gridColumn3.MinWidth = 31;
+            this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 10;
-            this.gridColumn3.Width = 117;
-            // 
-            // gridColumn19
-            // 
-            this.gridColumn19.Caption = "鐢熶骇缁勭粐";
-            this.gridColumn19.FieldName = "fSubsidiary";
-            this.gridColumn19.MinWidth = 31;
-            this.gridColumn19.Name = "gridColumn19";
-            this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 11;
-            this.gridColumn19.Width = 117;
+            this.gridColumn3.Width = 94;
             // 
             // repositoryItemMemoEdit1
             // 
@@ -494,20 +474,19 @@
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 635);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
+            this.pageBar1.Location = new System.Drawing.Point(0, 519);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1564, 48);
+            this.pageBar1.Size = new System.Drawing.Size(1251, 39);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1564, 698);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1251, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -515,7 +494,6 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -528,8 +506,8 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1564, 698);
-            this.splitMx1.SplitterPosition = 318;
+            this.splitMx1.Size = new System.Drawing.Size(1251, 570);
+            this.splitMx1.SplitterPosition = 260;
             this.splitMx1.TabIndex = 1;
             // 
             // splitTop1
@@ -537,7 +515,6 @@
             this.splitTop1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitTop1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.splitTop1.Location = new System.Drawing.Point(0, 0);
-            this.splitTop1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.splitTop1.Name = "splitTop1";
             // 
             // splitTop1.Panel1
@@ -551,8 +528,8 @@
             this.splitTop1.Panel2.Controls.Add(this.panel3);
             this.splitTop1.Panel2.Text = "Panel2";
             this.splitTop1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitTop1.Size = new System.Drawing.Size(1564, 318);
-            this.splitTop1.SplitterPosition = 487;
+            this.splitTop1.Size = new System.Drawing.Size(1251, 260);
+            this.splitTop1.SplitterPosition = 390;
             this.splitTop1.TabIndex = 0;
             // 
             // layoutMx1
@@ -563,7 +540,7 @@
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_gdbh);
             this.layoutMx1.Controls.Add(this.txt_processNo);
-            this.layoutMx1.Controls.Add(this.txt_createByName);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
             this.layoutMx1.Controls.Add(this.txt_barCode111);
             this.layoutMx1.Controls.Add(this.txt_itemNo);
             this.layoutMx1.Controls.Add(this.txt_itemName);
@@ -576,21 +553,19 @@
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem5});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(699, 264, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1062, 318);
+            this.layoutMx1.Size = new System.Drawing.Size(849, 260);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // txt_repairReson
             // 
             this.txt_repairReson.BtnTxt = "涓嶈壇鍘熷洜";
-            this.txt_repairReson.Location = new System.Drawing.Point(14, 224);
-            this.txt_repairReson.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txt_repairReson.Location = new System.Drawing.Point(12, 182);
             this.txt_repairReson.Name = "txt_repairReson";
-            this.txt_repairReson.Size = new System.Drawing.Size(514, 80);
+            this.txt_repairReson.Size = new System.Drawing.Size(410, 66);
             this.txt_repairReson.TabIndex = 26;
             this.txt_repairReson.TextTxt = "";
             this.txt_repairReson.WhereTxt = " a.s_type=\'宸ュ簭涓嶈壇鍘熷洜\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -598,10 +573,9 @@
             // txt_badDescription
             // 
             this.txt_badDescription.BtnTxt = "涓嶈壇鎻忚堪";
-            this.txt_badDescription.Location = new System.Drawing.Point(14, 140);
-            this.txt_badDescription.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txt_badDescription.Location = new System.Drawing.Point(12, 114);
             this.txt_badDescription.Name = "txt_badDescription";
-            this.txt_badDescription.Size = new System.Drawing.Size(514, 80);
+            this.txt_badDescription.Size = new System.Drawing.Size(410, 64);
             this.txt_badDescription.TabIndex = 25;
             this.txt_badDescription.TextTxt = "";
             this.txt_badDescription.WhereTxt = "s_type=\'鐜板満缁翠慨涓嶈壇鐜拌薄\'";
@@ -609,133 +583,120 @@
             // txt_repairMethd
             // 
             this.txt_repairMethd.BtnTxt = "涓嶈壇瀵圭瓥";
-            this.txt_repairMethd.Location = new System.Drawing.Point(532, 182);
-            this.txt_repairMethd.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
+            this.txt_repairMethd.Location = new System.Drawing.Point(426, 148);
             this.txt_repairMethd.Name = "txt_repairMethd";
-            this.txt_repairMethd.Size = new System.Drawing.Size(516, 122);
+            this.txt_repairMethd.Size = new System.Drawing.Size(411, 100);
             this.txt_repairMethd.TabIndex = 24;
             this.txt_repairMethd.TextTxt = "";
             this.txt_repairMethd.WhereTxt = " a.s_type=\'宸ュ簭涓嶈壇瀵圭瓥\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(15, 244);
-            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbGuid.Location = new System.Drawing.Point(12, 200);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(186, 53);
+            this.lbGuid.Size = new System.Drawing.Size(149, 43);
             this.lbGuid.TabIndex = 21;
             this.lbGuid.Text = "lbGuid";
             // 
             // txt_gdbh
             // 
-            this.txt_gdbh.Location = new System.Drawing.Point(119, 98);
-            this.txt_gdbh.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_gdbh.Location = new System.Drawing.Point(99, 80);
             this.txt_gdbh.Name = "txt_gdbh";
             this.txt_gdbh.Properties.ReadOnly = true;
-            this.txt_gdbh.Size = new System.Drawing.Size(150, 28);
+            this.txt_gdbh.Size = new System.Drawing.Size(116, 24);
             this.txt_gdbh.StyleController = this.layoutMx1;
             this.txt_gdbh.TabIndex = 4;
             // 
             // txt_processNo
             // 
-            this.txt_processNo.Location = new System.Drawing.Point(637, 140);
-            this.txt_processNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_processNo.Location = new System.Drawing.Point(513, 114);
             this.txt_processNo.Name = "txt_processNo";
             this.txt_processNo.Properties.ReadOnly = true;
-            this.txt_processNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_processNo.Size = new System.Drawing.Size(116, 24);
             this.txt_processNo.StyleController = this.layoutMx1;
             this.txt_processNo.TabIndex = 5;
             // 
-            // txt_createByName
+            // txt_createBy
             // 
-            this.txt_createByName.Location = new System.Drawing.Point(896, 140);
-            this.txt_createByName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
-            this.txt_createByName.Name = "txt_createByName";
-            this.txt_createByName.Properties.ReadOnly = true;
-            this.txt_createByName.Size = new System.Drawing.Size(152, 28);
-            this.txt_createByName.StyleController = this.layoutMx1;
-            this.txt_createByName.TabIndex = 6;
+            this.txt_createBy.Location = new System.Drawing.Point(720, 114);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.ReadOnly = true;
+            this.txt_createBy.Size = new System.Drawing.Size(117, 24);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 6;
             // 
             // txt_barCode111
             // 
-            this.txt_barCode111.Location = new System.Drawing.Point(119, 14);
-            this.txt_barCode111.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_barCode111.Location = new System.Drawing.Point(99, 12);
             this.txt_barCode111.Name = "txt_barCode111";
             this.txt_barCode111.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 12F, System.Drawing.FontStyle.Bold);
             this.txt_barCode111.Properties.Appearance.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
             this.txt_barCode111.Properties.Appearance.Options.UseFont = true;
             this.txt_barCode111.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_barCode111.Size = new System.Drawing.Size(409, 36);
+            this.txt_barCode111.Size = new System.Drawing.Size(323, 30);
             this.txt_barCode111.StyleController = this.layoutMx1;
             this.txt_barCode111.TabIndex = 7;
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(637, 56);
-            this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_itemNo.Location = new System.Drawing.Point(513, 46);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.ReadOnly = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_itemNo.Size = new System.Drawing.Size(116, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 10;
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(896, 56);
-            this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_itemName.Location = new System.Drawing.Point(720, 46);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.ReadOnly = true;
-            this.txt_itemName.Size = new System.Drawing.Size(152, 28);
+            this.txt_itemName.Size = new System.Drawing.Size(117, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 13;
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(637, 98);
-            this.txt_itemModel.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_itemModel.Location = new System.Drawing.Point(513, 80);
             this.txt_itemModel.Name = "txt_itemModel";
             this.txt_itemModel.Properties.ReadOnly = true;
-            this.txt_itemModel.Size = new System.Drawing.Size(411, 28);
+            this.txt_itemModel.Size = new System.Drawing.Size(324, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 14;
             // 
             // txt_sjXt
             // 
-            this.txt_sjXt.Location = new System.Drawing.Point(378, 98);
-            this.txt_sjXt.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_sjXt.Location = new System.Drawing.Point(306, 80);
             this.txt_sjXt.Name = "txt_sjXt";
             this.txt_sjXt.Properties.ReadOnly = true;
-            this.txt_sjXt.Size = new System.Drawing.Size(150, 28);
+            this.txt_sjXt.Size = new System.Drawing.Size(116, 24);
             this.txt_sjXt.StyleController = this.layoutMx1;
             this.txt_sjXt.TabIndex = 16;
             // 
             // txt_yjDate
             // 
-            this.txt_yjDate.Location = new System.Drawing.Point(637, 14);
-            this.txt_yjDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_yjDate.Location = new System.Drawing.Point(513, 12);
             this.txt_yjDate.Name = "txt_yjDate";
             this.txt_yjDate.Properties.ReadOnly = true;
-            this.txt_yjDate.Size = new System.Drawing.Size(150, 28);
+            this.txt_yjDate.Size = new System.Drawing.Size(116, 24);
             this.txt_yjDate.StyleController = this.layoutMx1;
             this.txt_yjDate.TabIndex = 17;
             // 
             // txt_sjDate
             // 
-            this.txt_sjDate.Location = new System.Drawing.Point(896, 14);
-            this.txt_sjDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_sjDate.Location = new System.Drawing.Point(720, 12);
             this.txt_sjDate.Name = "txt_sjDate";
             this.txt_sjDate.Properties.ReadOnly = true;
-            this.txt_sjDate.Size = new System.Drawing.Size(152, 28);
+            this.txt_sjDate.Size = new System.Drawing.Size(117, 24);
             this.txt_sjDate.StyleController = this.layoutMx1;
             this.txt_sjDate.TabIndex = 18;
             // 
             // txt_barCode
             // 
-            this.txt_barCode.Location = new System.Drawing.Point(119, 56);
-            this.txt_barCode.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_barCode.Location = new System.Drawing.Point(99, 46);
             this.txt_barCode.Name = "txt_barCode";
             this.txt_barCode.Properties.ReadOnly = true;
-            this.txt_barCode.Size = new System.Drawing.Size(409, 28);
+            this.txt_barCode.Size = new System.Drawing.Size(323, 24);
             this.txt_barCode.StyleController = this.layoutMx1;
             this.txt_barCode.TabIndex = 27;
             // 
@@ -771,63 +732,63 @@
             this.layoutControlItem10});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition8,
-            rowDefinition9,
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14});
-            this.Root.Size = new System.Drawing.Size(1062, 318);
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6,
+            rowDefinition7});
+            this.Root.Size = new System.Drawing.Size(849, 260);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_yjDate;
-            this.layoutControlItem14.Location = new System.Drawing.Point(518, 0);
+            this.layoutControlItem14.Location = new System.Drawing.Point(414, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(259, 42);
+            this.layoutControlItem14.Size = new System.Drawing.Size(207, 34);
             this.layoutControlItem14.Text = "璁″垝鏃堕棿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_sjDate;
-            this.layoutControlItem15.Location = new System.Drawing.Point(777, 0);
+            this.layoutControlItem15.Location = new System.Drawing.Point(621, 0);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(261, 42);
+            this.layoutControlItem15.Size = new System.Drawing.Size(208, 34);
             this.layoutControlItem15.Text = "瀹為檯鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem4
             // 
@@ -835,19 +796,19 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(518, 42);
+            this.layoutControlItem4.Size = new System.Drawing.Size(414, 34);
             this.layoutControlItem4.Text = "鎵拷婧爜";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_repairReson;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 210);
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 170);
             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(518, 84);
+            this.layoutControlItem9.Size = new System.Drawing.Size(414, 70);
             this.layoutControlItem9.Text = "涓嶈壇鍘熷洜";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem9.TextVisible = false;
@@ -855,66 +816,66 @@
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txt_gdbh;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 68);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem1.Size = new System.Drawing.Size(259, 42);
+            this.layoutControlItem1.Size = new System.Drawing.Size(207, 34);
             this.layoutControlItem1.Text = "宸ュ崟缂栧彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_sjXt;
-            this.layoutControlItem13.Location = new System.Drawing.Point(259, 84);
+            this.layoutControlItem13.Location = new System.Drawing.Point(207, 68);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(259, 42);
+            this.layoutControlItem13.Size = new System.Drawing.Size(207, 34);
             this.layoutControlItem13.Text = "鐢熶骇绾垮埆";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_processNo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(518, 126);
+            this.layoutControlItem2.Location = new System.Drawing.Point(414, 102);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem2.Size = new System.Drawing.Size(259, 42);
+            this.layoutControlItem2.Size = new System.Drawing.Size(207, 34);
             this.layoutControlItem2.Text = "涓婃姤宸ュ簭";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem3
             // 
-            this.layoutControlItem3.Control = this.txt_createByName;
-            this.layoutControlItem3.Location = new System.Drawing.Point(777, 126);
+            this.layoutControlItem3.Control = this.txt_createBy;
+            this.layoutControlItem3.Location = new System.Drawing.Point(621, 102);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem3.Size = new System.Drawing.Size(261, 42);
+            this.layoutControlItem3.Size = new System.Drawing.Size(208, 34);
             this.layoutControlItem3.Text = "涓婃姤鍛樺伐";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_barCode;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 42);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 34);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(518, 42);
+            this.layoutControlItem6.Size = new System.Drawing.Size(414, 34);
             this.layoutControlItem6.Text = "褰撳墠杩芥函鐮�";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_badDescription;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 126);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 102);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowSpan = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(518, 84);
+            this.layoutControlItem16.Size = new System.Drawing.Size(414, 68);
             this.layoutControlItem16.Text = "涓嶈壇鎻忚堪";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem16.TextVisible = false;
@@ -922,13 +883,13 @@
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_repairMethd;
-            this.layoutControlItem18.Location = new System.Drawing.Point(518, 168);
+            this.layoutControlItem18.Location = new System.Drawing.Point(414, 136);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem18.OptionsTableLayoutItem.RowSpan = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(520, 126);
+            this.layoutControlItem18.Size = new System.Drawing.Size(415, 104);
             this.layoutControlItem18.Text = "涓嶈壇瀵圭瓥";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem18.TextVisible = false;
@@ -936,36 +897,36 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_itemModel;
-            this.layoutControlItem11.Location = new System.Drawing.Point(518, 84);
+            this.layoutControlItem11.Location = new System.Drawing.Point(414, 68);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(520, 42);
+            this.layoutControlItem11.Size = new System.Drawing.Size(415, 34);
             this.layoutControlItem11.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_itemNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(518, 42);
+            this.layoutControlItem7.Location = new System.Drawing.Point(414, 34);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(259, 42);
+            this.layoutControlItem7.Size = new System.Drawing.Size(207, 34);
             this.layoutControlItem7.Text = "浜у搧缂栫爜";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_itemName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(777, 42);
+            this.layoutControlItem10.Location = new System.Drawing.Point(621, 34);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(261, 42);
+            this.layoutControlItem10.Size = new System.Drawing.Size(208, 34);
             this.layoutControlItem10.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
             // 
             // panel5
             // 
@@ -975,9 +936,8 @@
             this.panel5.Controls.Add(this.panel2);
             this.panel5.Dock = System.Windows.Forms.DockStyle.Top;
             this.panel5.Location = new System.Drawing.Point(0, 0);
-            this.panel5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.panel5.Name = "panel5";
-            this.panel5.Size = new System.Drawing.Size(487, 143);
+            this.panel5.Size = new System.Drawing.Size(390, 117);
             this.panel5.TabIndex = 22;
             // 
             // panel1
@@ -985,29 +945,26 @@
             this.panel1.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
             this.panel1.Controls.Add(this.lbSum1);
             this.panel1.Controls.Add(this.label1);
-            this.panel1.Location = new System.Drawing.Point(4, 4);
-            this.panel1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel1.Location = new System.Drawing.Point(3, 3);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(124, 95);
+            this.panel1.Size = new System.Drawing.Size(99, 78);
             this.panel1.TabIndex = 0;
             // 
             // lbSum1
             // 
             this.lbSum1.AutoSize = true;
-            this.lbSum1.Location = new System.Drawing.Point(56, 54);
-            this.lbSum1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbSum1.Location = new System.Drawing.Point(45, 44);
             this.lbSum1.Name = "lbSum1";
-            this.lbSum1.Size = new System.Drawing.Size(20, 22);
+            this.lbSum1.Size = new System.Drawing.Size(16, 18);
             this.lbSum1.TabIndex = 1;
             this.lbSum1.Text = "0";
             // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(22, 18);
-            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label1.Location = new System.Drawing.Point(18, 15);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(82, 22);
+            this.label1.Size = new System.Drawing.Size(68, 18);
             this.label1.TabIndex = 0;
             this.label1.Text = "宸ュ崟鏁伴噺";
             // 
@@ -1016,39 +973,35 @@
             this.panel4.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
             this.panel4.Controls.Add(this.lbSum2);
             this.panel4.Controls.Add(this.label8);
-            this.panel4.Location = new System.Drawing.Point(166, 4);
-            this.panel4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel4.Location = new System.Drawing.Point(133, 3);
             this.panel4.Name = "panel4";
-            this.panel4.Size = new System.Drawing.Size(124, 95);
+            this.panel4.Size = new System.Drawing.Size(99, 78);
             this.panel4.TabIndex = 2;
             // 
             // lbSum2
             // 
             this.lbSum2.AutoSize = true;
-            this.lbSum2.Location = new System.Drawing.Point(56, 54);
-            this.lbSum2.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbSum2.Location = new System.Drawing.Point(45, 44);
             this.lbSum2.Name = "lbSum2";
-            this.lbSum2.Size = new System.Drawing.Size(20, 22);
+            this.lbSum2.Size = new System.Drawing.Size(16, 18);
             this.lbSum2.TabIndex = 1;
             this.lbSum2.Text = "0";
             // 
             // label8
             // 
             this.label8.AutoSize = true;
-            this.label8.Location = new System.Drawing.Point(22, 18);
-            this.label8.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label8.Location = new System.Drawing.Point(18, 15);
             this.label8.Name = "label8";
-            this.label8.Size = new System.Drawing.Size(64, 22);
+            this.label8.Size = new System.Drawing.Size(53, 18);
             this.label8.TabIndex = 0;
             this.label8.Text = "寰呬慨鐞�";
             // 
             // prog1
             // 
-            this.prog1.Location = new System.Drawing.Point(4, 106);
-            this.prog1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.prog1.Location = new System.Drawing.Point(3, 87);
             this.prog1.Name = "prog1";
             this.prog1.Properties.ShowTitle = true;
-            this.prog1.Size = new System.Drawing.Size(449, 27);
+            this.prog1.Size = new System.Drawing.Size(359, 22);
             this.prog1.TabIndex = 5;
             // 
             // panel2
@@ -1056,29 +1009,26 @@
             this.panel2.BackColor = System.Drawing.SystemColors.GradientInactiveCaption;
             this.panel2.Controls.Add(this.lbSum3);
             this.panel2.Controls.Add(this.label4);
-            this.panel2.Location = new System.Drawing.Point(329, 4);
-            this.panel2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel2.Location = new System.Drawing.Point(263, 3);
             this.panel2.Name = "panel2";
-            this.panel2.Size = new System.Drawing.Size(124, 95);
+            this.panel2.Size = new System.Drawing.Size(99, 78);
             this.panel2.TabIndex = 3;
             // 
             // lbSum3
             // 
             this.lbSum3.AutoSize = true;
-            this.lbSum3.Location = new System.Drawing.Point(56, 54);
-            this.lbSum3.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.lbSum3.Location = new System.Drawing.Point(45, 44);
             this.lbSum3.Name = "lbSum3";
-            this.lbSum3.Size = new System.Drawing.Size(20, 22);
+            this.lbSum3.Size = new System.Drawing.Size(16, 18);
             this.lbSum3.TabIndex = 1;
             this.lbSum3.Text = "0";
             // 
             // label4
             // 
             this.label4.AutoSize = true;
-            this.label4.Location = new System.Drawing.Point(22, 18);
-            this.label4.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
+            this.label4.Location = new System.Drawing.Point(18, 15);
             this.label4.Name = "label4";
-            this.label4.Size = new System.Drawing.Size(64, 22);
+            this.label4.Size = new System.Drawing.Size(53, 18);
             this.label4.TabIndex = 0;
             this.label4.Text = "宸蹭慨鐞�";
             // 
@@ -1092,20 +1042,18 @@
             this.panel3.Controls.Add(this.simpleButton3);
             this.panel3.Controls.Add(this.simpleButton4);
             this.panel3.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.panel3.Location = new System.Drawing.Point(0, 151);
-            this.panel3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.panel3.Location = new System.Drawing.Point(0, 123);
             this.panel3.Name = "panel3";
-            this.panel3.Size = new System.Drawing.Size(487, 167);
+            this.panel3.Size = new System.Drawing.Size(390, 137);
             this.panel3.TabIndex = 21;
             // 
             // simpleButton7
             // 
             this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton7.Appearance.Options.UseBackColor = true;
-            this.simpleButton7.Location = new System.Drawing.Point(101, 5);
-            this.simpleButton7.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.simpleButton7.Location = new System.Drawing.Point(81, 4);
             this.simpleButton7.Name = "simpleButton7";
-            this.simpleButton7.Size = new System.Drawing.Size(76, 53);
+            this.simpleButton7.Size = new System.Drawing.Size(61, 43);
             this.simpleButton7.TabIndex = 10;
             this.simpleButton7.Text = "璁惧";
             // 
@@ -1113,10 +1061,9 @@
             // 
             this.btnBad.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
             this.btnBad.Appearance.Options.UseBackColor = true;
-            this.btnBad.Location = new System.Drawing.Point(248, 72);
-            this.btnBad.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnBad.Location = new System.Drawing.Point(198, 59);
             this.btnBad.Name = "btnBad";
-            this.btnBad.Size = new System.Drawing.Size(208, 86);
+            this.btnBad.Size = new System.Drawing.Size(166, 70);
             this.btnBad.TabIndex = 20;
             this.btnBad.Text = "NG";
             // 
@@ -1124,10 +1071,9 @@
             // 
             this.simpleButton6.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton6.Appearance.Options.UseBackColor = true;
-            this.simpleButton6.Location = new System.Drawing.Point(379, 6);
-            this.simpleButton6.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.simpleButton6.Location = new System.Drawing.Point(303, 5);
             this.simpleButton6.Name = "simpleButton6";
-            this.simpleButton6.Size = new System.Drawing.Size(76, 53);
+            this.simpleButton6.Size = new System.Drawing.Size(61, 43);
             this.simpleButton6.TabIndex = 9;
             this.simpleButton6.Text = "鍙栨秷";
             // 
@@ -1135,10 +1081,9 @@
             // 
             this.btnGood.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
             this.btnGood.Appearance.Options.UseBackColor = true;
-            this.btnGood.Location = new System.Drawing.Point(9, 72);
-            this.btnGood.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.btnGood.Location = new System.Drawing.Point(7, 59);
             this.btnGood.Name = "btnGood";
-            this.btnGood.Size = new System.Drawing.Size(208, 86);
+            this.btnGood.Size = new System.Drawing.Size(166, 70);
             this.btnGood.TabIndex = 19;
             this.btnGood.Text = "OK";
             // 
@@ -1146,10 +1091,9 @@
             // 
             this.simpleButton5.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton5.Appearance.Options.UseBackColor = true;
-            this.simpleButton5.Location = new System.Drawing.Point(194, 5);
-            this.simpleButton5.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.simpleButton5.Location = new System.Drawing.Point(155, 4);
             this.simpleButton5.Name = "simpleButton5";
-            this.simpleButton5.Size = new System.Drawing.Size(76, 53);
+            this.simpleButton5.Size = new System.Drawing.Size(61, 43);
             this.simpleButton5.TabIndex = 8;
             this.simpleButton5.Text = "鍝佽川";
             // 
@@ -1157,10 +1101,9 @@
             // 
             this.simpleButton3.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton3.Appearance.Options.UseBackColor = true;
-            this.simpleButton3.Location = new System.Drawing.Point(9, 5);
-            this.simpleButton3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.simpleButton3.Location = new System.Drawing.Point(7, 4);
             this.simpleButton3.Name = "simpleButton3";
-            this.simpleButton3.Size = new System.Drawing.Size(76, 53);
+            this.simpleButton3.Size = new System.Drawing.Size(61, 43);
             this.simpleButton3.TabIndex = 6;
             this.simpleButton3.Text = "鐗╂枡";
             // 
@@ -1168,10 +1111,9 @@
             // 
             this.simpleButton4.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
             this.simpleButton4.Appearance.Options.UseBackColor = true;
-            this.simpleButton4.Location = new System.Drawing.Point(286, 5);
-            this.simpleButton4.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.simpleButton4.Location = new System.Drawing.Point(229, 4);
             this.simpleButton4.Name = "simpleButton4";
-            this.simpleButton4.Size = new System.Drawing.Size(76, 53);
+            this.simpleButton4.Size = new System.Drawing.Size(61, 43);
             this.simpleButton4.TabIndex = 7;
             this.simpleButton4.Text = "鍏跺畠";
             // 
@@ -1179,10 +1121,9 @@
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
-            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage2;
-            this.tabMx.Size = new System.Drawing.Size(1564, 365);
+            this.tabMx.Size = new System.Drawing.Size(1251, 298);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1191,20 +1132,17 @@
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1562, 327);
+            this.tabMxPage2.Size = new System.Drawing.Size(1249, 266);
             this.tabMxPage2.Text = "寰呬慨鐞嗘槑缁�";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1562, 327);
+            this.gcMx2.Size = new System.Drawing.Size(1249, 266);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1227,7 +1165,6 @@
             this.gridColumn34,
             this.gridColumn35,
             this.gridColumn36});
-            this.gvMx2.DetailHeight = 428;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1238,81 +1175,77 @@
             // 
             this.gridColumn8.Caption = "guid";
             this.gridColumn8.FieldName = "guid";
-            this.gridColumn8.MinWidth = 31;
+            this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.OptionsColumn.ReadOnly = true;
-            this.gridColumn8.Width = 117;
+            this.gridColumn8.Width = 94;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "浜х嚎";
             this.gridColumn9.FieldName = "lineName";
-            this.gridColumn9.MinWidth = 31;
+            this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 0;
-            this.gridColumn9.Width = 117;
+            this.gridColumn9.Width = 94;
             // 
             // gridColumn10
             // 
             this.gridColumn10.AppearanceCell.Options.UseFont = true;
             this.gridColumn10.Caption = "宸ュ崟缂栧彿";
             this.gridColumn10.FieldName = "gdbh";
-            this.gridColumn10.MinWidth = 12;
+            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 = 1;
-            this.gridColumn10.Width = 89;
+            this.gridColumn10.Width = 71;
             // 
             // gridColumn16
             // 
             this.gridColumn16.AppearanceCell.Options.UseFont = true;
             this.gridColumn16.Caption = "杩芥函鐮�";
             this.gridColumn16.FieldName = "barCode";
-            this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.OptionsColumn.ReadOnly = true;
             this.gridColumn16.Tag = "query_a.pbill_no";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 2;
-            this.gridColumn16.Width = 114;
+            this.gridColumn16.Width = 91;
             // 
             // gridColumn17
             // 
             this.gridColumn17.AppearanceCell.Options.UseFont = true;
             this.gridColumn17.Caption = "鐗╂枡缂栫爜";
             this.gridColumn17.FieldName = "itemNo";
-            this.gridColumn17.MinWidth = 25;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.OptionsColumn.ReadOnly = true;
             this.gridColumn17.Tag = "query_a.item_no";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 3;
-            this.gridColumn17.Width = 114;
+            this.gridColumn17.Width = 91;
             // 
             // gridColumn27
             // 
             this.gridColumn27.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn27.FieldName = "itemName";
-            this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.OptionsColumn.ReadOnly = true;
             this.gridColumn27.Visible = true;
             this.gridColumn27.VisibleIndex = 4;
-            this.gridColumn27.Width = 114;
+            this.gridColumn27.Width = 91;
             // 
             // gridColumn28
             // 
             this.gridColumn28.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn28.FieldName = "itemModel";
-            this.gridColumn28.MinWidth = 25;
             this.gridColumn28.Name = "gridColumn28";
             this.gridColumn28.OptionsColumn.ReadOnly = true;
             this.gridColumn28.Visible = true;
             this.gridColumn28.VisibleIndex = 5;
-            this.gridColumn28.Width = 114;
+            this.gridColumn28.Width = 91;
             // 
             // gridColumn30
             // 
@@ -1322,89 +1255,86 @@
             this.gridColumn30.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn30.Caption = "淇悊鐘舵��";
             this.gridColumn30.FieldName = "repairResult";
-            this.gridColumn30.MinWidth = 31;
+            this.gridColumn30.MinWidth = 25;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
             this.gridColumn30.VisibleIndex = 6;
-            this.gridColumn30.Width = 114;
+            this.gridColumn30.Width = 91;
             // 
             // gridColumn31
             // 
             this.gridColumn31.Caption = "閫佷慨宸ュ簭";
             this.gridColumn31.FieldName = "processNo";
-            this.gridColumn31.MinWidth = 31;
+            this.gridColumn31.MinWidth = 25;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 7;
-            this.gridColumn31.Width = 114;
+            this.gridColumn31.Width = 91;
             // 
             // gridColumn32
             // 
             this.gridColumn32.Caption = "閫佷慨鍛�";
             this.gridColumn32.FieldName = "collectByName";
-            this.gridColumn32.MinWidth = 31;
+            this.gridColumn32.MinWidth = 25;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
             this.gridColumn32.VisibleIndex = 8;
-            this.gridColumn32.Width = 117;
+            this.gridColumn32.Width = 94;
             // 
             // gridColumn33
             // 
             this.gridColumn33.Caption = "閫佷慨鏃堕棿";
             this.gridColumn33.FieldName = "createDate";
-            this.gridColumn33.MinWidth = 31;
+            this.gridColumn33.MinWidth = 25;
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.Visible = true;
             this.gridColumn33.VisibleIndex = 9;
-            this.gridColumn33.Width = 141;
+            this.gridColumn33.Width = 113;
             // 
             // gridColumn34
             // 
             this.gridColumn34.Caption = "涓嶈壇鐜拌薄";
             this.gridColumn34.FieldName = "badDescription";
-            this.gridColumn34.MinWidth = 31;
+            this.gridColumn34.MinWidth = 25;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.Visible = true;
             this.gridColumn34.VisibleIndex = 10;
-            this.gridColumn34.Width = 114;
+            this.gridColumn34.Width = 91;
             // 
             // gridColumn35
             // 
             this.gridColumn35.Caption = "涓嶈壇鍘熷洜";
             this.gridColumn35.FieldName = "badReson";
-            this.gridColumn35.MinWidth = 31;
+            this.gridColumn35.MinWidth = 25;
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.Visible = true;
             this.gridColumn35.VisibleIndex = 11;
-            this.gridColumn35.Width = 117;
+            this.gridColumn35.Width = 94;
             // 
             // gridColumn36
             // 
             this.gridColumn36.Caption = "涓嶈壇瀵圭瓥";
             this.gridColumn36.FieldName = "repairMethd";
-            this.gridColumn36.MinWidth = 31;
+            this.gridColumn36.MinWidth = 25;
             this.gridColumn36.Name = "gridColumn36";
             this.gridColumn36.Visible = true;
             this.gridColumn36.VisibleIndex = 12;
-            this.gridColumn36.Width = 117;
+            this.gridColumn36.Width = 94;
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
-            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1562, 327);
+            this.tabMxPage1.Size = new System.Drawing.Size(1249, 266);
             this.tabMxPage1.Text = "宸蹭慨鐞嗘槑缁�";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1562, 327);
+            this.gcMx1.Size = new System.Drawing.Size(1249, 266);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1427,7 +1357,6 @@
             this.gridColumn4,
             this.gridColumn14,
             this.gridColumn25});
-            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1438,81 +1367,77 @@
             // 
             this.gridColumn12.Caption = "guid";
             this.gridColumn12.FieldName = "guid";
-            this.gridColumn12.MinWidth = 31;
+            this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.OptionsColumn.ReadOnly = true;
-            this.gridColumn12.Width = 117;
+            this.gridColumn12.Width = 94;
             // 
             // gridColumn24
             // 
             this.gridColumn24.Caption = "浜х嚎";
             this.gridColumn24.FieldName = "lineName";
-            this.gridColumn24.MinWidth = 31;
+            this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
             this.gridColumn24.VisibleIndex = 0;
-            this.gridColumn24.Width = 117;
+            this.gridColumn24.Width = 94;
             // 
             // gvMx2status
             // 
             this.gvMx2status.AppearanceCell.Options.UseFont = true;
             this.gvMx2status.Caption = "宸ュ崟缂栧彿";
             this.gvMx2status.FieldName = "gdbh";
-            this.gvMx2status.MinWidth = 12;
+            this.gvMx2status.MinWidth = 10;
             this.gvMx2status.Name = "gvMx2status";
             this.gvMx2status.OptionsColumn.ReadOnly = true;
             this.gvMx2status.Tag = "query_a.status";
             this.gvMx2status.Visible = true;
             this.gvMx2status.VisibleIndex = 1;
-            this.gvMx2status.Width = 89;
+            this.gvMx2status.Width = 71;
             // 
             // gvMx2pbillNo
             // 
             this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2pbillNo.Caption = "杩芥函鐮�";
             this.gvMx2pbillNo.FieldName = "barCode";
-            this.gvMx2pbillNo.MinWidth = 25;
             this.gvMx2pbillNo.Name = "gvMx2pbillNo";
             this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
             this.gvMx2pbillNo.Tag = "query_a.pbill_no";
             this.gvMx2pbillNo.Visible = true;
             this.gvMx2pbillNo.VisibleIndex = 2;
-            this.gvMx2pbillNo.Width = 114;
+            this.gvMx2pbillNo.Width = 91;
             // 
             // gvMx2itemNo
             // 
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
             this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 25;
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
             this.gvMx2itemNo.Tag = "query_a.item_no";
             this.gvMx2itemNo.Visible = true;
             this.gvMx2itemNo.VisibleIndex = 3;
-            this.gvMx2itemNo.Width = 114;
+            this.gvMx2itemNo.Width = 91;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn5.FieldName = "itemName";
-            this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 4;
-            this.gridColumn5.Width = 114;
+            this.gridColumn5.Width = 91;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn6.FieldName = "itemModel";
-            this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 5;
-            this.gridColumn6.Width = 114;
+            this.gridColumn6.Width = 91;
             // 
             // gridColumn7
             // 
@@ -1522,80 +1447,89 @@
             this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn7.Caption = "淇悊鐘舵��";
             this.gridColumn7.FieldName = "repairResult";
-            this.gridColumn7.MinWidth = 31;
+            this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 6;
-            this.gridColumn7.Width = 114;
+            this.gridColumn7.Width = 91;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "閫佷慨宸ュ簭";
             this.gridColumn2.FieldName = "processNo";
-            this.gridColumn2.MinWidth = 31;
+            this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 7;
-            this.gridColumn2.Width = 114;
+            this.gridColumn2.Width = 91;
             // 
             // gridColumn26
             // 
             this.gridColumn26.Caption = "閫佷慨鍛�";
-            this.gridColumn26.FieldName = "createByName";
-            this.gridColumn26.MinWidth = 31;
+            this.gridColumn26.FieldName = "createBy";
+            this.gridColumn26.MinWidth = 25;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
             this.gridColumn26.VisibleIndex = 8;
-            this.gridColumn26.Width = 117;
+            this.gridColumn26.Width = 94;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "閫佷慨鏃堕棿";
             this.gridColumn15.FieldName = "createDate";
-            this.gridColumn15.MinWidth = 31;
+            this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 9;
-            this.gridColumn15.Width = 141;
+            this.gridColumn15.Width = 113;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "涓嶈壇鎻忚堪";
             this.gridColumn4.FieldName = "badDescription";
-            this.gridColumn4.MinWidth = 31;
+            this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 10;
-            this.gridColumn4.Width = 114;
+            this.gridColumn4.Width = 91;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "涓嶈壇鍘熷洜";
             this.gridColumn14.FieldName = "repairReson";
-            this.gridColumn14.MinWidth = 31;
+            this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 11;
-            this.gridColumn14.Width = 117;
+            this.gridColumn14.Width = 94;
             // 
             // gridColumn25
             // 
             this.gridColumn25.Caption = "涓嶈壇瀵圭瓥";
             this.gridColumn25.FieldName = "repairMethd";
-            this.gridColumn25.MinWidth = 31;
+            this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
             this.gridColumn25.VisibleIndex = 12;
-            this.gridColumn25.Width = 117;
+            this.gridColumn25.Width = 94;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "鐢熶骇缁勭粐";
+            this.gridColumn19.FieldName = "fSubsidiary";
+            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 11;
+            this.gridColumn19.Width = 94;
             // 
             // Frm_Repair
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1566, 834);
+            this.ClientSize = new System.Drawing.Size(1253, 682);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
-            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Frm_Repair";
             this.Text = "鐜板満淇悊";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1627,7 +1561,7 @@
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createByName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_barCode111.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
@@ -1692,7 +1626,7 @@
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraEditors.TextEdit txt_gdbh;
         private DevExpress.XtraEditors.TextEdit txt_processNo;
-        private DevExpress.XtraEditors.TextEdit txt_createByName;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
         private DevExpress.XtraEditors.TextEdit txt_barCode111;
         private DevExpress.XtraEditors.TextEdit txt_itemNo;
         private DevExpress.XtraEditors.TextEdit txt_itemName;

--
Gitblit v1.9.3