From bcad58747aa94c710e35228fea00d95d379333fc Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 11 一月 2025 17:39:05 +0800
Subject: [PATCH] 细节

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1485 +++++++++++++++++------------------------------------------
 1 files changed, 425 insertions(+), 1,060 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index b152be7..638bd2c 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,70 +29,21 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.gvMx2itemId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2workFlgtime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2workLast = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2workFlg = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lineNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2comeFlg = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2workNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2memoBad = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2workLine = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2insDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2boardStyle = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2colorName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2urgentFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2billNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2suppName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2barcodetype = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2nweight = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2gweight = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2fcar = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2iqcStatus = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2validTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2linfline = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2epItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2printId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2minpackFlag = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2delanyMonth = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2flezzBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2flezzReason = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2flezzDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2trLotno = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2visable = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemSname = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2epostion = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2spostion = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2suppNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2memo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2mocode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2sumBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2oldBarQuantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2price = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2weightUnit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2unit = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2location = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2useqty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2rohInId = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2custNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lastupdateBy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2createDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2createBy = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2taskNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2lotNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2cItemCode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2cItemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2cProductCode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1zyBl = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1llBl = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1lpTl = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -120,6 +71,10 @@
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx1Guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_cust = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_mesEndProd = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -179,13 +134,24 @@
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.鐢熶骇缁勭粐 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.txtKdy = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
+            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
+            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
+            this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
+            this.labelControl6 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
             this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.txt_daa022 = new DevExpress.XtraEditors.TextEdit();
             this.lb_tbl013 = new DevExpress.XtraEditors.LabelControl();
@@ -205,7 +171,6 @@
             this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
             this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -235,6 +200,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa022.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).BeginInit();
