From 0249c31d8a31f1dfb94915915b177ec4a3074d60 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 01 七月 2025 16:44:44 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs |  616 ++++++++++++++++++++++++++-----------------------------
 1 files changed, 296 insertions(+), 320 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
index b1d71fa..1974d89 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.Designer.cs
@@ -27,14 +27,15 @@
         /// </summary>
         private void InitializeComponent()
         {
-            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 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.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            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();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
@@ -57,13 +58,17 @@
             this.gv_createBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_createDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_outType = new DevExpress.XtraEditors.TextEdit();
-            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
+            this.txt_sqRemark = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemOutNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
@@ -72,6 +77,11 @@
             this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_status = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_cjName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -82,6 +92,13 @@
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -110,22 +127,8 @@
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2remark = new DevExpress.XtraGrid.Columns.GridColumn();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.txt_cjName = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_ckName = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_pbillNo = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage3.SuspendLayout();
@@ -146,7 +149,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
@@ -155,6 +158,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -165,6 +173,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -174,24 +189,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = null;
             this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -237,15 +241,14 @@
             // 
             // 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(1126, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
@@ -258,7 +261,6 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -291,7 +293,6 @@
             // 
             // gv_status
             // 
-            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.AppearanceCell.Options.UseTextOptions = true;
             this.gv_status.AppearanceCell.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
@@ -308,7 +309,6 @@
             // 
             // gv_itemOutNo
             // 
-            this.gv_itemOutNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_itemOutNo.AppearanceCell.Options.UseFont = true;
             this.gv_itemOutNo.Caption = "鍑哄簱鍗曞彿";
             this.gv_itemOutNo.FieldName = "itemOutNo";
@@ -322,7 +322,6 @@
             // 
             // gv_workNo
             // 
-            this.gv_workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_workNo.AppearanceCell.Options.UseFont = true;
             this.gv_workNo.Caption = "浠诲姟鍗曞彿";
             this.gv_workNo.FieldName = "workNo";
@@ -336,7 +335,6 @@
             // 
             // gv_pbillNo
             // 
-            this.gv_pbillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_pbillNo.AppearanceCell.Options.UseFont = true;
             this.gv_pbillNo.Caption = "宸ュ崟鍗曞彿";
             this.gv_pbillNo.FieldName = "pbillNo";
@@ -350,7 +348,6 @@
             // 
             // gv_boardItem
             // 
-            this.gv_boardItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_boardItem.AppearanceCell.Options.UseFont = true;
             this.gv_boardItem.Caption = "浜у搧缂栫爜";
             this.gv_boardItem.FieldName = "itemNo";
@@ -384,7 +381,6 @@
             // 
             // gv_outDate
             // 
-            this.gv_outDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_outDate.AppearanceCell.Options.UseFont = true;
             this.gv_outDate.Caption = "鍑哄簱鏃ユ湡 ";
             this.gv_outDate.FieldName = "outDate";
@@ -398,7 +394,6 @@
             // 
             // gv_outType
             // 
-            this.gv_outType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_outType.AppearanceCell.Options.UseFont = true;
             this.gv_outType.Caption = "鍑哄簱绫诲埆 ";
             this.gv_outType.FieldName = "outType";
@@ -412,7 +407,6 @@
             // 
             // gv_checkUser
             // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
             this.gv_checkUser.FieldName = "checkUser";
@@ -426,7 +420,6 @@
             // 
             // gv_checkDate
             // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃ユ湡 ";
             this.gv_checkDate.FieldName = "checkDate";
@@ -440,7 +433,6 @@
             // 
             // gv_receiver
             // 
-            this.gv_receiver.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_receiver.AppearanceCell.Options.UseFont = true;
             this.gv_receiver.Caption = "棰嗘枡浜�";
             this.gv_receiver.FieldName = "receiver";
@@ -454,7 +446,6 @@
             // 
             // gv_outPart
             // 
-            this.gv_outPart.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_outPart.AppearanceCell.Options.UseFont = true;
             this.gv_outPart.Caption = "杞﹂棿";
             this.gv_outPart.FieldName = "cjName";
@@ -468,7 +459,6 @@
             // 
             // gv_createBy
             // 
-            this.gv_createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createBy.AppearanceCell.Options.UseFont = true;
             this.gv_createBy.Caption = "鍒涘缓浜�";
             this.gv_createBy.FieldName = "createBy";
@@ -482,7 +472,6 @@
             // 
             // gv_createDate
             // 
-            this.gv_createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
             this.gv_createDate.FieldName = "createDate";
@@ -496,10 +485,9 @@
             // 
             // gv_remark
             // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_remark.AppearanceCell.Options.UseFont = true;
-            this.gv_remark.Caption = "澶囨敞淇℃伅 ";
-            this.gv_remark.FieldName = "remark";
+            this.gv_remark.Caption = "鐢宠鍘熷洜";
+            this.gv_remark.FieldName = "sqRemark";
             this.gv_remark.MinWidth = 25;
             this.gv_remark.Name = "gv_remark";
             this.gv_remark.OptionsColumn.AllowEdit = false;
@@ -507,6 +495,44 @@
             this.gv_remark.Visible = true;
             this.gv_remark.VisibleIndex = 15;
             this.gv_remark.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鎶曟枡鍗曞彿";
+            this.gridColumn7.FieldName = "daa014";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 16;
+            this.gridColumn7.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鐢宠鍗曞彿";
+            this.gridColumn8.FieldName = "taskNo";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 17;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "浠撳簱鍚嶇О";
+            this.gridColumn9.FieldName = "ckName";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 18;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "涓婚敭GUID";
+            this.gridColumn10.FieldName = "guid";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Width = 94;
             // 
             // pageBar1
             // 
@@ -532,7 +558,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
             // 
@@ -551,7 +577,7 @@
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_outType);
-            this.layoutMx1.Controls.Add(this.txt_remark);
+            this.layoutMx1.Controls.Add(this.txt_sqRemark);
             this.layoutMx1.Controls.Add(this.txt_itemOutNo);
             this.layoutMx1.Controls.Add(this.txt_createBy);
             this.layoutMx1.Controls.Add(this.txt_checkDate);
