From d35bb711f8d3d267b44b4a80c20e31dabf309ae7 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期二, 14 一月 2025 08:17:18 +0800
Subject: [PATCH] 其它入库

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs |  837 ++++++++++++++++++++++++++++++++---------------------------
 1 files changed, 455 insertions(+), 382 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 1981f34..9cb1121 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -34,6 +34,11 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1tld009 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1tld007 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1tld006 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -52,6 +57,7 @@
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
+            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
             this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
             this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
@@ -59,7 +65,7 @@
             this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
             this.kyPrtQty = new DevExpress.XtraEditors.TextEdit();
             this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
-            this.textEdit6 = new DevExpress.XtraEditors.TextEdit();
+            this.txtYdy = new DevExpress.XtraEditors.TextEdit();
             this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
             this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
             this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
@@ -69,19 +75,11 @@
             this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
             this.txtWlid = new DevExpress.XtraEditors.TextEdit();
             this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
-            this.gv_tbl022 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl021 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_tbl021 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_workName = new DevExpress.XtraEditors.TextEdit();
             this.gv_tbl021 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl020 = new DevExpress.XtraEditors.LabelControl();
             this.gv_tbl020 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl019 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl018 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl017 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl016 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl014 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl013 = new DevExpress.XtraEditors.LabelControl();
             this.gv_tbl013 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl012 = new DevExpress.XtraEditors.LabelControl();
@@ -92,38 +90,52 @@
             this.gv_tbl011 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_tbl010 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_tbl009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl008 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_tbl007 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl006 = new DevExpress.XtraEditors.LabelControl();
             this.txt_tbl006 = new DevExpress.XtraEditors.TextEdit();
-            this.gv_tbl006 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl005 = new DevExpress.XtraEditors.LabelControl();
             this.gv_tbl005 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl004 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_tbl004 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
             this.gv_tbl004 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl003 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_tbl003 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_rwd = new DevExpress.XtraEditors.TextEdit();
             this.gv_tbl003 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl002 = new DevExpress.XtraEditors.LabelControl();
             this.gv_tbl002 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_tbl001 = new DevExpress.XtraEditors.LabelControl();
-            this.txt_tbl001 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
             this.gv_tbl001 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_billNo = new DevExpress.XtraEditors.LabelControl();
             this.txt_billNo = new DevExpress.XtraEditors.TextEdit();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.gcMain = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn10 = 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.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.panel1 = new System.Windows.Forms.Panel();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_tbl023 = new Gs.DevApp.UserControl.UcLookOrg();
             this.txt_tbl020 = new DevExpress.XtraEditors.CheckEdit();
             this.txt_tbl013 = new DevExpress.XtraEditors.CheckEdit();
             this.txt_tbl005 = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -141,18 +153,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl021.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl004.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl003.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl001.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -162,6 +174,10 @@
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             this.panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl013.Properties)).BeginInit();
@@ -179,7 +195,7 @@
             this.gvMx1tld009.Name = "gvMx1tld009";
             this.gvMx1tld009.Tag = "query_a.tld009";
             this.gvMx1tld009.Visible = true;
-            this.gvMx1tld009.VisibleIndex = 8;
+            this.gvMx1tld009.VisibleIndex = 7;
             this.gvMx1tld009.Width = 94;
             // 
             // gvMx1tld007
@@ -187,12 +203,12 @@
             this.gvMx1tld007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1tld007.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld007.Caption = "鍗曚綅";
-            this.gvMx1tld007.FieldName = "tld007";
+            this.gvMx1tld007.FieldName = "dwName";
             this.gvMx1tld007.MinWidth = 50;
             this.gvMx1tld007.Name = "gvMx1tld007";
             this.gvMx1tld007.Tag = "query_a.tld007";
             this.gvMx1tld007.Visible = true;
-            this.gvMx1tld007.VisibleIndex = 7;
+            this.gvMx1tld007.VisibleIndex = 6;
             this.gvMx1tld007.Width = 94;
             // 
             // gvMx1tld006
@@ -205,20 +221,24 @@
             this.gvMx1tld006.Name = "gvMx1tld006";
             this.gvMx1tld006.Tag = "query_a.tld006";
             this.gvMx1tld006.Visible = true;
-            this.gvMx1tld006.VisibleIndex = 6;
+            this.gvMx1tld006.VisibleIndex = 5;
             this.gvMx1tld006.Width = 94;
             // 
             // gvMx1tld005
             // 
             this.gvMx1tld005.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1tld005.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1tld005.AppearanceCell.Options.UseFont = true;
+            this.gvMx1tld005.AppearanceCell.Options.UseForeColor = true;
+            this.gvMx1tld005.AppearanceHeader.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(0)))), ((int)(((byte)(0)))), ((int)(((byte)(192)))));
+            this.gvMx1tld005.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1tld005.Caption = "鐢宠鏁伴噺";
             this.gvMx1tld005.FieldName = "tld005";
             this.gvMx1tld005.MinWidth = 50;
             this.gvMx1tld005.Name = "gvMx1tld005";
-            this.gvMx1tld005.Tag = "query_a.tld005";
+            this.gvMx1tld005.Tag = "edit";
             this.gvMx1tld005.Visible = true;
-            this.gvMx1tld005.VisibleIndex = 5;
+            this.gvMx1tld005.VisibleIndex = 4;
             this.gvMx1tld005.Width = 94;
             // 
             // gvMx1tld004
@@ -231,7 +251,7 @@
             this.gvMx1tld004.Name = "gvMx1tld004";
             this.gvMx1tld004.Tag = "query_a.tld004";
             this.gvMx1tld004.Visible = true;
-            this.gvMx1tld004.VisibleIndex = 4;
+            this.gvMx1tld004.VisibleIndex = 3;
             this.gvMx1tld004.Width = 94;
             // 
             // gvMx1tld003
@@ -244,7 +264,7 @@
             this.gvMx1tld003.Name = "gvMx1tld003";
             this.gvMx1tld003.Tag = "query_a.tld003";
             this.gvMx1tld003.Visible = true;
-            this.gvMx1tld003.VisibleIndex = 3;
+            this.gvMx1tld003.VisibleIndex = 2;
             this.gvMx1tld003.Width = 94;
             // 
             // gvMx1tld002
@@ -257,7 +277,7 @@
             this.gvMx1tld002.Name = "gvMx1tld002";
             this.gvMx1tld002.Tag = "query_a.tld002";
             this.gvMx1tld002.Visible = true;
-            this.gvMx1tld002.VisibleIndex = 2;
+            this.gvMx1tld002.VisibleIndex = 1;
             this.gvMx1tld002.Width = 94;
             // 
             // gvMx1tld001
@@ -270,7 +290,7 @@
             this.gvMx1tld001.Name = "gvMx1tld001";
             this.gvMx1tld001.Tag = "query_a.tld001";
             this.gvMx1tld001.Visible = true;