@@ -242,554 +211,20 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
-            // 
-            // gvMx2itemId
-            // 
-            this.gvMx2itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2itemId.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemId.Caption = "鐗╂枡ID ";
-            this.gvMx2itemId.FieldName = "itemId";
-            this.gvMx2itemId.MinWidth = 50;
-            this.gvMx2itemId.Name = "gvMx2itemId";
-            this.gvMx2itemId.Tag = "query_a.ITEM_ID";
-            this.gvMx2itemId.Visible = true;
-            this.gvMx2itemId.VisibleIndex = 59;
-            this.gvMx2itemId.Width = 94;
-            // 
-            // gvMx2workFlgtime
-            // 
-            this.gvMx2workFlgtime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2workFlgtime.AppearanceCell.Options.UseFont = true;
-            this.gvMx2workFlgtime.Caption = "宸ュ簭鏃堕棿 ";
-            this.gvMx2workFlgtime.FieldName = "workFlgtime";
-            this.gvMx2workFlgtime.MinWidth = 50;
-            this.gvMx2workFlgtime.Name = "gvMx2workFlgtime";
-            this.gvMx2workFlgtime.Tag = "query_a.WORK_FLGTIME";
-            this.gvMx2workFlgtime.Visible = true;
-            this.gvMx2workFlgtime.VisibleIndex = 58;
-            this.gvMx2workFlgtime.Width = 94;
-            // 
-            // gvMx2workLast
-            // 
-            this.gvMx2workLast.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2workLast.AppearanceCell.Options.UseFont = true;
-            this.gvMx2workLast.Caption = "宸ュ崟鏈�鍚庤 ";
-            this.gvMx2workLast.FieldName = "workLast";
-            this.gvMx2workLast.MinWidth = 50;
-            this.gvMx2workLast.Name = "gvMx2workLast";
-            this.gvMx2workLast.Tag = "query_a.WORK_LAST";
-            this.gvMx2workLast.Visible = true;
-            this.gvMx2workLast.VisibleIndex = 57;
-            this.gvMx2workLast.Width = 94;
-            // 
-            // gvMx2workFlg
-            // 
-            this.gvMx2workFlg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2workFlg.AppearanceCell.Options.UseFont = true;
-            this.gvMx2workFlg.Caption = "宸ュ崟鐘舵�� ";
-            this.gvMx2workFlg.FieldName = "workFlg";
-            this.gvMx2workFlg.MinWidth = 50;
-            this.gvMx2workFlg.Name = "gvMx2workFlg";
-            this.gvMx2workFlg.Tag = "query_a.WORK_FLG";
-            this.gvMx2workFlg.Visible = true;
-            this.gvMx2workFlg.VisibleIndex = 56;
-            this.gvMx2workFlg.Width = 94;
-            // 
-            // gvMx2lineNo
-            // 
-            this.gvMx2lineNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lineNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lineNo.Caption = "琛屽彿 ";
-            this.gvMx2lineNo.FieldName = "lineNo";
-            this.gvMx2lineNo.MinWidth = 50;
-            this.gvMx2lineNo.Name = "gvMx2lineNo";
-            this.gvMx2lineNo.Tag = "query_a.LINE_NO";
-            this.gvMx2lineNo.Visible = true;
-            this.gvMx2lineNo.VisibleIndex = 55;
-            this.gvMx2lineNo.Width = 94;
-            // 
-            // gvMx2comeFlg
-            // 
-            this.gvMx2comeFlg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2comeFlg.AppearanceCell.Options.UseFont = true;
-            this.gvMx2comeFlg.Caption = "鍒拌揣鏍囪 ";
-            this.gvMx2comeFlg.FieldName = "comeFlg";
-            this.gvMx2comeFlg.MinWidth = 50;
-            this.gvMx2comeFlg.Name = "gvMx2comeFlg";
-            this.gvMx2comeFlg.Tag = "query_a.COME_FLG";
-            this.gvMx2comeFlg.Visible = true;
-            this.gvMx2comeFlg.VisibleIndex = 54;
-            this.gvMx2comeFlg.Width = 94;
-            // 
-            // gvMx2workNo
-            // 
-            this.gvMx2workNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2workNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2workNo.Caption = "宸ュ崟 ";
-            this.gvMx2workNo.FieldName = "workNo";
-            this.gvMx2workNo.MinWidth = 50;
-            this.gvMx2workNo.Name = "gvMx2workNo";
-            this.gvMx2workNo.Tag = "query_a.WORK_NO";
-            this.gvMx2workNo.Visible = true;
-            this.gvMx2workNo.VisibleIndex = 53;
-            this.gvMx2workNo.Width = 94;
-            // 
-            // gvMx2memoBad
-            // 
-            this.gvMx2memoBad.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2memoBad.AppearanceCell.Options.UseFont = true;
-            this.gvMx2memoBad.Caption = "涓嶈壇澶囨敞 ";
-            this.gvMx2memoBad.FieldName = "memoBad";
-            this.gvMx2memoBad.MinWidth = 50;
-            this.gvMx2memoBad.Name = "gvMx2memoBad";
-            this.gvMx2memoBad.Tag = "query_a.MEMO_BAD";
-            this.gvMx2memoBad.Visible = true;
-            this.gvMx2memoBad.VisibleIndex = 52;
-            this.gvMx2memoBad.Width = 94;
-            // 
-            // gvMx2workLine
-            // 
-            this.gvMx2workLine.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2workLine.AppearanceCell.Options.UseFont = true;
-            this.gvMx2workLine.Caption = "宸ュ簭绾� ";
-            this.gvMx2workLine.FieldName = "workLine";
-            this.gvMx2workLine.MinWidth = 50;
-            this.gvMx2workLine.Name = "gvMx2workLine";
-            this.gvMx2workLine.Tag = "query_a.WORK_LINE";
-            this.gvMx2workLine.Visible = true;
-            this.gvMx2workLine.VisibleIndex = 51;
-            this.gvMx2workLine.Width = 94;
-            // 
-            // gvMx2insDate
-            // 
-            this.gvMx2insDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2insDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx2insDate.Caption = "鍒涘缓鏃ユ湡 ";
-            this.gvMx2insDate.FieldName = "insDate";
-            this.gvMx2insDate.MinWidth = 50;
-            this.gvMx2insDate.Name = "gvMx2insDate";
-            this.gvMx2insDate.Tag = "query_a.INS_DATE";
-            this.gvMx2insDate.Visible = true;
-            this.gvMx2insDate.VisibleIndex = 50;
-            this.gvMx2insDate.Width = 94;
-            // 
-            // gvMx2boardStyle
-            // 
-            this.gvMx2boardStyle.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2boardStyle.AppearanceCell.Options.UseFont = true;
-            this.gvMx2boardStyle.Caption = "鏉垮瀷 ";
-            this.gvMx2boardStyle.FieldName = "boardStyle";
-            this.gvMx2boardStyle.MinWidth = 50;
-            this.gvMx2boardStyle.Name = "gvMx2boardStyle";
-            this.gvMx2boardStyle.Tag = "query_a.BOARD_STYLE";
-            this.gvMx2boardStyle.Visible = true;
-            this.gvMx2boardStyle.VisibleIndex = 49;
-            this.gvMx2boardStyle.Width = 94;
-            // 
-            // gvMx2colorName
-            // 
-            this.gvMx2colorName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2colorName.AppearanceCell.Options.UseFont = true;
-            this.gvMx2colorName.Caption = "棰滆壊鍚嶇О ";
-            this.gvMx2colorName.FieldName = "colorName";
-            this.gvMx2colorName.MinWidth = 50;
-            this.gvMx2colorName.Name = "gvMx2colorName";
-            this.gvMx2colorName.Tag = "query_a.COLOR_NAME";
-            this.gvMx2colorName.Visible = true;
-            this.gvMx2colorName.VisibleIndex = 48;
-            this.gvMx2colorName.Width = 94;
-            // 
-            // gvMx2urgentFlag
-            // 
-            this.gvMx2urgentFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2urgentFlag.AppearanceCell.Options.UseFont = true;
-            this.gvMx2urgentFlag.Caption = "鏄惁绱ф�� ";
-            this.gvMx2urgentFlag.FieldName = "urgentFlag";
-            this.gvMx2urgentFlag.MinWidth = 50;
-            this.gvMx2urgentFlag.Name = "gvMx2urgentFlag";
-            this.gvMx2urgentFlag.Tag = "query_a.URGENT_FLAG";
-            this.gvMx2urgentFlag.Visible = true;
-            this.gvMx2urgentFlag.VisibleIndex = 47;
-            this.gvMx2urgentFlag.Width = 94;
-            // 
-            // gvMx2billNo
-            // 
-            this.gvMx2billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2billNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2billNo.Caption = "鍙戠エ缂栧彿 ";
-            this.gvMx2billNo.FieldName = "billNo";
-            this.gvMx2billNo.MinWidth = 50;
-            this.gvMx2billNo.Name = "gvMx2billNo";
-            this.gvMx2billNo.Tag = "query_a.BILL_NO";
-            this.gvMx2billNo.Visible = true;
-            this.gvMx2billNo.VisibleIndex = 46;
-            this.gvMx2billNo.Width = 94;
-            // 
-            // gvMx2suppName
-            // 
-            this.gvMx2suppName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2suppName.AppearanceCell.Options.UseFont = true;
-            this.gvMx2suppName.Caption = "渚涘簲鍟嗗悕绉� ";
-            this.gvMx2suppName.FieldName = "suppName";
-            this.gvMx2suppName.MinWidth = 50;
-            this.gvMx2suppName.Name = "gvMx2suppName";
-            this.gvMx2suppName.Tag = "query_a.SUPP_NAME";
-            this.gvMx2suppName.Visible = true;
-            this.gvMx2suppName.VisibleIndex = 45;
-            this.gvMx2suppName.Width = 94;
-            // 
-            // gvMx2barcodetype
-            // 
-            this.gvMx2barcodetype.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2barcodetype.AppearanceCell.Options.UseFont = true;
-            this.gvMx2barcodetype.Caption = "鏉$爜绫诲瀷 ";
-            this.gvMx2barcodetype.FieldName = "barcodetype";
-            this.gvMx2barcodetype.MinWidth = 50;
-            this.gvMx2barcodetype.Name = "gvMx2barcodetype";
-            this.gvMx2barcodetype.Tag = "query_a.BARCODETYPE";
-            this.gvMx2barcodetype.Visible = true;
-            this.gvMx2barcodetype.VisibleIndex = 44;
-            this.gvMx2barcodetype.Width = 94;
-            // 
-            // gvMx2nweight
-            // 
-            this.gvMx2nweight.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2nweight.AppearanceCell.Options.UseFont = true;
-            this.gvMx2nweight.Caption = "鍑�閲� ";
-            this.gvMx2nweight.FieldName = "nweight";
-            this.gvMx2nweight.MinWidth = 50;
-            this.gvMx2nweight.Name = "gvMx2nweight";
-            this.gvMx2nweight.Tag = "query_a.NWEIGHT";
-            this.gvMx2nweight.Visible = true;
-            this.gvMx2nweight.VisibleIndex = 43;
-            this.gvMx2nweight.Width = 94;
-            // 
-            // gvMx2gweight
-            // 
-            this.gvMx2gweight.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2gweight.AppearanceCell.Options.UseFont = true;
-            this.gvMx2gweight.Caption = "姣涢噸 ";
-            this.gvMx2gweight.FieldName = "gweight";
-            this.gvMx2gweight.MinWidth = 50;
-            this.gvMx2gweight.Name = "gvMx2gweight";
-            this.gvMx2gweight.Tag = "query_a.GWEIGHT";
-            this.gvMx2gweight.Visible = true;
-            this.gvMx2gweight.VisibleIndex = 42;
-            this.gvMx2gweight.Width = 94;
-            // 
-            // gvMx2fcar
-            // 
-            this.gvMx2fcar.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2fcar.AppearanceCell.Options.UseFont = true;
-            this.gvMx2fcar.Caption = "杞﹀彿 ";
-            this.gvMx2fcar.FieldName = "fcar";
-            this.gvMx2fcar.MinWidth = 50;
-            this.gvMx2fcar.Name = "gvMx2fcar";
-            this.gvMx2fcar.Tag = "query_a.FCAR";
-            this.gvMx2fcar.Visible = true;
-            this.gvMx2fcar.VisibleIndex = 41;
-            this.gvMx2fcar.Width = 94;
-            // 
-            // gvMx2iqcStatus
-            // 
-            this.gvMx2iqcStatus.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2iqcStatus.AppearanceCell.Options.UseFont = true;
-            this.gvMx2iqcStatus.Caption = "璐ㄦ鐘舵�� ";
-            this.gvMx2iqcStatus.FieldName = "iqcStatus";
-            this.gvMx2iqcStatus.MinWidth = 50;
-            this.gvMx2iqcStatus.Name = "gvMx2iqcStatus";
-            this.gvMx2iqcStatus.Tag = "query_a.IQC_STATUS";
-            this.gvMx2iqcStatus.Visible = true;
-            this.gvMx2iqcStatus.VisibleIndex = 40;
-            this.gvMx2iqcStatus.Width = 94;
-            // 
-            // gvMx2validTime
-            // 
-            this.gvMx2validTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2validTime.AppearanceCell.Options.UseFont = true;
-            this.gvMx2validTime.Caption = "鏈夋晥鏃堕棿 ";
-            this.gvMx2validTime.FieldName = "validTime";
-            this.gvMx2validTime.MinWidth = 50;
-            this.gvMx2validTime.Name = "gvMx2validTime";
-            this.gvMx2validTime.Tag = "query_a.VALID_TIME";
-            this.gvMx2validTime.Visible = true;
-            this.gvMx2validTime.VisibleIndex = 39;
-            this.gvMx2validTime.Width = 94;
-            // 
-            // gvMx2linfline
-            // 
-            this.gvMx2linfline.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2linfline.AppearanceCell.Options.UseFont = true;
-            this.gvMx2linfline.Caption = "琛屽彿 ";
-            this.gvMx2linfline.FieldName = "linfline";
-            this.gvMx2linfline.MinWidth = 50;
-            this.gvMx2linfline.Name = "gvMx2linfline";
-            this.gvMx2linfline.Tag = "query_a.LINFLINE";
-            this.gvMx2linfline.Visible = true;
-            this.gvMx2linfline.VisibleIndex = 38;
-            this.gvMx2linfline.Width = 94;
-            // 
-            // gvMx2epItem
-            // 
-            this.gvMx2epItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2epItem.AppearanceCell.Options.UseFont = true;
-            this.gvMx2epItem.Caption = "鐜鐗╂枡 ";
-            this.gvMx2epItem.FieldName = "epItem";
-            this.gvMx2epItem.MinWidth = 50;
-            this.gvMx2epItem.Name = "gvMx2epItem";
-            this.gvMx2epItem.Tag = "query_a.EP_ITEM";
-            this.gvMx2epItem.Visible = true;
-            this.gvMx2epItem.VisibleIndex = 37;
-            this.gvMx2epItem.Width = 94;
-            // 
-            // gvMx2printId
-            // 
-            this.gvMx2printId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2printId.AppearanceCell.Options.UseFont = true;
-            this.gvMx2printId.Caption = "鎵撳嵃ID ";
-            this.gvMx2printId.FieldName = "printId";
-            this.gvMx2printId.MinWidth = 50;
-            this.gvMx2printId.Name = "gvMx2printId";
-            this.gvMx2printId.Tag = "query_a.PRINT_ID";
-            this.gvMx2printId.Visible = true;
-            this.gvMx2printId.VisibleIndex = 36;
-            this.gvMx2printId.Width = 94;
-            // 
-            // gvMx2minpackFlag
-            // 
-            this.gvMx2minpackFlag.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2minpackFlag.AppearanceCell.Options.UseFont = true;
-            this.gvMx2minpackFlag.Caption = "鏄惁鏈�灏忓寘瑁� ";
-            this.gvMx2minpackFlag.FieldName = "minpackFlag";
-            this.gvMx2minpackFlag.MinWidth = 50;
-            this.gvMx2minpackFlag.Name = "gvMx2minpackFlag";
-            this.gvMx2minpackFlag.Tag = "query_a.MINPACK_FLAG";
-            this.gvMx2minpackFlag.Visible = true;
-            this.gvMx2minpackFlag.VisibleIndex = 35;
-            this.gvMx2minpackFlag.Width = 94;
-            // 
-            // gvMx2delanyMonth
-            // 
-            this.gvMx2delanyMonth.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2delanyMonth.AppearanceCell.Options.UseFont = true;
-            this.gvMx2delanyMonth.Caption = "鍙戣揣鏈� ";
-            this.gvMx2delanyMonth.FieldName = "delanyMonth";
-            this.gvMx2delanyMonth.MinWidth = 50;
-            this.gvMx2delanyMonth.Name = "gvMx2delanyMonth";
-            this.gvMx2delanyMonth.Tag = "query_a.DELANY_MONTH";
-            this.gvMx2delanyMonth.Visible = true;
-            this.gvMx2delanyMonth.VisibleIndex = 34;
-            this.gvMx2delanyMonth.Width = 94;
-            // 
-            // gvMx2flezzBy
-            // 
-            this.gvMx2flezzBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2flezzBy.AppearanceCell.Options.UseFont = true;
-            this.gvMx2flezzBy.Caption = "澶栧彂浜� ";
-            this.gvMx2flezzBy.FieldName = "flezzBy";
-            this.gvMx2flezzBy.MinWidth = 50;
-            this.gvMx2flezzBy.Name = "gvMx2flezzBy";
-            this.gvMx2flezzBy.Tag = "query_a.FLEZZ_BY";
-            this.gvMx2flezzBy.Visible = true;
-            this.gvMx2flezzBy.VisibleIndex = 33;
-            this.gvMx2flezzBy.Width = 94;
-            // 
-            // gvMx2flezzReason
-            // 
-            this.gvMx2flezzReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2flezzReason.AppearanceCell.Options.UseFont = true;
-            this.gvMx2flezzReason.Caption = "澶栧彂鍘熷洜 ";
-            this.gvMx2flezzReason.FieldName = "flezzReason";
-            this.gvMx2flezzReason.MinWidth = 50;
-            this.gvMx2flezzReason.Name = "gvMx2flezzReason";
-            this.gvMx2flezzReason.Tag = "query_a.FLEZZ_REASON";
-            this.gvMx2flezzReason.Visible = true;
-            this.gvMx2flezzReason.VisibleIndex = 32;
-            this.gvMx2flezzReason.Width = 94;
-            // 
-            // gvMx2flezzDate
-            // 
-            this.gvMx2flezzDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2flezzDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx2flezzDate.Caption = "鍙戣揣鏃ユ湡 ";
-            this.gvMx2flezzDate.FieldName = "flezzDate";
-            this.gvMx2flezzDate.MinWidth = 50;
-            this.gvMx2flezzDate.Name = "gvMx2flezzDate";
-            this.gvMx2flezzDate.Tag = "query_a.FLEZZ_DATE";
-            this.gvMx2flezzDate.Visible = true;
-            this.gvMx2flezzDate.VisibleIndex = 31;
-            this.gvMx2flezzDate.Width = 94;
-            // 
-            // gvMx2trLotno
-            // 
-            this.gvMx2trLotno.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2trLotno.AppearanceCell.Options.UseFont = true;
-            this.gvMx2trLotno.Caption = "澶栧彂鎵规鍙� ";
-            this.gvMx2trLotno.FieldName = "trLotno";
-            this.gvMx2trLotno.MinWidth = 50;
-            this.gvMx2trLotno.Name = "gvMx2trLotno";
-            this.gvMx2trLotno.Tag = "query_a.TR_LOTNO";
-            this.gvMx2trLotno.Visible = true;
-            this.gvMx2trLotno.VisibleIndex = 30;
-            this.gvMx2trLotno.Width = 94;
-            // 
-            // gvMx2visable
-            // 
-            this.gvMx2visable.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2visable.AppearanceCell.Options.UseFont = true;
-            this.gvMx2visable.Caption = "鏄惁鍙 ";
-            this.gvMx2visable.FieldName = "visable";
-            this.gvMx2visable.MinWidth = 50;
-            this.gvMx2visable.Name = "gvMx2visable";
-            this.gvMx2visable.Tag = "query_a.VISABLE";
-            this.gvMx2visable.Visible = true;
-            this.gvMx2visable.VisibleIndex = 29;
-            this.gvMx2visable.Width = 94;
             // 
             // gvMx2itemSname
             // 
             this.gvMx2itemSname.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
-            this.gvMx2itemSname.FieldName = "itemSname";
+            this.gvMx2itemSname.FieldName = "itemName";
             this.gvMx2itemSname.MinWidth = 50;
             this.gvMx2itemSname.Name = "gvMx2itemSname";
             this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 28;
+            this.gvMx2itemSname.VisibleIndex = 9;
             this.gvMx2itemSname.Width = 94;