@@ -587,102 +613,133 @@
             // 
             // txt_outType
             // 
-            this.txt_outType.Location = new System.Drawing.Point(360, 61);
+            this.txt_outType.Location = new System.Drawing.Point(365, 68);
             this.txt_outType.Name = "txt_outType";
-            this.txt_outType.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_outType.Properties.Appearance.Options.UseFont = true;
-            this.txt_outType.Size = new System.Drawing.Size(190, 28);
+            this.txt_outType.Size = new System.Drawing.Size(195, 24);
             this.txt_outType.StyleController = this.layoutMx1;
             this.txt_outType.TabIndex = 450;
             // 
-            // txt_remark
+            // txt_sqRemark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(89, 93);
-            this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(461, 28);
-            this.txt_remark.StyleController = this.layoutMx1;
-            this.txt_remark.TabIndex = 243;
+            this.txt_sqRemark.Location = new System.Drawing.Point(89, 96);
+            this.txt_sqRemark.Name = "txt_sqRemark";
+            this.txt_sqRemark.Properties.Appearance.Options.UseFont = true;
+            this.txt_sqRemark.Size = new System.Drawing.Size(471, 24);
+            this.txt_sqRemark.StyleController = this.layoutMx1;
+            this.txt_sqRemark.TabIndex = 243;
             // 
             // txt_itemOutNo
             // 
-            this.txt_itemOutNo.Location = new System.Drawing.Point(89, -3);
+            this.txt_itemOutNo.Location = new System.Drawing.Point(89, 12);
             this.txt_itemOutNo.Name = "txt_itemOutNo";
-            this.txt_itemOutNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemOutNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemOutNo.Size = new System.Drawing.Size(190, 28);
+            this.txt_itemOutNo.Size = new System.Drawing.Size(195, 24);
             this.txt_itemOutNo.StyleController = this.layoutMx1;
             this.txt_itemOutNo.TabIndex = 213;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(631, -3);
+            this.txt_createBy.Location = new System.Drawing.Point(641, 12);
             this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(190, 28);