-            this.gvMx1tld001.VisibleIndex = 1;
+            this.gvMx1tld001.VisibleIndex = 0;
             this.gvMx1tld001.Width = 94;
             // 
             // gvMx1tlid
@@ -282,8 +302,6 @@
             this.gvMx1tlid.MinWidth = 50;
             this.gvMx1tlid.Name = "gvMx1tlid";
             this.gvMx1tlid.Tag = "query_a.tlid";
-            this.gvMx1tlid.Visible = true;
-            this.gvMx1tlid.VisibleIndex = 0;
             this.gvMx1tlid.Width = 94;
             // 
             // tabMxPage1
@@ -291,7 +309,7 @@
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Controls.Add(this.panelMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 370);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 351);
             this.tabMxPage1.Text = "閫�鏂欐槑缁�";
             // 
             // gcMx1
@@ -302,7 +320,7 @@
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 272);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 253);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -327,7 +345,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;
             // 
             // gridColumn3
@@ -336,8 +353,6 @@
             this.gridColumn3.FieldName = "aboutGuid";
             this.gridColumn3.MinWidth = 25;
             this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 11;
             this.gridColumn3.Width = 94;
             // 
             // gridColumn1
@@ -346,7 +361,7 @@
             this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 9;
+            this.gridColumn1.VisibleIndex = 8;
             this.gridColumn1.Width = 94;
             // 
             // gridColumn2
@@ -355,7 +370,7 @@
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 10;
+            this.gridColumn2.VisibleIndex = 9;
             this.gridColumn2.Width = 94;
             // 
             // gvMxDel
@@ -365,7 +380,7 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 12;
+            this.gvMxDel.VisibleIndex = 10;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
@@ -381,6 +396,7 @@
             // 
             // panelMx1
             // 
+            this.panelMx1.Controls.Add(this.ucBtnPrint1);
             this.panelMx1.Controls.Add(this.lbMxGuid);
             this.panelMx1.Controls.Add(this.txt_iCount_1);
             this.panelMx1.Controls.Add(this.labelControl14);
@@ -388,7 +404,7 @@
             this.panelMx1.Controls.Add(this.labelControl12);
             this.panelMx1.Controls.Add(this.kyPrtQty);
             this.panelMx1.Controls.Add(this.labelControl13);
-            this.panelMx1.Controls.Add(this.textEdit6);
+            this.panelMx1.Controls.Add(this.txtYdy);
             this.panelMx1.Controls.Add(this.labelControl1);
             this.panelMx1.Controls.Add(this.txtQuantity);
             this.panelMx1.Controls.Add(this.labelControl10);
@@ -404,9 +420,18 @@
             this.panelMx1.Size = new System.Drawing.Size(1124, 98);
             this.panelMx1.TabIndex = 1;
             // 
+            // ucBtnPrint1
+            // 
+            this.ucBtnPrint1.guidKey = null;
+            this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
+            this.ucBtnPrint1.Name = "ucBtnPrint1";
+            this.ucBtnPrint1.rptParameter = null;
+            this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
+            this.ucBtnPrint1.TabIndex = 231;
+            // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(552, 75);
+            this.lbMxGuid.Location = new System.Drawing.Point(821, 14);
             this.lbMxGuid.Name = "lbMxGuid";
             this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
             this.lbMxGuid.TabIndex = 229;
@@ -459,29 +484,29 @@
             // 
             // labelControl13
             // 
-            this.labelControl13.Location = new System.Drawing.Point(332, 70);
+            this.labelControl13.Location = new System.Drawing.Point(345, 70);
             this.labelControl13.Name = "labelControl13";
-            this.labelControl13.Size = new System.Drawing.Size(90, 18);
+            this.labelControl13.Size = new System.Drawing.Size(80, 18);
             this.labelControl13.TabIndex = 223;
-            this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
+            this.labelControl13.Text = "鍙墦鍗版�绘暟:";
             // 
-            // textEdit6
+            // txtYdy
             // 
-            this.textEdit6.Location = new System.Drawing.Point(430, 34);
-            this.textEdit6.Name = "textEdit6";
-            this.textEdit6.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.textEdit6.Properties.Appearance.Options.UseFont = true;
-            this.textEdit6.Properties.ReadOnly = true;
-            this.textEdit6.Size = new System.Drawing.Size(96, 28);
-            this.textEdit6.TabIndex = 222;
+            this.txtYdy.Location = new System.Drawing.Point(430, 34);
+            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 = 222;
             // 
             // labelControl1
             // 
-            this.labelControl1.Location = new System.Drawing.Point(332, 39);
+            this.labelControl1.Location = new System.Drawing.Point(345, 39);
             this.labelControl1.Name = "labelControl1";
-            this.labelControl1.Size = new System.Drawing.Size(90, 18);
+            this.labelControl1.Size = new System.Drawing.Size(80, 18);
             this.labelControl1.TabIndex = 221;
-            this.labelControl1.Text = "宸叉墦鍗版�婚噺锛�";
+            this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
             // 
             // txtQuantity
             // 
@@ -495,11 +520,11 @@
             // 
             // labelControl10
             // 
-            this.labelControl10.Location = new System.Drawing.Point(317, 9);
+            this.labelControl10.Location = new System.Drawing.Point(330, 9);
             this.labelControl10.Name = "labelControl10";
-            this.labelControl10.Size = new System.Drawing.Size(105, 18);
+            this.labelControl10.Size = new System.Drawing.Size(95, 18);
             this.labelControl10.TabIndex = 219;
-            this.labelControl10.Text = "鏈鏀惰揣鎬婚噺锛�";
+            this.labelControl10.Text = "鏈鏀惰揣鎬婚噺:";
             // 
             // txtWlgg
             // 
@@ -508,16 +533,16 @@
             this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(215, 28);
+            this.txtWlgg.Size = new System.Drawing.Size(232, 28);
             this.txtWlgg.TabIndex = 218;
             // 
             // labelControl9
             // 
-            this.labelControl9.Location = new System.Drawing.Point(11, 70);
+            this.labelControl9.Location = new System.Drawing.Point(21, 70);
             this.labelControl9.Name = "labelControl9";
-            this.labelControl9.Size = new System.Drawing.Size(75, 18);
+            this.labelControl9.Size = new System.Drawing.Size(65, 18);
             this.labelControl9.TabIndex = 217;
-            this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
+            this.labelControl9.Text = "鐗╂枡瑙勬牸:";
             // 
             // txtWlmc
             // 
@@ -526,16 +551,16 @@
             this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(215, 28);
+            this.txtWlmc.Size = new System.Drawing.Size(232, 28);
             this.txtWlmc.TabIndex = 216;
             // 
             // labelControl8
             // 
-            this.labelControl8.Location = new System.Drawing.Point(11, 39);
+            this.labelControl8.Location = new System.Drawing.Point(21, 39);
             this.labelControl8.Name = "labelControl8";