-            // 
-            // gvMx2epostion
-            // 
-            this.gvMx2epostion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2epostion.AppearanceCell.Options.UseFont = true;
-            this.gvMx2epostion.Caption = "鍒拌揣浣嶇疆 ";
-            this.gvMx2epostion.FieldName = "epostion";
-            this.gvMx2epostion.MinWidth = 50;
-            this.gvMx2epostion.Name = "gvMx2epostion";
-            this.gvMx2epostion.Tag = "query_a.EPOSTION";
-            this.gvMx2epostion.Visible = true;
-            this.gvMx2epostion.VisibleIndex = 27;
-            this.gvMx2epostion.Width = 94;
-            // 
-            // gvMx2spostion
-            // 
-            this.gvMx2spostion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2spostion.AppearanceCell.Options.UseFont = true;
-            this.gvMx2spostion.Caption = "鍙戣揣浣嶇疆 ";
-            this.gvMx2spostion.FieldName = "spostion";
-            this.gvMx2spostion.MinWidth = 50;
-            this.gvMx2spostion.Name = "gvMx2spostion";
-            this.gvMx2spostion.Tag = "query_a.SPOSTION";
-            this.gvMx2spostion.Visible = true;
-            this.gvMx2spostion.VisibleIndex = 26;
-            this.gvMx2spostion.Width = 94;
-            // 
-            // gvMx2suppNo
-            // 
-            this.gvMx2suppNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2suppNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2suppNo.Caption = "渚涘簲鍟嗙紪鍙� ";
-            this.gvMx2suppNo.FieldName = "suppNo";
-            this.gvMx2suppNo.MinWidth = 50;
-            this.gvMx2suppNo.Name = "gvMx2suppNo";
-            this.gvMx2suppNo.Tag = "query_a.SUPP_NO";
-            this.gvMx2suppNo.Visible = true;
-            this.gvMx2suppNo.VisibleIndex = 25;
-            this.gvMx2suppNo.Width = 94;
-            // 
-            // gvMx2memo
-            // 
-            this.gvMx2memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2memo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2memo.Caption = "澶囨敞 ";
-            this.gvMx2memo.FieldName = "memo";
-            this.gvMx2memo.MinWidth = 50;
-            this.gvMx2memo.Name = "gvMx2memo";
-            this.gvMx2memo.Tag = "query_a.MEMO";
-            this.gvMx2memo.Visible = true;
-            this.gvMx2memo.VisibleIndex = 24;
-            this.gvMx2memo.Width = 94;
-            // 
-            // gvMx2mocode
-            // 
-            this.gvMx2mocode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2mocode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2mocode.Caption = "鎴愬搧鏉$爜 ";
-            this.gvMx2mocode.FieldName = "mocode";
-            this.gvMx2mocode.MinWidth = 50;
-            this.gvMx2mocode.Name = "gvMx2mocode";
-            this.gvMx2mocode.Tag = "query_a.MOCODE";
-            this.gvMx2mocode.Visible = true;
-            this.gvMx2mocode.VisibleIndex = 23;
-            this.gvMx2mocode.Width = 94;
-            // 
-            // gvMx2lotDate
-            // 
-            this.gvMx2lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lotDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lotDate.Caption = "鎵规鏃ユ湡 ";
-            this.gvMx2lotDate.FieldName = "lotDate";
-            this.gvMx2lotDate.MinWidth = 50;
-            this.gvMx2lotDate.Name = "gvMx2lotDate";
-            this.gvMx2lotDate.Tag = "query_a.LOT_DATE";
-            this.gvMx2lotDate.Visible = true;
-            this.gvMx2lotDate.VisibleIndex = 22;
-            this.gvMx2lotDate.Width = 94;
-            // 
-            // gvMx2sumBarcode
-            // 
-            this.gvMx2sumBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2sumBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2sumBarcode.Caption = "姹囨�绘潯鐮� ";
-            this.gvMx2sumBarcode.FieldName = "sumBarcode";
-            this.gvMx2sumBarcode.MinWidth = 50;
-            this.gvMx2sumBarcode.Name = "gvMx2sumBarcode";
-            this.gvMx2sumBarcode.Tag = "query_a.SUM_BARCODE";
-            this.gvMx2sumBarcode.Visible = true;
-            this.gvMx2sumBarcode.VisibleIndex = 21;
-            this.gvMx2sumBarcode.Width = 94;
-            // 
-            // gvMx2oldBarQuantity
-            // 
-            this.gvMx2oldBarQuantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2oldBarQuantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2oldBarQuantity.Caption = "鍘熸潯鐮佹暟閲� ";
-            this.gvMx2oldBarQuantity.FieldName = "oldBarQuantity";
-            this.gvMx2oldBarQuantity.MinWidth = 50;
-            this.gvMx2oldBarQuantity.Name = "gvMx2oldBarQuantity";
-            this.gvMx2oldBarQuantity.Tag = "query_a.OLD_BAR_QUANTITY";
-            this.gvMx2oldBarQuantity.Visible = true;
-            this.gvMx2oldBarQuantity.VisibleIndex = 20;
-            this.gvMx2oldBarQuantity.Width = 94;
-            // 
-            // gvMx2price
-            // 
-            this.gvMx2price.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2price.AppearanceCell.Options.UseFont = true;
-            this.gvMx2price.Caption = "鍗曚环 ";
-            this.gvMx2price.FieldName = "price";
-            this.gvMx2price.MinWidth = 50;
-            this.gvMx2price.Name = "gvMx2price";
-            this.gvMx2price.Tag = "query_a.PRICE";
-            this.gvMx2price.Visible = true;
-            this.gvMx2price.VisibleIndex = 19;
-            this.gvMx2price.Width = 94;
-            // 
-            // gvMx2weightUnit
-            // 
-            this.gvMx2weightUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2weightUnit.AppearanceCell.Options.UseFont = true;
-            this.gvMx2weightUnit.Caption = "閲嶉噺锛堝崟浣嶏細鍏枻锛� ";
-            this.gvMx2weightUnit.FieldName = "weightUnit";
-            this.gvMx2weightUnit.MinWidth = 50;
-            this.gvMx2weightUnit.Name = "gvMx2weightUnit";
-            this.gvMx2weightUnit.Tag = "query_a.WEIGHT_UNIT";
-            this.gvMx2weightUnit.Visible = true;
-            this.gvMx2weightUnit.VisibleIndex = 18;
-            this.gvMx2weightUnit.Width = 94;
             // 
             // gvMx2unit
             // 
@@ -801,99 +236,8 @@
             this.gvMx2unit.Name = "gvMx2unit";
             this.gvMx2unit.Tag = "query_a.UNIT";
             this.gvMx2unit.Visible = true;
-            this.gvMx2unit.VisibleIndex = 17;
+            this.gvMx2unit.VisibleIndex = 7;
             this.gvMx2unit.Width = 94;
-            // 
-            // gvMx2location
-            // 
-            this.gvMx2location.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2location.AppearanceCell.Options.UseFont = true;
-            this.gvMx2location.Caption = "0鍦ㄥ簱锛�1鍦ㄧ嚎锛�2浣滃簾 ";
-            this.gvMx2location.FieldName = "location";
-            this.gvMx2location.MinWidth = 50;
-            this.gvMx2location.Name = "gvMx2location";
-            this.gvMx2location.Tag = "query_a.LOCATION";
-            this.gvMx2location.Visible = true;
-            this.gvMx2location.VisibleIndex = 16;
-            this.gvMx2location.Width = 94;
-            // 
-            // gvMx2useqty
-            // 
-            this.gvMx2useqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2useqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2useqty.Caption = "浣跨敤鏁伴噺 ";
-            this.gvMx2useqty.FieldName = "useqty";
-            this.gvMx2useqty.MinWidth = 50;
-            this.gvMx2useqty.Name = "gvMx2useqty";
-            this.gvMx2useqty.Tag = "query_a.USEQTY";
-            this.gvMx2useqty.Visible = true;
-            this.gvMx2useqty.VisibleIndex = 15;
-            this.gvMx2useqty.Width = 94;
-            // 
-            // gvMx2oldqty
-            // 
-            this.gvMx2oldqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2oldqty.Caption = "鍘熷鏁伴噺 ";
-            this.gvMx2oldqty.FieldName = "oldqty";
-            this.gvMx2oldqty.MinWidth = 50;
-            this.gvMx2oldqty.Name = "gvMx2oldqty";
-            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
-            this.gvMx2oldqty.Visible = true;
-            this.gvMx2oldqty.VisibleIndex = 14;
-            this.gvMx2oldqty.Width = 94;
-            // 
-            // gvMx2rohInId
-            // 
-            this.gvMx2rohInId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2rohInId.AppearanceCell.Options.UseFont = true;
-            this.gvMx2rohInId.Caption = "鏀舵枡琛↖D ";
-            this.gvMx2rohInId.FieldName = "rohInId";
-            this.gvMx2rohInId.MinWidth = 50;
-            this.gvMx2rohInId.Name = "gvMx2rohInId";
-            this.gvMx2rohInId.Tag = "query_a.ROH_IN_ID";
-            this.gvMx2rohInId.Visible = true;
-            this.gvMx2rohInId.VisibleIndex = 13;
-            this.gvMx2rohInId.Width = 94;
-            // 
-            // gvMx2custNo
-            // 
-            this.gvMx2custNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2custNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2custNo.Caption = "瀹㈡埛缂栧彿 ";
-            this.gvMx2custNo.FieldName = "custNo";
-            this.gvMx2custNo.MinWidth = 50;
-            this.gvMx2custNo.Name = "gvMx2custNo";
-            this.gvMx2custNo.Tag = "query_a.CUST_NO";
-            this.gvMx2custNo.Visible = true;
-            this.gvMx2custNo.VisibleIndex = 12;
-            this.gvMx2custNo.Width = 94;
-            // 
-            // gvMx2lastupdateDate
-            // 
-            this.gvMx2lastupdateDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lastupdateDate.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lastupdateDate.Caption = "鏈�鍚庢洿鏂版椂闂� ";
-            this.gvMx2lastupdateDate.FieldName = "lastupdateDate";
-            this.gvMx2lastupdateDate.MinWidth = 50;
-            this.gvMx2lastupdateDate.Name = "gvMx2lastupdateDate";
-            this.gvMx2lastupdateDate.Tag = "query_a.LASTUPDATE_DATE";
-            this.gvMx2lastupdateDate.Visible = true;
-            this.gvMx2lastupdateDate.VisibleIndex = 11;
-            this.gvMx2lastupdateDate.Width = 94;
-            // 
-            // gvMx2lastupdateBy
-            // 
-            this.gvMx2lastupdateBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lastupdateBy.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lastupdateBy.Caption = "鏈�鍚庢洿鏂颁汉 ";
-            this.gvMx2lastupdateBy.FieldName = "lastupdateBy";
-            this.gvMx2lastupdateBy.MinWidth = 50;
-            this.gvMx2lastupdateBy.Name = "gvMx2lastupdateBy";
-            this.gvMx2lastupdateBy.Tag = "query_a.LASTUPDATE_BY";
-            this.gvMx2lastupdateBy.Visible = true;
-            this.gvMx2lastupdateBy.VisibleIndex = 10;
-            this.gvMx2lastupdateBy.Width = 94;
             // 
             // gvMx2createDate
             // 
@@ -905,7 +249,7 @@
             this.gvMx2createDate.Name = "gvMx2createDate";
             this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
             this.gvMx2createDate.Visible = true;
-            this.gvMx2createDate.VisibleIndex = 9;
+            this.gvMx2createDate.VisibleIndex = 6;
             this.gvMx2createDate.Width = 94;
             // 
             // gvMx2createBy
@@ -918,21 +262,8 @@
             this.gvMx2createBy.Name = "gvMx2createBy";
             this.gvMx2createBy.Tag = "query_a.CREATE_BY";
             this.gvMx2createBy.Visible = true;
-            this.gvMx2createBy.VisibleIndex = 8;
+            this.gvMx2createBy.VisibleIndex = 5;
             this.gvMx2createBy.Width = 94;
-            // 
-            // gvMx2taskNo
-            // 
-            this.gvMx2taskNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2taskNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2taskNo.Caption = "鐢熶骇宸ュ崟 ";
-            this.gvMx2taskNo.FieldName = "taskNo";
-            this.gvMx2taskNo.MinWidth = 50;
-            this.gvMx2taskNo.Name = "gvMx2taskNo";
-            this.gvMx2taskNo.Tag = "query_a.TASK_NO";
-            this.gvMx2taskNo.Visible = true;
-            this.gvMx2taskNo.VisibleIndex = 7;
-            this.gvMx2taskNo.Width = 94;
             // 
             // gvMx2quantity
             // 
@@ -944,21 +275,8 @@
             this.gvMx2quantity.Name = "gvMx2quantity";
             this.gvMx2quantity.Tag = "query_a.QUANTITY";
             this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 6;