+            this.txt_createBy.Size = new System.Drawing.Size(195, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 222;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(902, 29);
+            this.txt_checkDate.Location = new System.Drawing.Point(917, 40);
             this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(191, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(197, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 262;
             // 
             // txt_taskNo
             // 
-            this.txt_taskNo.Location = new System.Drawing.Point(89, 29);
+            this.txt_taskNo.Location = new System.Drawing.Point(89, 40);
             this.txt_taskNo.Name = "txt_taskNo";
-            this.txt_taskNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_taskNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_taskNo.Size = new System.Drawing.Size(190, 28);
+            this.txt_taskNo.Size = new System.Drawing.Size(195, 24);
             this.txt_taskNo.StyleController = this.layoutMx1;
             this.txt_taskNo.TabIndex = 216;
             // 
             // txt_checkUser
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(902, -3);
+            this.txt_checkUser.Location = new System.Drawing.Point(917, 12);
             this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(191, 28);
+            this.txt_checkUser.Size = new System.Drawing.Size(197, 24);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 258;
             // 
             // txt_workNo
             // 
-            this.txt_workNo.Location = new System.Drawing.Point(902, 93);
+            this.txt_workNo.Location = new System.Drawing.Point(917, 96);
             this.txt_workNo.Name = "txt_workNo";
-            this.txt_workNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_workNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_workNo.Size = new System.Drawing.Size(191, 28);
+            this.txt_workNo.Size = new System.Drawing.Size(197, 24);
             this.txt_workNo.StyleController = this.layoutMx1;
             this.txt_workNo.TabIndex = 387;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(631, 29);
+            this.txt_createDate.Location = new System.Drawing.Point(641, 40);
             this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(190, 28);
+            this.txt_createDate.Size = new System.Drawing.Size(195, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 226;
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(825, 61);
+            this.txt_status.Location = new System.Drawing.Point(840, 68);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_status.Size = new System.Drawing.Size(268, 24);
+            this.txt_status.Size = new System.Drawing.Size(274, 24);
             this.txt_status.StyleController = this.layoutMx1;
             this.txt_status.TabIndex = 575;
+            // 
+            // txt_cjName
+            // 
+            this.txt_cjName.Location = new System.Drawing.Point(365, 12);
+            this.txt_cjName.Name = "txt_cjName";
+            this.txt_cjName.Size = new System.Drawing.Size(195, 24);
+            this.txt_cjName.StyleController = this.layoutMx1;
+            this.txt_cjName.TabIndex = 576;
+            // 
+            // txt_ckName
+            // 
+            this.txt_ckName.Location = new System.Drawing.Point(365, 40);
+            this.txt_ckName.Name = "txt_ckName";
+            this.txt_ckName.Size = new System.Drawing.Size(195, 24);
+            this.txt_ckName.StyleController = this.layoutMx1;
+            this.txt_ckName.TabIndex = 577;
+            // 
+            // txt_pbillNo
+            // 
+            this.txt_pbillNo.Location = new System.Drawing.Point(641, 68);
+            this.txt_pbillNo.Name = "txt_pbillNo";
+            this.txt_pbillNo.Size = new System.Drawing.Size(195, 24);
+            this.txt_pbillNo.StyleController = this.layoutMx1;
+            this.txt_pbillNo.TabIndex = 578;
+            // 
+            // txt_daa014
+            // 
+            this.txt_daa014.Location = new System.Drawing.Point(641, 96);
+            this.txt_daa014.Name = "txt_daa014";
+            this.txt_daa014.Size = new System.Drawing.Size(195, 24);
+            this.txt_daa014.StyleController = this.layoutMx1;
+            this.txt_daa014.TabIndex = 579;
+            // 
+            // txt_itemName
+            // 
+            this.txt_itemName.Location = new System.Drawing.Point(89, 68);
+            this.txt_itemName.Name = "txt_itemName";
+            this.txt_itemName.Size = new System.Drawing.Size(195, 24);
+            this.txt_itemName.StyleController = this.layoutMx1;
+            this.txt_itemName.TabIndex = 580;
             // 
             // layoutControlItem13
             // 
@@ -718,33 +775,33 @@
             this.layoutControlItem16});
             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;
+            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9.Width = 100D;
+            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition10.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            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;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9,
+            columnDefinition10,
+            columnDefinition11,
+            columnDefinition12});
+            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;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.Root.Size = new System.Drawing.Size(1105, 148);
+            rowDefinition9,
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12});
+            this.Root.Size = new System.Drawing.Size(1126, 133);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -752,85 +809,159 @@
             this.layoutControlItem1.Control = this.txt_itemOutNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
             this.layoutControlItem1.Text = "鍑哄簱鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_createBy;