-            this.labelControl8.Size = new System.Drawing.Size(75, 18);
+            this.labelControl8.Size = new System.Drawing.Size(65, 18);
             this.labelControl8.TabIndex = 215;
-            this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
+            this.labelControl8.Text = "鐗╂枡鍚嶇О:";
             // 
             // txtWlid
             // 
@@ -544,84 +569,56 @@
             this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(215, 28);
+            this.txtWlid.Size = new System.Drawing.Size(232, 28);
             this.txtWlid.TabIndex = 214;
             // 
             // labelControl7
             // 
-            this.labelControl7.Location = new System.Drawing.Point(25, 9);
+            this.labelControl7.Location = new System.Drawing.Point(21, 9);
             this.labelControl7.Name = "labelControl7";
-            this.labelControl7.Size = new System.Drawing.Size(61, 18);
+            this.labelControl7.Size = new System.Drawing.Size(65, 18);
             this.labelControl7.TabIndex = 213;
-            this.labelControl7.Text = "鐗╂枡ID锛�";
-            // 
-            // gv_tbl022
-            // 
-            this.gv_tbl022.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl022.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl022.Caption = "鏄惁琛ユ枡瀹屾垚 ";
-            this.gv_tbl022.FieldName = "tbl022";
-            this.gv_tbl022.MinWidth = 50;
-            this.gv_tbl022.Name = "gv_tbl022";
-            this.gv_tbl022.OptionsColumn.AllowEdit = false;
-            this.gv_tbl022.Tag = "query_a.tbl022";
-            this.gv_tbl022.Visible = true;
-            this.gv_tbl022.VisibleIndex = 24;
-            this.gv_tbl022.Width = 94;
-            // 
-            // gv_itemId
-            // 
-            this.gv_itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_itemId.AppearanceCell.Options.UseFont = true;
-            this.gv_itemId.Caption = "浜у搧id ";
-            this.gv_itemId.FieldName = "itemId";
-            this.gv_itemId.MinWidth = 50;
-            this.gv_itemId.Name = "gv_itemId";
-            this.gv_itemId.OptionsColumn.AllowEdit = false;
-            this.gv_itemId.Tag = "query_a.item_id";
-            this.gv_itemId.Visible = true;
-            this.gv_itemId.VisibleIndex = 23;
-            this.gv_itemId.Width = 94;
+            this.labelControl7.Text = "鐗╂枡缂栧彿:";
             // 
             // lb_tbl021
             // 
             this.lb_tbl021.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl021.Appearance.Options.UseFont = true;
-            this.lb_tbl021.Location = new System.Drawing.Point(256, 54);
+            this.lb_tbl021.Location = new System.Drawing.Point(255, 52);
             this.lb_tbl021.Name = "lb_tbl021";
-            this.lb_tbl021.Size = new System.Drawing.Size(73, 21);
+            this.lb_tbl021.Size = new System.Drawing.Size(68, 21);
             this.lb_tbl021.TabIndex = 298;
-            this.lb_tbl021.Text = "鐢熶骇杞﹂棿 ";
+            this.lb_tbl021.Text = "鐢熶骇杞﹂棿";
             // 
-            // txt_tbl021
+            // txt_workName
             // 
-            this.txt_tbl021.Enabled = false;
-            this.txt_tbl021.Location = new System.Drawing.Point(331, 50);
-            this.txt_tbl021.Name = "txt_tbl021";
-            this.txt_tbl021.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_tbl021.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl021.Size = new System.Drawing.Size(150, 28);
-            this.txt_tbl021.TabIndex = 298;
+            this.txt_workName.Location = new System.Drawing.Point(326, 48);
+            this.txt_workName.Name = "txt_workName";
+            this.txt_workName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_workName.Properties.Appearance.Options.UseFont = true;
+            this.txt_workName.Size = new System.Drawing.Size(201, 28);
+            this.txt_workName.TabIndex = 298;
+            this.txt_workName.Tag = "readonly";
             // 
             // gv_tbl021
             // 
             this.gv_tbl021.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_tbl021.AppearanceCell.Options.UseFont = true;
             this.gv_tbl021.Caption = "鐢熶骇杞﹂棿 ";
-            this.gv_tbl021.FieldName = "tbl021";
+            this.gv_tbl021.FieldName = "dptName";
             this.gv_tbl021.MinWidth = 50;
             this.gv_tbl021.Name = "gv_tbl021";
             this.gv_tbl021.OptionsColumn.AllowEdit = false;
             this.gv_tbl021.Tag = "query_a.tbl021";
             this.gv_tbl021.Visible = true;
-            this.gv_tbl021.VisibleIndex = 22;
+            this.gv_tbl021.VisibleIndex = 6;
             this.gv_tbl021.Width = 94;
             // 
             // lb_tbl020
             // 
             this.lb_tbl020.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl020.Appearance.Options.UseFont = true;
-            this.lb_tbl020.Location = new System.Drawing.Point(745, 120);
+            this.lb_tbl020.Location = new System.Drawing.Point(662, 81);
             this.lb_tbl020.Name = "lb_tbl020";
             this.lb_tbl020.Size = new System.Drawing.Size(73, 21);
             this.lb_tbl020.TabIndex = 291;
@@ -632,104 +629,21 @@
             this.gv_tbl020.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_tbl020.AppearanceCell.Options.UseFont = true;
             this.gv_tbl020.Caption = "瀹岀粨鏍囪瘑 ";
-            this.gv_tbl020.FieldName = "tbl020";
+            this.gv_tbl020.FieldName = "isWj";
+            this.gv_tbl020.MaxWidth = 50;
             this.gv_tbl020.MinWidth = 50;
             this.gv_tbl020.Name = "gv_tbl020";
             this.gv_tbl020.OptionsColumn.AllowEdit = false;
             this.gv_tbl020.Tag = "query_a.tbl020";
             this.gv_tbl020.Visible = true;