+            this.gvMx2quantity.VisibleIndex = 4;
             this.gvMx2quantity.Width = 94;
-            // 
-            // gvMx2lotNo
-            // 
-            this.gvMx2lotNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2lotNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2lotNo.Caption = "鍘傚鎵规 ";
-            this.gvMx2lotNo.FieldName = "lotNo";
-            this.gvMx2lotNo.MinWidth = 50;
-            this.gvMx2lotNo.Name = "gvMx2lotNo";
-            this.gvMx2lotNo.Tag = "query_a.LOT_NO";
-            this.gvMx2lotNo.Visible = true;
-            this.gvMx2lotNo.VisibleIndex = 5;
-            this.gvMx2lotNo.Width = 94;
             // 
             // gvMx2itemNo
             // 
@@ -970,47 +288,8 @@
             this.gvMx2itemNo.Name = "gvMx2itemNo";
             this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
             this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 4;
+            this.gvMx2itemNo.VisibleIndex = 3;
             this.gvMx2itemNo.Width = 94;
-            // 
-            // gvMx2cItemCode
-            // 
-            this.gvMx2cItemCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2cItemCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2cItemCode.Caption = "瀹㈡埛鐗╂枡缂栫爜 ";
-            this.gvMx2cItemCode.FieldName = "cItemCode";
-            this.gvMx2cItemCode.MinWidth = 50;
-            this.gvMx2cItemCode.Name = "gvMx2cItemCode";
-            this.gvMx2cItemCode.Tag = "query_a.C_ITEM_CODE";
-            this.gvMx2cItemCode.Visible = true;
-            this.gvMx2cItemCode.VisibleIndex = 3;
-            this.gvMx2cItemCode.Width = 94;
-            // 
-            // gvMx2cItemBarcode
-            // 
-            this.gvMx2cItemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2cItemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2cItemBarcode.Caption = "瀹㈡埛鐗╂枡鏉$爜 ";
-            this.gvMx2cItemBarcode.FieldName = "cItemBarcode";
-            this.gvMx2cItemBarcode.MinWidth = 50;
-            this.gvMx2cItemBarcode.Name = "gvMx2cItemBarcode";
-            this.gvMx2cItemBarcode.Tag = "query_a.C_ITEM_BARCODE";
-            this.gvMx2cItemBarcode.Visible = true;
-            this.gvMx2cItemBarcode.VisibleIndex = 2;
-            this.gvMx2cItemBarcode.Width = 94;
-            // 
-            // gvMx2cProductCode
-            // 
-            this.gvMx2cProductCode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2cProductCode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2cProductCode.Caption = "瀹㈡埛鎴愬搧缂栫爜 ";
-            this.gvMx2cProductCode.FieldName = "cProductCode";
-            this.gvMx2cProductCode.MinWidth = 50;
-            this.gvMx2cProductCode.Name = "gvMx2cProductCode";
-            this.gvMx2cProductCode.Tag = "query_a.C_PRODUCT_CODE";
-            this.gvMx2cProductCode.Visible = true;
-            this.gvMx2cProductCode.VisibleIndex = 1;
-            this.gvMx2cProductCode.Width = 94;
             // 
             // gvMx2itemBarcode
             // 
@@ -1022,7 +301,7 @@
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 0;
+            this.gvMx2itemBarcode.VisibleIndex = 2;
             this.gvMx2itemBarcode.Width = 94;
             // 
             // gvMx2guid
@@ -1040,7 +319,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 445);
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 417);
             this.tabMxPage2.Text = "鏉$爜鏄庣粏";
             // 
             // gcMx2
@@ -1049,81 +328,74 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1124, 445);
+            this.gcMx2.Size = new System.Drawing.Size(1124, 417);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
             // 
             // gvMx2
             // 
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.ColumnPanelRowHeight = 50;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
+            this.gridColumn20,
+            this.gridColumn19,
             this.gvMx2itemBarcode,
-            this.gvMx2cProductCode,
-            this.gvMx2cItemBarcode,
-            this.gvMx2cItemCode,
             this.gvMx2itemNo,
-            this.gvMx2lotNo,
             this.gvMx2quantity,
-            this.gvMx2taskNo,
             this.gvMx2createBy,
             this.gvMx2createDate,
-            this.gvMx2lastupdateBy,
-            this.gvMx2lastupdateDate,
-            this.gvMx2custNo,
-            this.gvMx2rohInId,
-            this.gvMx2oldqty,
-            this.gvMx2useqty,
-            this.gvMx2location,
             this.gvMx2unit,
-            this.gvMx2weightUnit,
-            this.gvMx2price,
-            this.gvMx2oldBarQuantity,
-            this.gvMx2sumBarcode,
-            this.gvMx2lotDate,
-            this.gvMx2mocode,
-            this.gvMx2memo,
-            this.gvMx2suppNo,
-            this.gvMx2spostion,
-            this.gvMx2epostion,
+            this.gridColumn18,
             this.gvMx2itemSname,
-            this.gvMx2visable,
-            this.gvMx2trLotno,
-            this.gvMx2flezzDate,
-            this.gvMx2flezzReason,
-            this.gvMx2flezzBy,
-            this.gvMx2delanyMonth,
-            this.gvMx2minpackFlag,
-            this.gvMx2printId,
-            this.gvMx2epItem,
-            this.gvMx2linfline,
-            this.gvMx2validTime,
-            this.gvMx2iqcStatus,
-            this.gvMx2fcar,
-            this.gvMx2gweight,
-            this.gvMx2nweight,
-            this.gvMx2barcodetype,
-            this.gvMx2suppName,
-            this.gvMx2billNo,
-            this.gvMx2urgentFlag,
-            this.gvMx2colorName,
-            this.gvMx2boardStyle,
-            this.gvMx2insDate,
-            this.gvMx2workLine,
-            this.gvMx2memoBad,
-            this.gvMx2workNo,
-            this.gvMx2comeFlg,
-            this.gvMx2lineNo,
-            this.gvMx2workFlg,
-            this.gvMx2workLast,
-            this.gvMx2workFlgtime,
-            this.gvMx2itemId});
+            this.gridColumn17});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鎶ュ伐鏍囪瘑";
+            this.gridColumn20.MaxWidth = 50;
+            this.gridColumn20.MinWidth = 50;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 0;
+            this.gridColumn20.Width = 50;
+            // 
+            // gridColumn19
+            // 
+            this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
+            this.gridColumn19.MaxWidth = 50;
+            this.gridColumn19.MinWidth = 50;
+            this.gridColumn19.Name = "gridColumn19";
+            this.gridColumn19.Visible = true;
+            this.gridColumn19.VisibleIndex = 1;
+            this.gridColumn19.Width = 50;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn18.FieldName = "itemNo";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 8;
+            this.gridColumn18.Width = 94;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn17.FieldName = "itemModel";
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 10;
+            this.gridColumn17.Width = 94;
             // 
             // gvMx1zyBl
             // 
@@ -1134,8 +406,6 @@
             this.gvMx1zyBl.MinWidth = 50;
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
-            this.gvMx1zyBl.Visible = true;
-            this.gvMx1zyBl.VisibleIndex = 26;
             this.gvMx1zyBl.Width = 94;
             // 
             // gvMx1llBl
@@ -1147,8 +417,6 @@
             this.gvMx1llBl.MinWidth = 50;
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
-            this.gvMx1llBl.Visible = true;
-            this.gvMx1llBl.VisibleIndex = 11;
             this.gvMx1llBl.Width = 94;
             // 
             // gvMx1lpTl
@@ -1160,8 +428,6 @@
             this.gvMx1lpTl.MinWidth = 50;
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
-            this.gvMx1lpTl.Visible = true;
-            this.gvMx1lpTl.VisibleIndex = 12;
             this.gvMx1lpTl.Width = 94;
             // 
             // gvMx1dab023
@@ -1173,8 +439,6 @@
             this.gvMx1dab023.MinWidth = 50;
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
-            this.gvMx1dab023.Visible = true;
-            this.gvMx1dab023.VisibleIndex = 25;
             this.gvMx1dab023.Width = 94;
             // 
             // gvMx1dab022
@@ -1186,8 +450,6 @@
             this.gvMx1dab022.MinWidth = 50;
             this.gvMx1dab022.Name = "gvMx1dab022";
             this.gvMx1dab022.Tag = "query_a.dab022";
-            this.gvMx1dab022.Visible = true;
-            this.gvMx1dab022.VisibleIndex = 24;
             this.gvMx1dab022.Width = 94;
             // 
             // gvMx1dab021
@@ -1199,8 +461,6 @@
             this.gvMx1dab021.MinWidth = 50;
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
-            this.gvMx1dab021.Visible = true;
-            this.gvMx1dab021.VisibleIndex = 13;
             this.gvMx1dab021.Width = 94;
             // 
             // gvMx1dab020
@@ -1212,8 +472,6 @@
             this.gvMx1dab020.MinWidth = 50;
             this.gvMx1dab020.Name = "gvMx1dab020";
             this.gvMx1dab020.Tag = "query_a.dab020";
-            this.gvMx1dab020.Visible = true;
-            this.gvMx1dab020.VisibleIndex = 23;
             this.gvMx1dab020.Width = 94;
             // 
             // gvMx1scraprate
@@ -1225,8 +483,6 @@
             this.gvMx1scraprate.MinWidth = 50;
             this.gvMx1scraprate.Name = "gvMx1scraprate";
             this.gvMx1scraprate.Tag = "query_a.scraprate";
-            this.gvMx1scraprate.Visible = true;
-            this.gvMx1scraprate.VisibleIndex = 10;
             this.gvMx1scraprate.Width = 94;
             // 
             // gvMx1scrapqty
@@ -1238,8 +494,6 @@
             this.gvMx1scrapqty.MinWidth = 50;
             this.gvMx1scrapqty.Name = "gvMx1scrapqty";
             this.gvMx1scrapqty.Tag = "query_a.scrapqty";
-            this.gvMx1scrapqty.Visible = true;
-            this.gvMx1scrapqty.VisibleIndex = 9;
             this.gvMx1scrapqty.Width = 94;
             // 
             // gvMx1dab019
@@ -1251,8 +505,6 @@
             this.gvMx1dab019.MinWidth = 50;
             this.gvMx1dab019.Name = "gvMx1dab019";
             this.gvMx1dab019.Tag = "query_a.dab019";
-            this.gvMx1dab019.Visible = true;
-            this.gvMx1dab019.VisibleIndex = 22;
             this.gvMx1dab019.Width = 94;
             // 
             // gvMx1dab015
@@ -1264,8 +516,6 @@
             this.gvMx1dab015.MinWidth = 50;
             this.gvMx1dab015.Name = "gvMx1dab015";
             this.gvMx1dab015.Tag = "query_a.dab015";
-            this.gvMx1dab015.Visible = true;
-            this.gvMx1dab015.VisibleIndex = 17;
             this.gvMx1dab015.Width = 94;
             // 
             // gvMx1dab014
@@ -1278,7 +528,7 @@
             this.gvMx1dab014.Name = "gvMx1dab014";
             this.gvMx1dab014.Tag = "query_a.dab014";
             this.gvMx1dab014.Visible = true;
-            this.gvMx1dab014.VisibleIndex = 19;
+            this.gvMx1dab014.VisibleIndex = 8;
             this.gvMx1dab014.Width = 94;
             // 
             // gvMx1dab013
@@ -1290,8 +540,6 @@
             this.gvMx1dab013.MinWidth = 50;
             this.gvMx1dab013.Name = "gvMx1dab013";
             this.gvMx1dab013.Tag = "query_a.dab013";
-            this.gvMx1dab013.Visible = true;
-            this.gvMx1dab013.VisibleIndex = 16;
             this.gvMx1dab013.Width = 94;
             // 
             // gvMx1dab012
@@ -1304,7 +552,7 @@
             this.gvMx1dab012.Name = "gvMx1dab012";
             this.gvMx1dab012.Tag = "query_a.dab012";
             this.gvMx1dab012.Visible = true;