-            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(276, 28);
             this.layoutControlItem3.Text = "鍒涘缓浜�";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_checkUser;
-            this.layoutControlItem4.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(828, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(278, 28);
             this.layoutControlItem4.Text = "瀹℃牳浜�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_createDate;
-            this.layoutControlItem7.Location = new System.Drawing.Point(542, 32);
+            this.layoutControlItem7.Location = new System.Drawing.Point(552, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(276, 28);
             this.layoutControlItem7.Text = "鍒涘缓鏃堕棿";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_checkDate;
-            this.layoutControlItem8.Location = new System.Drawing.Point(813, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(828, 28);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(278, 28);
             this.layoutControlItem8.Text = "瀹℃牳鏃ユ湡 ";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_outType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(271, 64);
+            this.layoutControlItem10.Location = new System.Drawing.Point(276, 56);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(276, 28);
             this.layoutControlItem10.Text = "鍑哄簱绫诲埆";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_status;
-            this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
+            this.layoutControlItem12.Location = new System.Drawing.Point(828, 56);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(278, 28);
             this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
             // 
             // layoutControlItem11
             // 
-            this.layoutControlItem11.Control = this.txt_remark;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem11.Control = this.txt_sqRemark;
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem11.Size = new System.Drawing.Size(542, 32);
-            this.layoutControlItem11.Text = "澶囨敞淇℃伅";
+            this.layoutControlItem11.Size = new System.Drawing.Size(552, 29);
+            this.layoutControlItem11.Text = "鐢宠鍘熷洜";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_cjName;
+            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem2.Text = "杞﹂棿鍚嶇О";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_ckName;
+            this.layoutControlItem6.Location = new System.Drawing.Point(276, 28);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem6.Text = "浠撳簱鍚嶇О";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_pbillNo;
+            this.layoutControlItem14.Location = new System.Drawing.Point(552, 56);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem14.Text = "宸ュ崟鍗曞彿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_daa014;
+            this.layoutControlItem15.Location = new System.Drawing.Point(552, 84);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem15.Text = "鎶曟枡鍗曞彿";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_workNo;
+            this.layoutControlItem5.Location = new System.Drawing.Point(828, 84);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem5.Size = new System.Drawing.Size(278, 29);
+            this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txt_taskNo;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem9.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem9.Text = "鐢宠鍗曞彿";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_itemName;
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem16.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem16.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(65, 18);
             // 
             // tabMx
             // 
@@ -864,6 +995,7 @@
             // 
             // gvMx1
             // 
+            this.gvMx1.Appearance.Row.Options.UseFont = true;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1guid,
             this.gvMx1workNo,
@@ -875,7 +1007,8 @@
             this.gvMx1tlQty,
             this.gvMx1remark,
             this.gridColumn4,
-            this.gridColumn5});
+            this.gridColumn5,
+            this.gridColumn11});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -884,9 +1017,8 @@
             // 
             // gvMx1guid
             // 
-            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid ";
+            this.gvMx1guid.Caption = "鏄庣粏涓婚敭";
             this.gvMx1guid.FieldName = "guid";
             this.gvMx1guid.MinWidth = 50;
             this.gvMx1guid.Name = "gvMx1guid";
@@ -895,7 +1027,6 @@
             // 
             // gvMx1workNo
             // 
-            this.gvMx1workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1workNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1workNo.Caption = "浠诲姟鍗曞彿";
             this.gvMx1workNo.FieldName = "workNo";
@@ -908,7 +1039,6 @@
             // 
             // gvMx1itemNo
             // 