-            this.gv_tbl020.VisibleIndex = 21;
-            this.gv_tbl020.Width = 94;
-            // 
-            // gv_tbl019
-            // 
-            this.gv_tbl019.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl019.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl019.Caption = "浜嬪姟绫诲瀷缂栫爜 ";
-            this.gv_tbl019.FieldName = "tbl019";
-            this.gv_tbl019.MinWidth = 50;
-            this.gv_tbl019.Name = "gv_tbl019";
-            this.gv_tbl019.OptionsColumn.AllowEdit = false;
-            this.gv_tbl019.Tag = "query_a.tbl019";
-            this.gv_tbl019.Visible = true;
-            this.gv_tbl019.VisibleIndex = 20;
-            this.gv_tbl019.Width = 94;
-            // 
-            // gv_tbl018
-            // 
-            this.gv_tbl018.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl018.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl018.Caption = "鍗曟嵁绫诲瀷缂栫爜 ";
-            this.gv_tbl018.FieldName = "tbl018";
-            this.gv_tbl018.MinWidth = 50;
-            this.gv_tbl018.Name = "gv_tbl018";
-            this.gv_tbl018.OptionsColumn.AllowEdit = false;
-            this.gv_tbl018.Tag = "query_a.tbl018";
-            this.gv_tbl018.Visible = true;
-            this.gv_tbl018.VisibleIndex = 19;
-            this.gv_tbl018.Width = 94;
-            // 
-            // gv_tbl017
-            // 
-            this.gv_tbl017.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl017.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl017.Caption = "渚涘簲鍟嗙紪鐮� ";
-            this.gv_tbl017.FieldName = "tbl017";
-            this.gv_tbl017.MinWidth = 50;
-            this.gv_tbl017.Name = "gv_tbl017";
-            this.gv_tbl017.OptionsColumn.AllowEdit = false;
-            this.gv_tbl017.Tag = "query_a.tbl017";
-            this.gv_tbl017.Visible = true;
-            this.gv_tbl017.VisibleIndex = 18;
-            this.gv_tbl017.Width = 94;
-            // 
-            // gv_tbl016
-            // 
-            this.gv_tbl016.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl016.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl016.Caption = "ERP杩斿洖淇℃伅 ";
-            this.gv_tbl016.FieldName = "tbl016";
-            this.gv_tbl016.MinWidth = 50;
-            this.gv_tbl016.Name = "gv_tbl016";
-            this.gv_tbl016.OptionsColumn.AllowEdit = false;
-            this.gv_tbl016.Tag = "query_a.tbl016";
-            this.gv_tbl016.Visible = true;
-            this.gv_tbl016.VisibleIndex = 17;
-            this.gv_tbl016.Width = 94;
-            // 
-            // gv_tbl015
-            // 
-            this.gv_tbl015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl015.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl015.Caption = "ERP鍥炲啓鍗曞彿 ";
-            this.gv_tbl015.FieldName = "tbl015";
-            this.gv_tbl015.MinWidth = 50;
-            this.gv_tbl015.Name = "gv_tbl015";
-            this.gv_tbl015.OptionsColumn.AllowEdit = false;
-            this.gv_tbl015.Tag = "query_a.tbl015";
-            this.gv_tbl015.Visible = true;
-            this.gv_tbl015.VisibleIndex = 16;
-            this.gv_tbl015.Width = 94;
-            // 
-            // gv_tbl014
-            // 
-            this.gv_tbl014.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl014.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl014.Caption = "ERP鍥炲啓鐘舵�� ";
-            this.gv_tbl014.FieldName = "tbl014";
-            this.gv_tbl014.MinWidth = 50;
-            this.gv_tbl014.Name = "gv_tbl014";
-            this.gv_tbl014.OptionsColumn.AllowEdit = false;
-            this.gv_tbl014.Tag = "query_a.tbl014";
-            this.gv_tbl014.Visible = true;
-            this.gv_tbl014.VisibleIndex = 15;
-            this.gv_tbl014.Width = 94;
+            this.gv_tbl020.VisibleIndex = 1;
+            this.gv_tbl020.Width = 50;
             // 
             // 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(745, 88);
+            this.lb_tbl013.Location = new System.Drawing.Point(536, 82);
             this.lb_tbl013.Name = "lb_tbl013";
             this.lb_tbl013.Size = new System.Drawing.Size(73, 21);
             this.lb_tbl013.TabIndex = 252;
@@ -740,20 +654,21 @@
             this.gv_tbl013.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_tbl013.AppearanceCell.Options.UseFont = true;
             this.gv_tbl013.Caption = "瀹℃牳鐘舵�� ";
-            this.gv_tbl013.FieldName = "tbl013";
+            this.gv_tbl013.FieldName = "isChk";
+            this.gv_tbl013.MaxWidth = 50;
             this.gv_tbl013.MinWidth = 50;
             this.gv_tbl013.Name = "gv_tbl013";
             this.gv_tbl013.OptionsColumn.AllowEdit = false;
             this.gv_tbl013.Tag = "query_a.tbl013";
             this.gv_tbl013.Visible = true;
-            this.gv_tbl013.VisibleIndex = 14;
-            this.gv_tbl013.Width = 94;
+            this.gv_tbl013.VisibleIndex = 0;
+            this.gv_tbl013.Width = 50;
             // 
             // lb_tbl012
             // 
             this.lb_tbl012.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl012.Appearance.Options.UseFont = true;
-            this.lb_tbl012.Location = new System.Drawing.Point(745, 54);
+            this.lb_tbl012.Location = new System.Drawing.Point(536, 52);
             this.lb_tbl012.Name = "lb_tbl012";
             this.lb_tbl012.Size = new System.Drawing.Size(73, 21);
             this.lb_tbl012.TabIndex = 247;
@@ -761,13 +676,13 @@
             // 
             // txt_tbl012
             // 
-            this.txt_tbl012.Enabled = false;
-            this.txt_tbl012.Location = new System.Drawing.Point(822, 50);
+            this.txt_tbl012.Location = new System.Drawing.Point(613, 48);
             this.txt_tbl012.Name = "txt_tbl012";
             this.txt_tbl012.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
             this.txt_tbl012.Size = new System.Drawing.Size(150, 28);
             this.txt_tbl012.TabIndex = 247;
+            this.txt_tbl012.Tag = "readonly";
             // 
             // gv_tbl012
             // 
@@ -780,14 +695,14 @@
             this.gv_tbl012.OptionsColumn.AllowEdit = false;
             this.gv_tbl012.Tag = "query_a.tbl012";
             this.gv_tbl012.Visible = true;
-            this.gv_tbl012.VisibleIndex = 13;
+            this.gv_tbl012.VisibleIndex = 15;
             this.gv_tbl012.Width = 94;
             // 
             // lb_tbl011
             // 
             this.lb_tbl011.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl011.Appearance.Options.UseFont = true;
-            this.lb_tbl011.Location = new System.Drawing.Point(762, 20);
+            this.lb_tbl011.Location = new System.Drawing.Point(553, 20);
             this.lb_tbl011.Name = "lb_tbl011";
             this.lb_tbl011.Size = new System.Drawing.Size(56, 21);
             this.lb_tbl011.TabIndex = 243;
@@ -795,13 +710,13 @@
             // 
             // txt_tbl011
             // 
-            this.txt_tbl011.Enabled = false;
-            this.txt_tbl011.Location = new System.Drawing.Point(822, 16);
+            this.txt_tbl011.Location = new System.Drawing.Point(613, 16);
             this.txt_tbl011.Name = "txt_tbl011";
             this.txt_tbl011.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
             this.txt_tbl011.Size = new System.Drawing.Size(150, 28);
             this.txt_tbl011.TabIndex = 243;
+            this.txt_tbl011.Tag = "readonly";
             // 
             // gv_tbl011
             // 