-            this.gvMx1dab012.VisibleIndex = 18;
+            this.gvMx1dab012.VisibleIndex = 11;
             this.gvMx1dab012.Width = 94;
             // 
             // gvMx1dab011
@@ -1316,8 +564,6 @@
             this.gvMx1dab011.MinWidth = 50;
             this.gvMx1dab011.Name = "gvMx1dab011";
             this.gvMx1dab011.Tag = "query_a.dab011";
-            this.gvMx1dab011.Visible = true;
-            this.gvMx1dab011.VisibleIndex = 15;
             this.gvMx1dab011.Width = 94;
             // 
             // gvMx1dab010
@@ -1329,8 +575,6 @@
             this.gvMx1dab010.MinWidth = 50;
             this.gvMx1dab010.Name = "gvMx1dab010";
             this.gvMx1dab010.Tag = "query_a.dab010";
-            this.gvMx1dab010.Visible = true;
-            this.gvMx1dab010.VisibleIndex = 14;
             this.gvMx1dab010.Width = 94;
             // 
             // gvMx1dab009
@@ -1343,7 +587,7 @@
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
-            this.gvMx1dab009.VisibleIndex = 4;
+            this.gvMx1dab009.VisibleIndex = 12;
             this.gvMx1dab009.Width = 94;
             // 
             // gvMx1dab007
@@ -1356,7 +600,7 @@
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
             this.gvMx1dab007.Visible = true;
-            this.gvMx1dab007.VisibleIndex = 8;
+            this.gvMx1dab007.VisibleIndex = 6;
             this.gvMx1dab007.Width = 94;
             // 
             // gvMx1dab006
@@ -1369,7 +613,7 @@
             this.gvMx1dab006.Name = "gvMx1dab006";
             this.gvMx1dab006.Tag = "query_a.dab006";
             this.gvMx1dab006.Visible = true;
-            this.gvMx1dab006.VisibleIndex = 7;
+            this.gvMx1dab006.VisibleIndex = 5;
             this.gvMx1dab006.Width = 94;
             // 
             // gvMx1dab005
@@ -1382,7 +626,7 @@
             this.gvMx1dab005.Name = "gvMx1dab005";
             this.gvMx1dab005.Tag = "query_a.dab005";
             this.gvMx1dab005.Visible = true;
-            this.gvMx1dab005.VisibleIndex = 5;
+            this.gvMx1dab005.VisibleIndex = 4;
             this.gvMx1dab005.Width = 94;
             // 
             // gvMx1dab004
@@ -1395,7 +639,7 @@
             this.gvMx1dab004.Name = "gvMx1dab004";
             this.gvMx1dab004.Tag = "query_a.dab004";
             this.gvMx1dab004.Visible = true;
-            this.gvMx1dab004.VisibleIndex = 4;
+            this.gvMx1dab004.VisibleIndex = 3;
             this.gvMx1dab004.Width = 94;
             // 
             // gvMx1dab003
@@ -1408,7 +652,7 @@
             this.gvMx1dab003.Name = "gvMx1dab003";
             this.gvMx1dab003.Tag = "query_a.dab003";
             this.gvMx1dab003.Visible = true;
-            this.gvMx1dab003.VisibleIndex = 1;
+            this.gvMx1dab003.VisibleIndex = 2;
             this.gvMx1dab003.Width = 94;
             // 
             // gvMx1dab001
@@ -1421,14 +665,14 @@
             this.gvMx1dab001.Name = "gvMx1dab001";
             this.gvMx1dab001.Tag = "query_a.dab001";
             this.gvMx1dab001.Visible = true;
-            this.gvMx1dab001.VisibleIndex = 2;
+            this.gvMx1dab001.VisibleIndex = 1;
             this.gvMx1dab001.Width = 94;
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 445);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 417);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
@@ -1437,7 +681,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1124, 445);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 417);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1449,13 +693,19 @@
             this.gvMx1.ColumnPanelRowHeight = 50;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1Guid,
+            this.gridColumn13,
             this.gvMx1dab001,
             this.gvMx1dab003,
             this.gvMx1dab004,
             this.gvMx1dab005,
-            this.gvMx1dab009,
             this.gvMx1dab006,
             this.gvMx1dab007,
+            this.gridColumn14,
+            this.gvMx1dab014,
+            this.gridColumn15,
+            this.gridColumn16,
+            this.gvMx1dab012,
+            this.gvMx1dab009,
             this.gvMx1scrapqty,
             this.gvMx1scraprate,
             this.gvMx1zyBl,
@@ -1466,8 +716,6 @@
             this.gvMx1dab011,
             this.gvMx1dab013,
             this.gvMx1dab015,
-            this.gvMx1dab012,
-            this.gvMx1dab014,
             this.gvMx1dab019,
             this.gvMx1dab020,
             this.gvMx1dab022,
@@ -1476,7 +724,6 @@
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
             // 
             // gvMx1Guid
@@ -1487,18 +734,55 @@
             this.gvMx1Guid.Name = "gvMx1Guid";
             this.gvMx1Guid.Width = 94;
             // 
+            // gridColumn13
+            // 
+            this.gridColumn13.Caption = "搴忓彿";
+            this.gridColumn13.FieldName = "dab002";
+            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.Name = "gridColumn13";
+            this.gridColumn13.Visible = true;
+            this.gridColumn13.VisibleIndex = 0;
+            this.gridColumn13.Width = 94;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "鍓╀綑鍙";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 7;
+            this.gridColumn14.Width = 94;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "寤鸿浠撳簱";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 9;
+            this.gridColumn15.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "鍙戞枡鏂瑰紡";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 10;
+            this.gridColumn16.Width = 94;
+            // 
             // gv_cust
             // 
             this.gv_cust.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_cust.AppearanceCell.Options.UseFont = true;
-            this.gv_cust.Caption = "閿�鍞崟鍙�";
+            this.gv_cust.Caption = "闇�姹傚崟鍙�";
             this.gv_cust.FieldName = "saleNo";
-            this.gv_cust.MinWidth = 100;
+            this.gv_cust.MinWidth = 50;
             this.gv_cust.Name = "gv_cust";
             this.gv_cust.OptionsColumn.AllowEdit = false;
             this.gv_cust.Tag = "query_a.cust";
             this.gv_cust.Visible = true;
-            this.gv_cust.VisibleIndex = 28;
+            this.gv_cust.VisibleIndex = 22;
             this.gv_cust.Width = 100;
             // 
             // gv_prepareTime
@@ -1507,12 +791,12 @@
             this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
             this.gv_prepareTime.Caption = "棰勮澶囨枡鏃堕棿";
             this.gv_prepareTime.FieldName = "prepareTime";
-            this.gv_prepareTime.MinWidth = 180;
+            this.gv_prepareTime.MinWidth = 50;
             this.gv_prepareTime.Name = "gv_prepareTime";
             this.gv_prepareTime.OptionsColumn.AllowEdit = false;
             this.gv_prepareTime.Tag = "query_a.prepare_time";
             this.gv_prepareTime.Visible = true;
-            this.gv_prepareTime.VisibleIndex = 19;
+            this.gv_prepareTime.VisibleIndex = 26;
             this.gv_prepareTime.Width = 180;
             // 
             // gv_mesEndProd
@@ -1521,12 +805,12 @@
             this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
             this.gv_mesEndProd.Caption = "MES棰勮瀹屽伐鏃堕棿";
             this.gv_mesEndProd.FieldName = "mesEndProd";
-            this.gv_mesEndProd.MinWidth = 180;
+            this.gv_mesEndProd.MinWidth = 50;
             this.gv_mesEndProd.Name = "gv_mesEndProd";
             this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
             this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
             this.gv_mesEndProd.Visible = true;
-            this.gv_mesEndProd.VisibleIndex = 27;
+            this.gv_mesEndProd.VisibleIndex = 31;
             this.gv_mesEndProd.Width = 180;
             // 
             // gv_mesStartProd
@@ -1535,12 +819,12 @@
             this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
             this.gv_mesStartProd.Caption = "MES棰勮寮�宸ユ椂闂�";
             this.gv_mesStartProd.FieldName = "mesStartProd";
-            this.gv_mesStartProd.MinWidth = 180;
+            this.gv_mesStartProd.MinWidth = 50;
             this.gv_mesStartProd.Name = "gv_mesStartProd";
             this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
             this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
             this.gv_mesStartProd.Visible = true;
-            this.gv_mesStartProd.VisibleIndex = 26;
+            this.gv_mesStartProd.VisibleIndex = 30;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_daa028
@@ -1549,12 +833,12 @@
             this.gv_daa028.AppearanceCell.Options.UseFont = true;
             this.gv_daa028.Caption = "澶囨枡瀹屾垚鏃堕棿";
             this.gv_daa028.FieldName = "daa028";
-            this.gv_daa028.MinWidth = 180;
+            this.gv_daa028.MinWidth = 50;
             this.gv_daa028.Name = "gv_daa028";
             this.gv_daa028.OptionsColumn.AllowEdit = false;
             this.gv_daa028.Tag = "query_a.daa028";
             this.gv_daa028.Visible = true;
-            this.gv_daa028.VisibleIndex = 20;
+            this.gv_daa028.VisibleIndex = 27;
             this.gv_daa028.Width = 180;
             // 
             // gv_daa027
@@ -1578,34 +862,34 @@
             // 
             this.lb_daa021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa021.Appearance.Options.UseFont = true;
-            this.lb_daa021.Location = new System.Drawing.Point(248, 20);
+            this.lb_daa021.Location = new System.Drawing.Point(15, 52);
             this.lb_daa021.Name = "lb_daa021";
-            this.lb_daa021.Size = new System.Drawing.Size(90, 21);
+            this.lb_daa021.Size = new System.Drawing.Size(68, 21);
             this.lb_daa021.TabIndex = 327;
-            this.lb_daa021.Text = "浠诲姟鍗曞崟鍙� ";
+            this.lb_daa021.Text = "鎶曟枡鍗曞彿";
             // 
             // txt_daa021
             // 
-            this.txt_daa021.Enabled = false;
-            this.txt_daa021.Location = new System.Drawing.Point(348, 16);
+            this.txt_daa021.Location = new System.Drawing.Point(90, 48);
             this.txt_daa021.Name = "txt_daa021";
             this.txt_daa021.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa021.Properties.Appearance.Options.UseFont = true;
             this.txt_daa021.Size = new System.Drawing.Size(150, 28);
             this.txt_daa021.TabIndex = 327;
+            this.txt_daa021.Tag = "readonly";
             // 
             // gv_daa021
             // 
             this.gv_daa021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_daa021.AppearanceCell.Options.UseFont = true;
-            this.gv_daa021.Caption = "浠诲姟鍗曞崟鍙�";
+            this.gv_daa021.Caption = "鎶曟枡鍗曞彿";
             this.gv_daa021.FieldName = "daa021";
-            this.gv_daa021.MinWidth = 100;
+            this.gv_daa021.MinWidth = 50;
             this.gv_daa021.Name = "gv_daa021";
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
-            this.gv_daa021.VisibleIndex = 11;
+            this.gv_daa021.VisibleIndex = 12;
             this.gv_daa021.Width = 100;
             // 
             // gv_daa018
@@ -1626,21 +910,21 @@
             // 
             this.lb_daa017.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa017.Appearance.Options.UseFont = true;
-            this.lb_daa017.Location = new System.Drawing.Point(762, 116);
+            this.lb_daa017.Location = new System.Drawing.Point(741, 117);
             this.lb_daa017.Name = "lb_daa017";
-            this.lb_daa017.Size = new System.Drawing.Size(85, 21);
+            this.lb_daa017.Size = new System.Drawing.Size(102, 21);
             this.lb_daa017.TabIndex = 280;