-            this.gvMx1itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemNo.Caption = "鐗╂枡缂栧彿 ";
             this.gvMx1itemNo.FieldName = "itemNo";
@@ -921,7 +1051,6 @@
             // 
             // gvMx1itemId
             // 
-            this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemId.Caption = "鐗╂枡ID ";
             this.gvMx1itemId.FieldName = "itemId";
@@ -934,7 +1063,6 @@
             // 
             // gvMx1createBy
             // 
-            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
             this.gvMx1createBy.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1createBy.FieldName = "itemName";
@@ -947,7 +1075,6 @@
             // 
             // gvMx1createDate
             // 
-            this.gvMx1createDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1createDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1createDate.Caption = "鐗╂枡瑙勬牸";
             this.gvMx1createDate.FieldName = "itemModel";
@@ -960,7 +1087,6 @@
             // 
             // gvMx1quantity
             // 
-            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鐢宠鏁伴噺 ";
             this.gvMx1quantity.FieldName = "quantity";
@@ -973,7 +1099,6 @@
             // 
             // gvMx1tlQty
             // 
-            this.gvMx1tlQty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1tlQty.AppearanceCell.Options.UseFont = true;
             this.gvMx1tlQty.Caption = "宸叉壂鏁伴噺 ";
             this.gvMx1tlQty.FieldName = "tlQty";
@@ -986,10 +1111,9 @@
             // 
             // gvMx1remark
             // 
-            this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1remark.AppearanceCell.Options.UseFont = true;
-            this.gvMx1remark.Caption = "澶囨敞淇℃伅 ";
-            this.gvMx1remark.FieldName = "remark";
+            this.gvMx1remark.Caption = "鐢宠鍘熷洜";
+            this.gvMx1remark.FieldName = "sqRemark";
             this.gvMx1remark.MinWidth = 50;
             this.gvMx1remark.Name = "gvMx1remark";
             this.gvMx1remark.Tag = "query_a.remark";
@@ -1037,6 +1161,7 @@
             // 
             // gvMx2
             // 
+            this.gvMx2.Appearance.Row.Options.UseFont = true;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2itemBarcode,
             this.gvMx2itemNo,
@@ -1055,7 +1180,6 @@
             // 
             // gvMx2itemBarcode
             // 
-            this.gvMx2itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
@@ -1068,7 +1192,6 @@
             // 
             // gvMx2itemNo
             // 
-            this.gvMx2itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜";
             this.gvMx2itemNo.FieldName = "itemNo";
@@ -1081,7 +1204,6 @@
             // 
             // gvMx2lotNo
             // 
-            this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2lotNo.Caption = "鐗╂枡鍚嶇О";
             this.gvMx2lotNo.FieldName = "itemName";
@@ -1094,7 +1216,6 @@
             // 
             // gvMx2quantity
             // 
-            this.gvMx2quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx2quantity.Caption = "鏁伴噺";
             this.gvMx2quantity.FieldName = "quantity";
@@ -1107,7 +1228,6 @@
             // 
             // gvMx2depotCode
             // 
-            this.gvMx2depotCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2depotCode.AppearanceCell.Options.UseFont = true;
             this.gvMx2depotCode.Caption = "浠撳簱缂栫爜 ";
             this.gvMx2depotCode.FieldName = "depotCode";
@@ -1120,7 +1240,6 @@
             // 
             // gvMx2depotSectionCode
             // 
-            this.gvMx2depotSectionCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2depotSectionCode.AppearanceCell.Options.UseFont = true;
             this.gvMx2depotSectionCode.Caption = "璐т綅缂栫爜 ";
             this.gvMx2depotSectionCode.FieldName = "depotSectionCode";
@@ -1153,7 +1272,6 @@
             // 
             // gvMx2remark
             // 
-            this.gvMx2remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2remark.AppearanceCell.Options.UseFont = true;
             this.gvMx2remark.Caption = "澶囨敞 ";
             this.gvMx2remark.FieldName = "remark";
@@ -1175,157 +1293,13 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // gridColumn7
+            // gridColumn11
             // 