@@ -814,7 +729,7 @@
             this.gv_tbl011.OptionsColumn.AllowEdit = false;
             this.gv_tbl011.Tag = "query_a.tbl011";
             this.gv_tbl011.Visible = true;
-            this.gv_tbl011.VisibleIndex = 12;
+            this.gv_tbl011.VisibleIndex = 14;
             this.gv_tbl011.Width = 94;
             // 
             // gv_tbl010
@@ -828,7 +743,7 @@
             this.gv_tbl010.OptionsColumn.AllowEdit = false;
             this.gv_tbl010.Tag = "query_a.tbl010";
             this.gv_tbl010.Visible = true;
-            this.gv_tbl010.VisibleIndex = 11;
+            this.gv_tbl010.VisibleIndex = 13;
             this.gv_tbl010.Width = 94;
             // 
             // gv_tbl009
@@ -842,42 +757,14 @@
             this.gv_tbl009.OptionsColumn.AllowEdit = false;
             this.gv_tbl009.Tag = "query_a.tbl009";
             this.gv_tbl009.Visible = true;
-            this.gv_tbl009.VisibleIndex = 10;
+            this.gv_tbl009.VisibleIndex = 12;
             this.gv_tbl009.Width = 94;
-            // 
-            // gv_tbl008
-            // 
-            this.gv_tbl008.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl008.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl008.Caption = "浜嬪姟绫诲瀷 ";
-            this.gv_tbl008.FieldName = "tbl008";
-            this.gv_tbl008.MinWidth = 50;
-            this.gv_tbl008.Name = "gv_tbl008";
-            this.gv_tbl008.OptionsColumn.AllowEdit = false;
-            this.gv_tbl008.Tag = "query_a.tbl008";
-            this.gv_tbl008.Visible = true;
-            this.gv_tbl008.VisibleIndex = 9;
-            this.gv_tbl008.Width = 94;
-            // 
-            // gv_tbl007
-            // 
-            this.gv_tbl007.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl007.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl007.Caption = "鍗曟嵁绫诲瀷 ";
-            this.gv_tbl007.FieldName = "tbl007";
-            this.gv_tbl007.MinWidth = 50;
-            this.gv_tbl007.Name = "gv_tbl007";
-            this.gv_tbl007.OptionsColumn.AllowEdit = false;
-            this.gv_tbl007.Tag = "query_a.tbl007";
-            this.gv_tbl007.Visible = true;
-            this.gv_tbl007.VisibleIndex = 8;
-            this.gv_tbl007.Width = 94;
             // 
             // lb_tbl006
             // 
             this.lb_tbl006.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl006.Appearance.Options.UseFont = true;
-            this.lb_tbl006.Location = new System.Drawing.Point(45, 120);
+            this.lb_tbl006.Location = new System.Drawing.Point(42, 142);
             this.lb_tbl006.Name = "lb_tbl006";
             this.lb_tbl006.Size = new System.Drawing.Size(39, 21);
             this.lb_tbl006.TabIndex = 226;
@@ -885,32 +772,18 @@
             // 
             // txt_tbl006
             // 
-            this.txt_tbl006.Location = new System.Drawing.Point(85, 116);
+            this.txt_tbl006.Location = new System.Drawing.Point(85, 138);
             this.txt_tbl006.Name = "txt_tbl006";
             this.txt_tbl006.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl006.Size = new System.Drawing.Size(650, 28);
+            this.txt_tbl006.Size = new System.Drawing.Size(678, 28);
             this.txt_tbl006.TabIndex = 226;
-            // 
-            // gv_tbl006
-            // 
-            this.gv_tbl006.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_tbl006.AppearanceCell.Options.UseFont = true;
-            this.gv_tbl006.Caption = "澶囨敞 ";
-            this.gv_tbl006.FieldName = "tbl006";
-            this.gv_tbl006.MinWidth = 50;
-            this.gv_tbl006.Name = "gv_tbl006";
-            this.gv_tbl006.OptionsColumn.AllowEdit = false;
-            this.gv_tbl006.Tag = "query_a.tbl006";
-            this.gv_tbl006.Visible = true;
-            this.gv_tbl006.VisibleIndex = 7;
-            this.gv_tbl006.Width = 94;
             // 
             // lb_tbl005
             // 
             this.lb_tbl005.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl005.Appearance.Options.UseFont = true;
-            this.lb_tbl005.Location = new System.Drawing.Point(11, 88);
+            this.lb_tbl005.Location = new System.Drawing.Point(8, 112);
             this.lb_tbl005.Name = "lb_tbl005";
             this.lb_tbl005.Size = new System.Drawing.Size(73, 21);
             this.lb_tbl005.TabIndex = 222;
@@ -927,69 +800,69 @@
             this.gv_tbl005.OptionsColumn.AllowEdit = false;
             this.gv_tbl005.Tag = "query_a.tbl005";
             this.gv_tbl005.Visible = true;
-            this.gv_tbl005.VisibleIndex = 6;
+            this.gv_tbl005.VisibleIndex = 11;
             this.gv_tbl005.Width = 94;
             // 
             // lb_tbl004
             // 
             this.lb_tbl004.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl004.Appearance.Options.UseFont = true;
-            this.lb_tbl004.Location = new System.Drawing.Point(508, 54);
+            this.lb_tbl004.Location = new System.Drawing.Point(255, 112);
             this.lb_tbl004.Name = "lb_tbl004";
-            this.lb_tbl004.Size = new System.Drawing.Size(73, 21);
+            this.lb_tbl004.Size = new System.Drawing.Size(68, 21);
             this.lb_tbl004.TabIndex = 219;
-            this.lb_tbl004.Text = "浜у搧鍨嬪彿 ";
+            this.lb_tbl004.Text = "浜у搧鍚嶇О";
             // 
-            // txt_tbl004
+            // txt_itemName
             // 
-            this.txt_tbl004.Enabled = false;
-            this.txt_tbl004.Location = new System.Drawing.Point(585, 50);
-            this.txt_tbl004.Name = "txt_tbl004";
-            this.txt_tbl004.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_tbl004.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl004.Size = new System.Drawing.Size(150, 28);
-            this.txt_tbl004.TabIndex = 219;
+            this.txt_itemName.Location = new System.Drawing.Point(326, 108);
+            this.txt_itemName.Name = "txt_itemName";
+            this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
+            this.txt_itemName.Size = new System.Drawing.Size(437, 28);
+            this.txt_itemName.TabIndex = 219;
+            this.txt_itemName.Tag = "readonly";
             // 
             // gv_tbl004
             // 
             this.gv_tbl004.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_tbl004.AppearanceCell.Options.UseFont = true;
             this.gv_tbl004.Caption = "浜у搧鍨嬪彿 ";