-            this.lb_daa017.Text = "瀹為檯瀹屽伐鏃�";
+            this.lb_daa017.Text = "瀹為檯瀹屽伐鏃堕棿";
             // 
             // txt_daa017
             // 
-            this.txt_daa017.Enabled = false;
-            this.txt_daa017.Location = new System.Drawing.Point(859, 112);
+            this.txt_daa017.Location = new System.Drawing.Point(848, 113);
             this.txt_daa017.Name = "txt_daa017";
             this.txt_daa017.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa017.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017.Size = new System.Drawing.Size(150, 28);
+            this.txt_daa017.Size = new System.Drawing.Size(176, 28);
             this.txt_daa017.TabIndex = 280;
+            this.txt_daa017.Tag = "readonly";
             // 
             // gv_daa017
             // 
@@ -1648,33 +932,33 @@
             this.gv_daa017.AppearanceCell.Options.UseFont = true;
             this.gv_daa017.Caption = "瀹為檯瀹屽伐鏃�";
             this.gv_daa017.FieldName = "daa017";
-            this.gv_daa017.MinWidth = 180;
+            this.gv_daa017.MinWidth = 50;
             this.gv_daa017.Name = "gv_daa017";
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 25;
+            this.gv_daa017.VisibleIndex = 29;
             this.gv_daa017.Width = 180;
             // 
             // lb_daa016
             // 
             this.lb_daa016.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa016.Appearance.Options.UseFont = true;
-            this.lb_daa016.Location = new System.Drawing.Point(762, 86);
+            this.lb_daa016.Location = new System.Drawing.Point(741, 84);
             this.lb_daa016.Name = "lb_daa016";
-            this.lb_daa016.Size = new System.Drawing.Size(85, 21);
+            this.lb_daa016.Size = new System.Drawing.Size(102, 21);
             this.lb_daa016.TabIndex = 273;
-            this.lb_daa016.Text = "瀹為檯寮�宸ユ棩";
+            this.lb_daa016.Text = "瀹為檯寮�宸ユ椂闂�";
             // 
             // txt_daa016
             // 
-            this.txt_daa016.Enabled = false;
-            this.txt_daa016.Location = new System.Drawing.Point(859, 82);
+            this.txt_daa016.Location = new System.Drawing.Point(848, 80);
             this.txt_daa016.Name = "txt_daa016";
             this.txt_daa016.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa016.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016.Size = new System.Drawing.Size(150, 28);
+            this.txt_daa016.Size = new System.Drawing.Size(176, 28);
             this.txt_daa016.TabIndex = 273;
+            this.txt_daa016.Tag = "readonly";
             // 
             // gv_daa016
             // 
@@ -1682,33 +966,33 @@
             this.gv_daa016.AppearanceCell.Options.UseFont = true;
             this.gv_daa016.Caption = "瀹為檯寮�宸ユ棩";
             this.gv_daa016.FieldName = "daa016";
-            this.gv_daa016.MinWidth = 180;
+            this.gv_daa016.MinWidth = 50;
             this.gv_daa016.Name = "gv_daa016";
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 24;
+            this.gv_daa016.VisibleIndex = 28;
             this.gv_daa016.Width = 180;
             // 
             // lb_daa015
             // 
             this.lb_daa015.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa015.Appearance.Options.UseFont = true;
-            this.lb_daa015.Location = new System.Drawing.Point(265, 86);
+            this.lb_daa015.Location = new System.Drawing.Point(265, 52);
             this.lb_daa015.Name = "lb_daa015";
-            this.lb_daa015.Size = new System.Drawing.Size(73, 21);
+            this.lb_daa015.Size = new System.Drawing.Size(68, 21);
             this.lb_daa015.TabIndex = 267;
-            this.lb_daa015.Text = "鐢熶骇绾垮埆 ";
+            this.lb_daa015.Text = "鐢熶骇绾垮埆";
             // 
             // txt_daa015
             // 
-            this.txt_daa015.Enabled = false;
-            this.txt_daa015.Location = new System.Drawing.Point(348, 82);
+            this.txt_daa015.Location = new System.Drawing.Point(339, 48);
             this.txt_daa015.Name = "txt_daa015";
             this.txt_daa015.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa015.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa015.Size = new System.Drawing.Size(150, 28);
+            this.txt_daa015.Size = new System.Drawing.Size(159, 28);
             this.txt_daa015.TabIndex = 267;
+            this.txt_daa015.Tag = "readonly";
             // 
             // gv_daa015
             // 
@@ -1716,39 +1000,39 @@
             this.gv_daa015.AppearanceCell.Options.UseFont = true;
             this.gv_daa015.Caption = "鐢熶骇绾垮埆";
             this.gv_daa015.FieldName = "daa015";
-            this.gv_daa015.MinWidth = 80;
+            this.gv_daa015.MinWidth = 50;
             this.gv_daa015.Name = "gv_daa015";
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 17;
+            this.gv_daa015.VisibleIndex = 24;
             this.gv_daa015.Width = 94;
             // 
             // lb_daa013
             // 
             this.lb_daa013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa013.Appearance.Options.UseFont = true;
-            this.lb_daa013.Location = new System.Drawing.Point(265, 52);
+            this.lb_daa013.Location = new System.Drawing.Point(265, 20);
             this.lb_daa013.Name = "lb_daa013";
-            this.lb_daa013.Size = new System.Drawing.Size(73, 21);
+            this.lb_daa013.Size = new System.Drawing.Size(68, 21);
             this.lb_daa013.TabIndex = 258;
-            this.lb_daa013.Text = "宸ヤ綔杞﹂棿 ";
+            this.lb_daa013.Text = "宸ヤ綔杞﹂棿";
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Enabled = false;
-            this.txt_dptName.Location = new System.Drawing.Point(348, 48);
+            this.txt_dptName.Location = new System.Drawing.Point(339, 16);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(150, 28);
+            this.txt_dptName.Size = new System.Drawing.Size(159, 28);
             this.txt_dptName.TabIndex = 258;
+            this.txt_dptName.Tag = "readonly";
             // 
             // lb_daa011
             // 
             this.lb_daa011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa011.Appearance.Options.UseFont = true;
-            this.lb_daa011.Location = new System.Drawing.Point(516, 86);
+            this.lb_daa011.Location = new System.Drawing.Point(509, 84);
             this.lb_daa011.Name = "lb_daa011";
             this.lb_daa011.Size = new System.Drawing.Size(73, 21);
             this.lb_daa011.TabIndex = 247;
@@ -1756,13 +1040,13 @@
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Enabled = false;
-            this.txt_daa011.Location = new System.Drawing.Point(589, 82);
+            this.txt_daa011.Location = new System.Drawing.Point(582, 80);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
             this.txt_daa011.Size = new System.Drawing.Size(150, 28);
             this.txt_daa011.TabIndex = 247;
+            this.txt_daa011.Tag = "readonly";
             // 
             // gv_daa011
             // 
@@ -1770,19 +1054,20 @@
             this.gv_daa011.AppearanceCell.Options.UseFont = true;
             this.gv_daa011.Caption = "宸茬敓浜ч噺";
             this.gv_daa011.FieldName = "daa011";
+            this.gv_daa011.MaxWidth = 50;
             this.gv_daa011.MinWidth = 50;
             this.gv_daa011.Name = "gv_daa011";
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
             this.gv_daa011.Visible = true;
-            this.gv_daa011.VisibleIndex = 22;
-            this.gv_daa011.Width = 94;
+            this.gv_daa011.VisibleIndex = 17;
+            this.gv_daa011.Width = 50;
             // 
             // lb_daa010
             // 
             this.lb_daa010.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa010.Appearance.Options.UseFont = true;
-            this.lb_daa010.Location = new System.Drawing.Point(516, 52);
+            this.lb_daa010.Location = new System.Drawing.Point(509, 52);
             this.lb_daa010.Name = "lb_daa010";
             this.lb_daa010.Size = new System.Drawing.Size(73, 21);
             this.lb_daa010.TabIndex = 243;
@@ -1790,13 +1075,13 @@
             // 
             // txt_daa010
             // 
-            this.txt_daa010.Enabled = false;
-            this.txt_daa010.Location = new System.Drawing.Point(589, 48);
+            this.txt_daa010.Location = new System.Drawing.Point(582, 48);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
             this.txt_daa010.Size = new System.Drawing.Size(150, 28);
             this.txt_daa010.TabIndex = 243;
+            this.txt_daa010.Tag = "readonly";
             // 
             // gv_daa010
             // 
@@ -1804,33 +1089,34 @@
             this.gv_daa010.AppearanceCell.Options.UseFont = true;
             this.gv_daa010.Caption = "鍏ュ簱鏁伴噺";
             this.gv_daa010.FieldName = "daa010";
+            this.gv_daa010.MaxWidth = 50;
             this.gv_daa010.MinWidth = 50;
             this.gv_daa010.Name = "gv_daa010";
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 23;
-            this.gv_daa010.Width = 94;
+            this.gv_daa010.VisibleIndex = 20;
+            this.gv_daa010.Width = 50;
             // 
             // lb_daa009
             // 
             this.lb_daa009.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa009.Appearance.Options.UseFont = true;
-            this.lb_daa009.Location = new System.Drawing.Point(299, 116);
+            this.lb_daa009.Location = new System.Drawing.Point(265, 84);
             this.lb_daa009.Name = "lb_daa009";
-            this.lb_daa009.Size = new System.Drawing.Size(39, 21);
+            this.lb_daa009.Size = new System.Drawing.Size(68, 21);
             this.lb_daa009.TabIndex = 240;
-            this.lb_daa009.Text = "澶囨敞 ";
+            this.lb_daa009.Text = "宸ュ崟澶囨敞";
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Enabled = false;
-            this.txt_daa009.Location = new System.Drawing.Point(348, 112);
+            this.txt_daa009.Location = new System.Drawing.Point(339, 80);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(150, 28);
+            this.txt_daa009.Size = new System.Drawing.Size(159, 28);
             this.txt_daa009.TabIndex = 240;
+            this.txt_daa009.Tag = "readonly";
             // 
             // gv_daa009
             // 
@@ -1843,14 +1129,14 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 18;
+            this.gv_daa009.VisibleIndex = 19;
             this.gv_daa009.Width = 94;
             // 
             // lb_daa008
             // 
             this.lb_daa008.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa008.Appearance.Options.UseFont = true;
-            this.lb_daa008.Location = new System.Drawing.Point(516, 20);
+            this.lb_daa008.Location = new System.Drawing.Point(509, 20);
             this.lb_daa008.Name = "lb_daa008";
             this.lb_daa008.Size = new System.Drawing.Size(73, 21);
             this.lb_daa008.TabIndex = 235;
@@ -1858,13 +1144,13 @@
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Enabled = false;
-            this.txt_daa008.Location = new System.Drawing.Point(589, 16);
+            this.txt_daa008.Location = new System.Drawing.Point(582, 16);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
             this.txt_daa008.Size = new System.Drawing.Size(150, 28);
             this.txt_daa008.TabIndex = 235;
+            this.txt_daa008.Tag = "readonly";
             // 
             // gv_daa008
             // 
@@ -1872,19 +1158,20 @@
             this.gv_daa008.AppearanceCell.Options.UseFont = true;
             this.gv_daa008.Caption = "宸ュ崟鏁伴噺";
             this.gv_daa008.FieldName = "daa008";
+            this.gv_daa008.MaxWidth = 50;
             this.gv_daa008.MinWidth = 50;
             this.gv_daa008.Name = "gv_daa008";
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 14;
-            this.gv_daa008.Width = 94;
+            this.gv_daa008.VisibleIndex = 16;
+            this.gv_daa008.Width = 50;
             // 
             // lb_daa005
             // 
             this.lb_daa005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa005.Appearance.Options.UseFont = true;
-            this.lb_daa005.Location = new System.Drawing.Point(550, 116);
+            this.lb_daa005.Location = new System.Drawing.Point(543, 117);
             this.lb_daa005.Name = "lb_daa005";
             this.lb_daa005.Size = new System.Drawing.Size(39, 21);
             this.lb_daa005.TabIndex = 226;