-            this.gridColumn7.Caption = "鎶曟枡鍗曞彿";
-            this.gridColumn7.FieldName = "daa014";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 16;
-            this.gridColumn7.Width = 94;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "鐢宠鍗曞彿";
-            this.gridColumn8.FieldName = "taskNo";
-            this.gridColumn8.MinWidth = 25;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 17;
-            this.gridColumn8.Width = 94;
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "浠撳簱鍚嶇О";
-            this.gridColumn9.FieldName = "ckName";
-            this.gridColumn9.MinWidth = 25;
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 18;
-            this.gridColumn9.Width = 94;
-            // 
-            // txt_cjName
-            // 
-            this.txt_cjName.Location = new System.Drawing.Point(360, -3);
-            this.txt_cjName.Name = "txt_cjName";
-            this.txt_cjName.Size = new System.Drawing.Size(190, 24);
-            this.txt_cjName.StyleController = this.layoutMx1;
-            this.txt_cjName.TabIndex = 576;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_cjName;
-            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem2.Text = "杞﹂棿鍚嶇О";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // txt_ckName
-            // 
-            this.txt_ckName.Location = new System.Drawing.Point(360, 29);
-            this.txt_ckName.Name = "txt_ckName";
-            this.txt_ckName.Size = new System.Drawing.Size(190, 24);
-            this.txt_ckName.StyleController = this.layoutMx1;
-            this.txt_ckName.TabIndex = 577;
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_ckName;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem6.Text = "浠撳簱鍚嶇О";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // txt_pbillNo
-            // 
-            this.txt_pbillNo.Location = new System.Drawing.Point(631, 61);
-            this.txt_pbillNo.Name = "txt_pbillNo";
-            this.txt_pbillNo.Size = new System.Drawing.Size(190, 24);
-            this.txt_pbillNo.StyleController = this.layoutMx1;
-            this.txt_pbillNo.TabIndex = 578;
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_pbillNo;
-            this.layoutControlItem14.Location = new System.Drawing.Point(542, 64);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem14.Text = "宸ュ崟鍗曞彿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // txt_daa014
-            // 
-            this.txt_daa014.Location = new System.Drawing.Point(631, 93);
-            this.txt_daa014.Name = "txt_daa014";
-            this.txt_daa014.Size = new System.Drawing.Size(190, 24);
-            this.txt_daa014.StyleController = this.layoutMx1;
-            this.txt_daa014.TabIndex = 579;
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_daa014;
-            this.layoutControlItem15.Location = new System.Drawing.Point(542, 96);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem15.Text = "鎶曟枡鍗曞彿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_workNo;
-            this.layoutControlItem5.Location = new System.Drawing.Point(813, 96);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(272, 32);
-            this.layoutControlItem5.Text = "浠诲姟鍗曞彿";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_taskNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(0, 32);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem9.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // txt_itemName
-            // 
-            this.txt_itemName.Location = new System.Drawing.Point(89, 61);
-            this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Size = new System.Drawing.Size(190, 24);
-            this.txt_itemName.StyleController = this.layoutMx1;
-            this.txt_itemName.TabIndex = 580;
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_itemName;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(271, 32);
-            this.layoutControlItem16.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(65, 18);
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "涓婚敭GUID";
-            this.gridColumn10.FieldName = "guid";
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Width = 94;
+            this.gridColumn11.Caption = "鐩稿叧涓婚敭";
+            this.gridColumn11.FieldName = "itemDabid";
+            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Width = 94;
             // 
             // UcBlclDj
             // 
@@ -1356,7 +1330,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_outType.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_sqRemark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemOutNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
@@ -1365,6 +1339,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1375,6 +1354,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1384,18 +1370,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_cjName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ckName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_pbillNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1431,7 +1405,7 @@
         private DevExpress.XtraEditors.TextEdit txt_workNo;
         private DevExpress.XtraEditors.TextEdit txt_checkDate;
         private DevExpress.XtraEditors.TextEdit txt_checkUser;
-        private DevExpress.XtraEditors.TextEdit txt_remark;
+        private DevExpress.XtraEditors.TextEdit txt_sqRemark;
         private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraEditors.TextEdit txt_createBy;
         private DevExpress.XtraEditors.TextEdit txt_taskNo;
@@ -1491,5 +1465,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3