-            this.gv_tbl004.FieldName = "tbl004";
+            this.gv_tbl004.FieldName = "daa004";
             this.gv_tbl004.MinWidth = 50;
             this.gv_tbl004.Name = "gv_tbl004";
             this.gv_tbl004.OptionsColumn.AllowEdit = false;
             this.gv_tbl004.Tag = "query_a.tbl004";
             this.gv_tbl004.Visible = true;
-            this.gv_tbl004.VisibleIndex = 5;
+            this.gv_tbl004.VisibleIndex = 10;
             this.gv_tbl004.Width = 94;
             // 
             // lb_tbl003
             // 
             this.lb_tbl003.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl003.Appearance.Options.UseFont = true;
-            this.lb_tbl003.Location = new System.Drawing.Point(256, 20);
+            this.lb_tbl003.Location = new System.Drawing.Point(255, 20);
             this.lb_tbl003.Name = "lb_tbl003";
-            this.lb_tbl003.Size = new System.Drawing.Size(73, 21);
+            this.lb_tbl003.Size = new System.Drawing.Size(68, 21);
             this.lb_tbl003.TabIndex = 217;
-            this.lb_tbl003.Text = "浠诲姟鍗曞彿 ";
+            this.lb_tbl003.Text = "浠诲姟鍗曞彿";
             // 
-            // txt_tbl003
+            // txt_rwd
             // 
-            this.txt_tbl003.Enabled = false;
-            this.txt_tbl003.Location = new System.Drawing.Point(331, 16);
-            this.txt_tbl003.Name = "txt_tbl003";
-            this.txt_tbl003.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_tbl003.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl003.Size = new System.Drawing.Size(150, 28);
-            this.txt_tbl003.TabIndex = 217;
+            this.txt_rwd.Location = new System.Drawing.Point(326, 16);
+            this.txt_rwd.Name = "txt_rwd";
+            this.txt_rwd.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_rwd.Properties.Appearance.Options.UseFont = true;
+            this.txt_rwd.Size = new System.Drawing.Size(201, 28);
+            this.txt_rwd.TabIndex = 217;
+            this.txt_rwd.Tag = "readonly";
             // 
             // gv_tbl003
             // 
             this.gv_tbl003.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_tbl003.AppearanceCell.Options.UseFont = true;
             this.gv_tbl003.Caption = "浠诲姟鍗曞彿 ";
-            this.gv_tbl003.FieldName = "tbl003";
+            this.gv_tbl003.FieldName = "daa021";
             this.gv_tbl003.MinWidth = 50;
             this.gv_tbl003.Name = "gv_tbl003";
             this.gv_tbl003.OptionsColumn.AllowEdit = false;
@@ -1002,7 +875,7 @@
             // 
             this.lb_tbl002.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl002.Appearance.Options.UseFont = true;
-            this.lb_tbl002.Location = new System.Drawing.Point(11, 54);
+            this.lb_tbl002.Location = new System.Drawing.Point(8, 82);
             this.lb_tbl002.Name = "lb_tbl002";
             this.lb_tbl002.Size = new System.Drawing.Size(73, 21);
             this.lb_tbl002.TabIndex = 216;
@@ -1013,34 +886,34 @@
             this.gv_tbl002.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_tbl002.AppearanceCell.Options.UseFont = true;
             this.gv_tbl002.Caption = "鐢熶骇宸ュ崟 ";
-            this.gv_tbl002.FieldName = "tbl002";
+            this.gv_tbl002.FieldName = "daa001";
             this.gv_tbl002.MinWidth = 50;
             this.gv_tbl002.Name = "gv_tbl002";
             this.gv_tbl002.OptionsColumn.AllowEdit = false;
             this.gv_tbl002.Tag = "query_a.tbl002";
             this.gv_tbl002.Visible = true;
-            this.gv_tbl002.VisibleIndex = 3;
+            this.gv_tbl002.VisibleIndex = 5;
             this.gv_tbl002.Width = 94;
             // 
             // lb_tbl001
             // 
             this.lb_tbl001.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tbl001.Appearance.Options.UseFont = true;
-            this.lb_tbl001.Location = new System.Drawing.Point(508, 20);
+            this.lb_tbl001.Location = new System.Drawing.Point(255, 82);
             this.lb_tbl001.Name = "lb_tbl001";
-            this.lb_tbl001.Size = new System.Drawing.Size(73, 21);
+            this.lb_tbl001.Size = new System.Drawing.Size(68, 21);
             this.lb_tbl001.TabIndex = 213;
-            this.lb_tbl001.Text = "浜х嚎鍚嶇О ";
+            this.lb_tbl001.Text = "浜х嚎鍚嶇О";
             // 
-            // txt_tbl001
+            // txt_lineName
             // 
-            this.txt_tbl001.Enabled = false;
-            this.txt_tbl001.Location = new System.Drawing.Point(585, 16);
-            this.txt_tbl001.Name = "txt_tbl001";
-            this.txt_tbl001.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_tbl001.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl001.Size = new System.Drawing.Size(150, 28);
-            this.txt_tbl001.TabIndex = 213;
+            this.txt_lineName.Location = new System.Drawing.Point(326, 78);
+            this.txt_lineName.Name = "txt_lineName";
+            this.txt_lineName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
+            this.txt_lineName.Size = new System.Drawing.Size(201, 28);
+            this.txt_lineName.TabIndex = 213;
+            this.txt_lineName.Tag = "readonly";
             // 
             // gv_tbl001
             // 
@@ -1053,56 +926,42 @@
             this.gv_tbl001.OptionsColumn.AllowEdit = false;
             this.gv_tbl001.Tag = "query_a.tbl001";
             this.gv_tbl001.Visible = true;
-            this.gv_tbl001.VisibleIndex = 2;
+            this.gv_tbl001.VisibleIndex = 7;
             this.gv_tbl001.Width = 94;
             // 
             // lb_billNo
             // 
             this.lb_billNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_billNo.Appearance.Options.UseFont = true;
-            this.lb_billNo.Location = new System.Drawing.Point(11, 20);
+            this.lb_billNo.Location = new System.Drawing.Point(13, 20);
             this.lb_billNo.Name = "lb_billNo";
-            this.lb_billNo.Size = new System.Drawing.Size(73, 21);
+            this.lb_billNo.Size = new System.Drawing.Size(68, 21);
             this.lb_billNo.TabIndex = 211;