@@ -1892,13 +1179,13 @@
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Enabled = false;
-            this.txt_dwName.Location = new System.Drawing.Point(589, 112);
+            this.txt_dwName.Location = new System.Drawing.Point(582, 113);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
             this.txt_dwName.Size = new System.Drawing.Size(150, 28);
             this.txt_dwName.TabIndex = 226;
+            this.txt_dwName.Tag = "readonly";
             // 
             // gv_daa005
             // 
@@ -1906,33 +1193,34 @@
             this.gv_daa005.AppearanceCell.Options.UseFont = true;
             this.gv_daa005.Caption = "鍗曚綅";
             this.gv_daa005.FieldName = "fname";
+            this.gv_daa005.MaxWidth = 50;
             this.gv_daa005.MinWidth = 50;
             this.gv_daa005.Name = "gv_daa005";
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
             this.gv_daa005.VisibleIndex = 21;
-            this.gv_daa005.Width = 94;
+            this.gv_daa005.Width = 50;
             // 
             // lb_daa004
             // 
             this.lb_daa004.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa004.Appearance.Options.UseFont = true;
-            this.lb_daa004.Location = new System.Drawing.Point(12, 116);
+            this.lb_daa004.Location = new System.Drawing.Point(15, 150);
             this.lb_daa004.Name = "lb_daa004";
-            this.lb_daa004.Size = new System.Drawing.Size(73, 21);
+            this.lb_daa004.Size = new System.Drawing.Size(68, 21);
             this.lb_daa004.TabIndex = 222;
-            this.lb_daa004.Text = "浜у搧瑙勬牸 ";
+            this.lb_daa004.Text = "浜у搧瑙勬牸";
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Enabled = false;
-            this.txt_daa004.Location = new System.Drawing.Point(90, 112);
+            this.txt_daa004.Location = new System.Drawing.Point(90, 146);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(150, 28);
+            this.txt_daa004.Size = new System.Drawing.Size(408, 28);
             this.txt_daa004.TabIndex = 222;
+            this.txt_daa004.Tag = "readonly";
             // 
             // gv_daa004
             // 
@@ -1940,33 +1228,33 @@
             this.gv_daa004.AppearanceCell.Options.UseFont = true;
             this.gv_daa004.Caption = "浜у搧瑙勬牸";
             this.gv_daa004.FieldName = "daa004";
-            this.gv_daa004.MinWidth = 150;
+            this.gv_daa004.MinWidth = 50;
             this.gv_daa004.Name = "gv_daa004";
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 13;
+            this.gv_daa004.VisibleIndex = 15;
             this.gv_daa004.Width = 150;
             // 
             // lb_daa003
             // 
             this.lb_daa003.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa003.Appearance.Options.UseFont = true;
-            this.lb_daa003.Location = new System.Drawing.Point(12, 86);
+            this.lb_daa003.Location = new System.Drawing.Point(265, 117);
             this.lb_daa003.Name = "lb_daa003";
-            this.lb_daa003.Size = new System.Drawing.Size(73, 21);
+            this.lb_daa003.Size = new System.Drawing.Size(68, 21);
             this.lb_daa003.TabIndex = 219;
-            this.lb_daa003.Text = "浜у搧鍚嶇О ";
+            this.lb_daa003.Text = "浜у搧鍚嶇О";
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Enabled = false;
-            this.txt_daa003.Location = new System.Drawing.Point(90, 82);
+            this.txt_daa003.Location = new System.Drawing.Point(339, 113);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(150, 28);
+            this.txt_daa003.Size = new System.Drawing.Size(159, 28);
             this.txt_daa003.TabIndex = 219;
+            this.txt_daa003.Tag = "readonly";
             // 
             // gv_daa003
             // 
@@ -1974,19 +1262,19 @@
             this.gv_daa003.AppearanceCell.Options.UseFont = true;
             this.gv_daa003.Caption = "浜у搧鍚嶇О";
             this.gv_daa003.FieldName = "daa003";
-            this.gv_daa003.MinWidth = 150;
+            this.gv_daa003.MinWidth = 50;
             this.gv_daa003.Name = "gv_daa003";
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 12;
+            this.gv_daa003.VisibleIndex = 14;
             this.gv_daa003.Width = 150;
             // 
             // lb_daa002
             // 
             this.lb_daa002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa002.Appearance.Options.UseFont = true;
-            this.lb_daa002.Location = new System.Drawing.Point(12, 52);
+            this.lb_daa002.Location = new System.Drawing.Point(15, 117);
             this.lb_daa002.Name = "lb_daa002";
             this.lb_daa002.Size = new System.Drawing.Size(68, 21);
             this.lb_daa002.TabIndex = 217;
@@ -1994,33 +1282,33 @@
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Enabled = false;
-            this.txt_daa029.Location = new System.Drawing.Point(90, 48);
+            this.txt_daa029.Location = new System.Drawing.Point(90, 113);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
             this.txt_daa029.Size = new System.Drawing.Size(150, 28);
             this.txt_daa029.TabIndex = 217;
+            this.txt_daa029.Tag = "readonly";
             // 
             // lb_daa001
             // 
             this.lb_daa001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_daa001.Appearance.Options.UseFont = true;
-            this.lb_daa001.Location = new System.Drawing.Point(12, 20);
+            this.lb_daa001.Location = new System.Drawing.Point(15, 20);
             this.lb_daa001.Name = "lb_daa001";
-            this.lb_daa001.Size = new System.Drawing.Size(73, 21);
+            this.lb_daa001.Size = new System.Drawing.Size(68, 21);
             this.lb_daa001.TabIndex = 216;
-            this.lb_daa001.Text = "宸ュ崟鍗曞彿 ";
+            this.lb_daa001.Text = "宸ュ崟鍗曞彿";
             // 
             // txt_daa001
             // 
-            this.txt_daa001.Enabled = false;
             this.txt_daa001.Location = new System.Drawing.Point(90, 16);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
             this.txt_daa001.Size = new System.Drawing.Size(150, 28);
             this.txt_daa001.TabIndex = 216;
+            this.txt_daa001.Tag = "readonly";
             // 
             // gv_daa001
             // 
@@ -2028,12 +1316,12 @@
             this.gv_daa001.AppearanceCell.Options.UseFont = true;
             this.gv_daa001.Caption = "宸ュ崟鍗曞彿";
             this.gv_daa001.FieldName = "daa001";
-            this.gv_daa001.MinWidth = 120;
+            this.gv_daa001.MinWidth = 50;
             this.gv_daa001.Name = "gv_daa001";
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 10;
+            this.gv_daa001.VisibleIndex = 11;
             this.gv_daa001.Width = 120;
             // 
             // toolBarMenu1
@@ -2081,25 +1369,28 @@
             this.gridColumn12,
             this.gridColumn6,
             this.gv_daa018,
+            this.鐢熶骇缁勭粐,
             this.gv_daa001,
             this.gv_daa021,
+            this.gridColumn3,
             this.gv_daa003,
             this.gv_daa004,
             this.gv_daa008,
-            this.鐢熶骇缁勭粐,
+            this.gv_daa011,
+            this.gridColumn4,
+            this.gv_daa010,
+            this.gv_daa005,
+            this.gv_cust,
             this.gridColumn1,
             this.gv_daa015,
+            this.gridColumn2,
             this.gv_daa009,
             this.gv_prepareTime,
             this.gv_daa028,
-            this.gv_daa005,
-            this.gv_daa011,
-            this.gv_daa010,
             this.gv_daa016,
             this.gv_daa017,
             this.gv_mesStartProd,
-            this.gv_mesEndProd,
-            this.gv_cust});
+            this.gv_mesEndProd});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -2207,22 +1498,51 @@
             // 
             this.鐢熶骇缁勭粐.Caption = "鐢熶骇缁勭粐";
             this.鐢熶骇缁勭粐.FieldName = "fSubsidiary";
-            this.鐢熶骇缁勭粐.MinWidth = 250;
+            this.鐢熶骇缁勭粐.MinWidth = 50;
             this.鐢熶骇缁勭粐.Name = "鐢熶骇缁勭粐";
             this.鐢熶骇缁勭粐.Tag = "org.fnamber";
             this.鐢熶骇缁勭粐.Visible = true;
-            this.鐢熶骇缁勭粐.VisibleIndex = 15;
+            this.鐢熶骇缁勭粐.VisibleIndex = 10;
             this.鐢熶骇缁勭粐.Width = 250;
+            // 
+            // gridColumn3
+            // 
+            this.gridColumn3.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 13;
+            this.gridColumn3.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "寰呯敓浜ч噺";
+            this.gridColumn4.MaxWidth = 50;
+            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 18;
+            this.gridColumn4.Width = 50;
             // 
             // gridColumn1
             // 
-            this.gridColumn1.Caption = "杞﹂棿";
+            this.gridColumn1.Caption = "鐢熶骇杞﹂棿";
             this.gridColumn1.FieldName = "dptName";
-            this.gridColumn1.MinWidth = 80;
+            this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 16;
+            this.gridColumn1.VisibleIndex = 23;
             this.gridColumn1.Width = 94;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "瀹為檯绾垮埆";
+            this.gridColumn2.FieldName = "sjXt";
+            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Visible = true;
+            this.gridColumn2.VisibleIndex = 25;
+            this.gridColumn2.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -2267,10 +1587,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 231);
+            this.tabMx.Location = new System.Drawing.Point(0, 259);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 477);
+            this.tabMx.Size = new System.Drawing.Size(1126, 449);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -2279,6 +1599,14 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txtKdy);
+            this.panel1.Controls.Add(this.labelControl13);
+            this.panel1.Controls.Add(this.txtYdy);
+            this.panel1.Controls.Add(this.labelControl8);
+            this.panel1.Controls.Add(this.textEdit1);
+            this.panel1.Controls.Add(this.labelControl7);
+            this.panel1.Controls.Add(this.labelControl6);
+            this.panel1.Controls.Add(this.txt_saleOrderNo);
             this.panel1.Controls.Add(this.ucBtnPrint1);
             this.panel1.Controls.Add(this.txt_daa022);
             this.panel1.Controls.Add(this.lb_tbl013);
@@ -2330,13 +1658,91 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 231);
+            this.panel1.Size = new System.Drawing.Size(1126, 259);
             this.panel1.TabIndex = 1;
+            // 
+            // txtKdy
+            // 
+            this.txtKdy.Location = new System.Drawing.Point(636, 218);
+            this.txtKdy.Name = "txtKdy";
+            this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtKdy.Properties.Appearance.Options.UseFont = true;
+            this.txtKdy.Properties.ReadOnly = true;
+            this.txtKdy.Size = new System.Drawing.Size(96, 28);
+            this.txtKdy.TabIndex = 471;
+            this.txtKdy.Tag = "readonly";
+            // 
+            // labelControl13
+            // 
+            this.labelControl13.Location = new System.Drawing.Point(544, 223);
+            this.labelControl13.Name = "labelControl13";
+            this.labelControl13.Size = new System.Drawing.Size(80, 18);
+            this.labelControl13.TabIndex = 470;
+            this.labelControl13.Text = "鍙墦鍗版�绘暟:";
+            // 
+            // txtYdy
+            // 
+            this.txtYdy.Location = new System.Drawing.Point(636, 186);
+            this.txtYdy.Name = "txtYdy";
+            this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txtYdy.Properties.Appearance.Options.UseFont = true;
+            this.txtYdy.Properties.ReadOnly = true;
+            this.txtYdy.Size = new System.Drawing.Size(96, 28);
+            this.txtYdy.TabIndex = 469;
+            this.txtYdy.Tag = "readonly";
+            // 
+            // labelControl8
+            // 
+            this.labelControl8.Location = new System.Drawing.Point(544, 191);
+            this.labelControl8.Name = "labelControl8";
+            this.labelControl8.Size = new System.Drawing.Size(80, 18);
+            this.labelControl8.TabIndex = 468;
+            this.labelControl8.Text = "宸叉墦鍗版�婚噺:";
+            // 
+            // textEdit1
+            // 
+            this.textEdit1.Location = new System.Drawing.Point(322, 214);
+            this.textEdit1.Name = "textEdit1";
+            this.textEdit1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.textEdit1.Properties.Appearance.Options.UseFont = true;
+            this.textEdit1.Size = new System.Drawing.Size(176, 28);
+            this.textEdit1.TabIndex = 467;
+            this.textEdit1.Tag = "readonly";
+            // 
+            // labelControl7
+            // 
+            this.labelControl7.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl7.Appearance.Options.UseFont = true;
+            this.labelControl7.Location = new System.Drawing.Point(249, 218);
+            this.labelControl7.Name = "labelControl7";
+            this.labelControl7.Size = new System.Drawing.Size(68, 21);
+            this.labelControl7.TabIndex = 466;
+            this.labelControl7.Text = "澶囨枡鐘舵��";
+            // 
+            // labelControl6
+            // 
+            this.labelControl6.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl6.Appearance.Options.UseFont = true;
+            this.labelControl6.Location = new System.Drawing.Point(15, 84);
+            this.labelControl6.Name = "labelControl6";
+            this.labelControl6.Size = new System.Drawing.Size(68, 21);
+            this.labelControl6.TabIndex = 464;
+            this.labelControl6.Text = "闇�姹傚崟鍙�";
+            // 
+            // txt_saleOrderNo
+            // 
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(90, 80);
+            this.txt_saleOrderNo.Name = "txt_saleOrderNo";
+            this.txt_saleOrderNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_saleOrderNo.TabIndex = 465;
+            this.txt_saleOrderNo.Tag = "readonly";
             // 
             // ucBtnPrint1
             // 
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(669, 184);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(753, 218);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
             this.ucBtnPrint1.Size = new System.Drawing.Size(214, 36);
@@ -2344,19 +1750,19 @@
             // 
             // txt_daa022
             // 
-            this.txt_daa022.Enabled = false;
-            this.txt_daa022.Location = new System.Drawing.Point(589, 146);
+            this.txt_daa022.Location = new System.Drawing.Point(90, 178);
             this.txt_daa022.Name = "txt_daa022";
             this.txt_daa022.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa022.Properties.Appearance.Options.UseFont = true;
             this.txt_daa022.Size = new System.Drawing.Size(150, 28);
             this.txt_daa022.TabIndex = 462;
+            this.txt_daa022.Tag = "readonly";
             // 
             // lb_tbl013
             // 
             this.lb_tbl013.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl013.Appearance.Options.UseFont = true;
-            this.lb_tbl013.Location = new System.Drawing.Point(516, 150);
+            this.lb_tbl013.Location = new System.Drawing.Point(15, 182);
             this.lb_tbl013.Name = "lb_tbl013";
             this.lb_tbl013.Size = new System.Drawing.Size(68, 21);
             this.lb_tbl013.TabIndex = 461;
@@ -2364,19 +1770,19 @@
             // 
             // txt_daa028
             // 
-            this.txt_daa028.Enabled = false;
-            this.txt_daa028.Location = new System.Drawing.Point(859, 146);
+            this.txt_daa028.Location = new System.Drawing.Point(322, 180);
             this.txt_daa028.Name = "txt_daa028";
             this.txt_daa028.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_daa028.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa028.Size = new System.Drawing.Size(150, 28);
+            this.txt_daa028.Size = new System.Drawing.Size(176, 28);
             this.txt_daa028.TabIndex = 341;
+            this.txt_daa028.Tag = "readonly";
             // 
             // labelControl5
             // 
             this.labelControl5.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl5.Appearance.Options.UseFont = true;
-            this.labelControl5.Location = new System.Drawing.Point(779, 150);
+            this.labelControl5.Location = new System.Drawing.Point(249, 184);
             this.labelControl5.Name = "labelControl5";
             this.labelControl5.Size = new System.Drawing.Size(68, 21);
             this.labelControl5.TabIndex = 340;
@@ -2386,7 +1792,7 @@
             // 
             this.labelControl4.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl4.Appearance.Options.UseFont = true;
-            this.labelControl4.Location = new System.Drawing.Point(745, 52);
+            this.labelControl4.Location = new System.Drawing.Point(741, 52);
             this.labelControl4.Name = "labelControl4";
             this.labelControl4.Size = new System.Drawing.Size(102, 21);
             this.labelControl4.TabIndex = 339;
@@ -2394,19 +1800,19 @@
             // 
             // txt_mesEndProd
             // 
-            this.txt_mesEndProd.Enabled = false;
-            this.txt_mesEndProd.Location = new System.Drawing.Point(859, 48);
+            this.txt_mesEndProd.Location = new System.Drawing.Point(848, 48);
             this.txt_mesEndProd.Name = "txt_mesEndProd";
             this.txt_mesEndProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProd.Size = new System.Drawing.Size(150, 28);
+            this.txt_mesEndProd.Size = new System.Drawing.Size(176, 28);
             this.txt_mesEndProd.TabIndex = 338;
+            this.txt_mesEndProd.Tag = "readonly";
             // 
             // labelControl3
             // 
             this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(745, 20);
+            this.labelControl3.Location = new System.Drawing.Point(741, 20);
             this.labelControl3.Name = "labelControl3";
             this.labelControl3.Size = new System.Drawing.Size(102, 21);
             this.labelControl3.TabIndex = 337;
@@ -2414,19 +1820,19 @@
             // 
             // txt_mesStartProd
             // 
-            this.txt_mesStartProd.Enabled = false;
-            this.txt_mesStartProd.Location = new System.Drawing.Point(859, 16);
+            this.txt_mesStartProd.Location = new System.Drawing.Point(848, 16);
             this.txt_mesStartProd.Name = "txt_mesStartProd";
             this.txt_mesStartProd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProd.Size = new System.Drawing.Size(150, 28);
+            this.txt_mesStartProd.Size = new System.Drawing.Size(176, 28);
             this.txt_mesStartProd.TabIndex = 336;
+            this.txt_mesStartProd.Tag = "readonly";
             // 
             // labelControl2
             // 
             this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl2.Appearance.Options.UseFont = true;
-            this.labelControl2.Location = new System.Drawing.Point(14, 150);
+            this.labelControl2.Location = new System.Drawing.Point(15, 217);
             this.labelControl2.Name = "labelControl2";
             this.labelControl2.Size = new System.Drawing.Size(68, 21);
             this.labelControl2.TabIndex = 335;
@@ -2435,7 +1841,7 @@
             // txt_sjXt
             // 
             this.txt_sjXt.IsReadly = false;
-            this.txt_sjXt.Location = new System.Drawing.Point(90, 146);
+            this.txt_sjXt.Location = new System.Drawing.Point(90, 213);
             this.txt_sjXt.Name = "txt_sjXt";
             this.txt_sjXt.Size = new System.Drawing.Size(150, 28);
             this.txt_sjXt.TabIndex = 334;
@@ -2444,7 +1850,7 @@
             // 
             this.labelControl1.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.labelControl1.Appearance.Options.UseFont = true;
-            this.labelControl1.Location = new System.Drawing.Point(11, 192);
+            this.labelControl1.Location = new System.Drawing.Point(550, 159);
             this.labelControl1.Name = "labelControl1";
             this.labelControl1.Size = new System.Drawing.Size(74, 21);
             this.labelControl1.TabIndex = 332;
@@ -2452,25 +1858,27 @@
             // 
             // txt_printRemark
             // 
-            this.txt_printRemark.Location = new System.Drawing.Point(89, 188);
+            this.txt_printRemark.Location = new System.Drawing.Point(636, 155);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(150, 28);
+            this.txt_printRemark.Size = new System.Drawing.Size(96, 28);
             this.txt_printRemark.TabIndex = 333;
+            this.txt_printRemark.Tag = "readOnly-1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(558, 188);
+            this.txt_iCount_1.Location = new System.Drawing.Point(852, 186);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
+            this.txt_iCount_1.Size = new System.Drawing.Size(105, 28);
             this.txt_iCount_1.TabIndex = 331;
+            this.txt_iCount_1.Tag = "readOnly-1";
             // 
             // labelControl14
             // 
-            this.labelControl14.Location = new System.Drawing.Point(459, 193);
+            this.labelControl14.Location = new System.Drawing.Point(753, 191);
             this.labelControl14.Name = "labelControl14";
             this.labelControl14.Size = new System.Drawing.Size(95, 18);
             this.labelControl14.TabIndex = 330;
@@ -2478,16 +1886,17 @@
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(347, 188);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(852, 155);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(105, 28);
             this.txt_psnQty_1.TabIndex = 329;
+            this.txt_psnQty_1.Tag = "readOnly-1";
             // 
             // labelControl12
             // 
-            this.labelControl12.Location = new System.Drawing.Point(248, 193);
+            this.labelControl12.Location = new System.Drawing.Point(753, 160);
             this.labelControl12.Name = "labelControl12";
             this.labelControl12.Size = new System.Drawing.Size(95, 18);
             this.labelControl12.TabIndex = 328;
@@ -2495,7 +1904,7 @@
             // 
             // labelControl11
             // 
-            this.labelControl11.Location = new System.Drawing.Point(1015, 58);
+            this.labelControl11.Location = new System.Drawing.Point(1039, 58);
             this.labelControl11.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.labelControl11.Name = "labelControl11";
             this.labelControl11.Size = new System.Drawing.Size(45, 18);
@@ -2512,23 +1921,11 @@
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Visible = false;
             // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(999, 55);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 6;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
-            // 
             // Frm_Womdaa
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1128, 820);
-            this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_Womdaa";
@@ -2563,6 +1960,10 @@
             this.tabMx.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa022.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_mesEndProd.Properties)).EndInit();
@@ -2570,7 +1971,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2586,65 +1986,12 @@
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.LabelControl labelControl11;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workFlgtime;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLast;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workFlg;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lineNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2comeFlg;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2memoBad;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2workLine;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2insDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2boardStyle;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2colorName;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2urgentFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2billNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2suppName;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2barcodetype;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2nweight;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2gweight;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2fcar;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2iqcStatus;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2validTime;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2linfline;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2epItem;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2printId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2minpackFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2delanyMonth;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2flezzBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2flezzReason;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2flezzDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2trLotno;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2visable;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemSname;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2epostion;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2spostion;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2suppNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2memo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2mocode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lotDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2sumBarcode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2oldBarQuantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2price;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2weightUnit;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2unit;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2location;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2useqty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2oldqty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2rohInId;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2custNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lastupdateDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lastupdateBy;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2taskNo;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2quantity;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2lotNo;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2cItemCode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2cItemBarcode;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2cProductCode;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemBarcode;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
@@ -2745,7 +2092,6 @@
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private DevExpress.XtraEditors.TextEdit txt_printRemark;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1Guid;
-        private System.Windows.Forms.PictureBox picCheckBox;
         private DevExpress.XtraEditors.LabelControl labelControl2;
         private UserControl.UcLookWorkline txt_sjXt;
         private DevExpress.XtraEditors.LabelControl labelControl4;
@@ -2766,5 +2112,24 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private UserControl.UcBtnPrint ucBtnPrint1;
         private DevExpress.XtraGrid.Columns.GridColumn 鐢熶骇缁勭粐;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraEditors.LabelControl labelControl6;
+        private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
+        private DevExpress.XtraEditors.TextEdit textEdit1;
+        private DevExpress.XtraEditors.LabelControl labelControl7;
+        private DevExpress.XtraEditors.TextEdit txtKdy;
+        private DevExpress.XtraEditors.LabelControl labelControl13;
+        private DevExpress.XtraEditors.TextEdit txtYdy;
+        private DevExpress.XtraEditors.LabelControl labelControl8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3