-            this.lb_billNo.Text = "閫�鏂欏崟鍙� ";
+            this.lb_billNo.Text = "鐢宠鍗曞彿";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Enabled = false;
             this.txt_billNo.Location = new System.Drawing.Point(85, 16);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(150, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(164, 28);
             this.txt_billNo.TabIndex = 211;
+            this.txt_billNo.Tag = "readonly";
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
-            this.gv_billNo.Caption = "鍗曞彿 ";
+            this.gv_billNo.Caption = "鐢宠鍗曞彿 ";
             this.gv_billNo.FieldName = "billNo";
             this.gv_billNo.MinWidth = 50;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 1;
+            this.gv_billNo.VisibleIndex = 3;
             this.gv_billNo.Width = 94;
-            // 
-            // gv_id
-            // 
-            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "ID ";
-            this.gv_id.FieldName = "id";
-            this.gv_id.MinWidth = 50;
-            this.gv_id.Name = "gv_id";
-            this.gv_id.OptionsColumn.AllowEdit = false;
-            this.gv_id.Tag = "query_a.id";
-            this.gv_id.Visible = true;
-            this.gv_id.VisibleIndex = 0;
-            this.gv_id.Width = 94;
             // 
             // toolBarMenu1
             // 
@@ -1133,40 +992,65 @@
             // 
             // gridView1
             // 
+            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
+            this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_id,
+            this.gv_tbl013,
+            this.gv_tbl020,
+            this.gridColumn5,
             this.gv_billNo,
-            this.gv_tbl001,
-            this.gv_tbl002,
             this.gv_tbl003,
+            this.gv_tbl002,
+            this.gv_tbl021,
+            this.gv_tbl001,
+            this.gridColumn6,
+            this.gridColumn10,
             this.gv_tbl004,
             this.gv_tbl005,
-            this.gv_tbl006,
-            this.gv_tbl007,
-            this.gv_tbl008,
             this.gv_tbl009,
             this.gv_tbl010,
             this.gv_tbl011,
-            this.gv_tbl012,
-            this.gv_tbl013,
-            this.gv_tbl014,
-            this.gv_tbl015,
-            this.gv_tbl016,
-            this.gv_tbl017,
-            this.gv_tbl018,
-            this.gv_tbl019,
-            this.gv_tbl020,
-            this.gv_tbl021,
-            this.gv_itemId,
-            this.gv_tbl022});
+            this.gv_tbl012});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn5
+            // 
+            this.gridColumn5.Caption = "閫�鏂欑粍缁�";
+            this.gridColumn5.FieldName = "tlOrg";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Tag = "org.fnamber";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 2;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "浜у搧缂栫爜";
+            this.gridColumn6.FieldName = "daa029";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 8;
+            this.gridColumn6.Width = 94;
+            // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "浜у搧鍚嶇О";
+            this.gridColumn10.FieldName = "daa003";
+            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 9;
+            this.gridColumn10.Width = 94;
             // 
             // xtraTabControl1
             // 
@@ -1211,10 +1095,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 190);
+            this.tabMx.Location = new System.Drawing.Point(0, 209);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 402);
+            this.tabMx.Size = new System.Drawing.Size(1126, 383);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1222,13 +1106,172 @@
             // 
             // xtraTabPage3
             // 
+            this.xtraTabPage3.Controls.Add(this.gcMx2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 370);
-            this.xtraTabPage3.Text = "鏉$爜鏄庣粏";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 351);
+            this.xtraTabPage3.Text = "宸叉墦鏉$爜鏄庣粏";
+            // 
+            // gcMx2
+            // 
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit2});
+            this.gcMx2.Size = new System.Drawing.Size(1124, 351);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1guid,
+            this.gvMx1itemBarcode,
+            this.gridColumn4,
+            this.gridColumn9,
+            this.gridColumn8,
+            this.gvMx1quantity,
+            this.gridColumn7,
+            this.gvMx1createBy,
+            this.gvMx1lotDate,
+            this.gvBtnAlawys});
+            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.ShowGroupPanel = false;
+            // 
+            // gvMx1guid
+            // 
+            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx1guid.Caption = "guid";
+            this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.MinWidth = 50;
+            this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.Tag = "query_a.guid";
+            this.gvMx1guid.Width = 94;
+            // 
+            // gvMx1itemBarcode
+            // 
+            this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx1itemBarcode.FieldName = "itemBarcode";
+            this.gvMx1itemBarcode.MinWidth = 300;
+            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
+            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx1itemBarcode.Visible = true;
+            this.gvMx1itemBarcode.VisibleIndex = 0;
+            this.gvMx1itemBarcode.Width = 300;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn4.FieldName = "itemNo";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 1;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn9.FieldName = "itemName";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 2;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn8.FieldName = "itemModel";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 3;
+            this.gridColumn8.Width = 94;
+            // 
+            // gvMx1quantity
+            // 
+            this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
+            this.gvMx1quantity.Caption = "鏁伴噺";
+            this.gvMx1quantity.FieldName = "quantity";
+            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.Name = "gvMx1quantity";
+            this.gvMx1quantity.Tag = "query_a.QUANTITY";
+            this.gvMx1quantity.Visible = true;
+            this.gvMx1quantity.VisibleIndex = 4;
+            this.gvMx1quantity.Width = 94;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鍗曚綅";
+            this.gridColumn7.FieldName = "dwName";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.Width = 94;
+            // 
+            // gvMx1createBy
+            // 
+            this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
+            this.gvMx1createBy.Caption = "鍒涘缓浜�";
+            this.gvMx1createBy.FieldName = "createBy";
+            this.gvMx1createBy.MinWidth = 50;
+            this.gvMx1createBy.Name = "gvMx1createBy";
+            this.gvMx1createBy.Tag = "query_a.CREATE_BY";
+            this.gvMx1createBy.Visible = true;
+            this.gvMx1createBy.VisibleIndex = 6;
+            this.gvMx1createBy.Width = 94;
+            // 
+            // gvMx1lotDate
+            // 
+            this.gvMx1lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
+            this.gvMx1lotDate.FieldName = "createDate";
+            this.gvMx1lotDate.MinWidth = 50;
+            this.gvMx1lotDate.Name = "gvMx1lotDate";
+            this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
+            this.gvMx1lotDate.Visible = true;
+            this.gvMx1lotDate.VisibleIndex = 7;
+            this.gvMx1lotDate.Width = 94;
+            // 
+            // gvBtnAlawys
+            // 
+            this.gvBtnAlawys.Caption = "绉诲嚭";
+            this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
+            this.gvBtnAlawys.MinWidth = 25;
+            this.gvBtnAlawys.Name = "gvBtnAlawys";
+            this.gvBtnAlawys.Visible = true;
+            this.gvBtnAlawys.VisibleIndex = 8;
+            this.gvBtnAlawys.Width = 94;
+            // 
+            // repositoryItemButtonEdit2
+            // 
+            this.repositoryItemButtonEdit2.AutoHeight = false;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
             // 
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Controls.Add(this.txt_tbl023);
             this.panel1.Controls.Add(this.txt_tbl020);
             this.panel1.Controls.Add(this.txt_tbl013);
             this.panel1.Controls.Add(this.txt_tbl005);
@@ -1237,7 +1280,7 @@
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_tbl021);
-            this.panel1.Controls.Add(this.txt_tbl021);
+            this.panel1.Controls.Add(this.txt_workName);
             this.panel1.Controls.Add(this.lb_tbl020);
             this.panel1.Controls.Add(this.lb_tbl013);
             this.panel1.Controls.Add(this.lb_tbl012);
@@ -1248,42 +1291,60 @@
             this.panel1.Controls.Add(this.txt_tbl006);
             this.panel1.Controls.Add(this.lb_tbl005);
             this.panel1.Controls.Add(this.lb_tbl004);
-            this.panel1.Controls.Add(this.txt_tbl004);
+            this.panel1.Controls.Add(this.txt_itemName);
             this.panel1.Controls.Add(this.lb_tbl003);
-            this.panel1.Controls.Add(this.txt_tbl003);
+            this.panel1.Controls.Add(this.txt_rwd);
             this.panel1.Controls.Add(this.lb_tbl002);
             this.panel1.Controls.Add(this.lb_tbl001);
-            this.panel1.Controls.Add(this.txt_tbl001);
+            this.panel1.Controls.Add(this.txt_lineName);
             this.panel1.Controls.Add(this.lb_billNo);
             this.panel1.Controls.Add(this.txt_billNo);
             this.panel1.Dock = System.Windows.Forms.DockStyle.Top;
             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, 190);
+            this.panel1.Size = new System.Drawing.Size(1126, 209);
             this.panel1.TabIndex = 1;
+            // 
+            // labelControl2
+            // 
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(13, 52);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(68, 21);
+            this.labelControl2.TabIndex = 463;
+            this.labelControl2.Text = "閫�鏂欑粍缁�";
+            // 
+            // txt_tbl023
+            // 
+            this.txt_tbl023.IsReadly = false;
+            this.txt_tbl023.Location = new System.Drawing.Point(85, 47);
+            this.txt_tbl023.Name = "txt_tbl023";
+            this.txt_tbl023.Size = new System.Drawing.Size(164, 30);
+            this.txt_tbl023.TabIndex = 462;
             // 
             // txt_tbl020
             // 
             this.txt_tbl020.Enabled = false;
-            this.txt_tbl020.Location = new System.Drawing.Point(822, 120);
+            this.txt_tbl020.Location = new System.Drawing.Point(740, 79);
             this.txt_tbl020.Name = "txt_tbl020";
             this.txt_tbl020.Properties.Caption = "";
-            this.txt_tbl020.Size = new System.Drawing.Size(94, 24);
+            this.txt_tbl020.Size = new System.Drawing.Size(23, 24);
             this.txt_tbl020.TabIndex = 461;
             // 
             // txt_tbl013
             // 
             this.txt_tbl013.Enabled = false;
-            this.txt_tbl013.Location = new System.Drawing.Point(822, 85);
+            this.txt_tbl013.Location = new System.Drawing.Point(613, 80);
             this.txt_tbl013.Name = "txt_tbl013";
             this.txt_tbl013.Properties.Caption = "";
-            this.txt_tbl013.Size = new System.Drawing.Size(94, 24);
+            this.txt_tbl013.Size = new System.Drawing.Size(36, 24);
             this.txt_tbl013.TabIndex = 460;
             // 
             // txt_tbl005
             // 
-            this.txt_tbl005.Location = new System.Drawing.Point(85, 86);
+            this.txt_tbl005.Location = new System.Drawing.Point(85, 110);
             this.txt_tbl005.Name = "txt_tbl005";
             this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1291,21 +1352,22 @@
             "鑹搧閫�鏂�",
             "鏉ユ枡涓嶈壇閫�鏂�",
             "浣滀笟涓嶈壇閫�鏂�"});
-            this.txt_tbl005.Size = new System.Drawing.Size(150, 24);
+            this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_tbl005.Size = new System.Drawing.Size(164, 24);
             this.txt_tbl005.TabIndex = 459;
             // 
             // txt_tbl002
             // 
             this.txt_tbl002.IsReadly = false;
-            this.txt_tbl002.Location = new System.Drawing.Point(85, 50);
+            this.txt_tbl002.Location = new System.Drawing.Point(85, 78);
             this.txt_tbl002.Name = "txt_tbl002";
-            this.txt_tbl002.Size = new System.Drawing.Size(150, 28);
+            this.txt_tbl002.Size = new System.Drawing.Size(164, 30);
             this.txt_tbl002.TabIndex = 458;
             // 
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 150);
+            this.btnSelect.Location = new System.Drawing.Point(13, 173);
             this.btnSelect.Name = "btnSelect";
             this.btnSelect.Size = new System.Drawing.Size(107, 29);
             this.btnSelect.TabIndex = 457;
@@ -1361,18 +1423,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.kyPrtQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.textEdit6.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl021.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl012.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl011.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl006.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl004.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl003.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl001.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_rwd.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -1382,6 +1444,10 @@
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
@@ -1415,21 +1481,13 @@
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
         private DevExpress.XtraGrid.GridControl gcMx1;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl022;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl021;
-        private DevExpress.XtraEditors.TextEdit txt_tbl021;
+        private DevExpress.XtraEditors.TextEdit txt_workName;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl021;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl020;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl020;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl019;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl018;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl017;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl016;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl015;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl014;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl013;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl013;
@@ -1443,35 +1501,31 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl011;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl010;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl009;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl008;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl007;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl006;
         private DevExpress.XtraEditors.TextEdit txt_tbl006;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_tbl006;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl005;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl005;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl004;
-        private DevExpress.XtraEditors.TextEdit txt_tbl004;
+        private DevExpress.XtraEditors.TextEdit txt_itemName;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl004;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl003;
-        private DevExpress.XtraEditors.TextEdit txt_tbl003;
+        private DevExpress.XtraEditors.TextEdit txt_rwd;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl003;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl002;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl002;
 
         private DevExpress.XtraEditors.LabelControl lb_tbl001;
-        private DevExpress.XtraEditors.TextEdit txt_tbl001;
+        private DevExpress.XtraEditors.TextEdit txt_lineName;
         private DevExpress.XtraGrid.Columns.GridColumn gv_tbl001;
 
         private DevExpress.XtraEditors.LabelControl lb_billNo;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_id;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
@@ -1484,7 +1538,7 @@
         private DevExpress.XtraEditors.LabelControl labelControl12;
         private DevExpress.XtraEditors.TextEdit kyPrtQty;
         private DevExpress.XtraEditors.LabelControl labelControl13;
-        private DevExpress.XtraEditors.TextEdit textEdit6;
+        private DevExpress.XtraEditors.TextEdit txtYdy;
         private DevExpress.XtraEditors.LabelControl labelControl1;
         private DevExpress.XtraEditors.TextEdit txtQuantity;
         private DevExpress.XtraEditors.LabelControl labelControl10;
@@ -1502,5 +1556,24 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private UserControl.UcBtnPrint ucBtnPrint1;
+        private DevExpress.XtraGrid.GridControl gcMx2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1itemBarcode;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1quantity;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private UserControl.UcLookOrg txt_tbl023;
+        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3