From 9d3b4f0525c5a0c9a4c1e521cec260226394842f Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 13 一月 2025 16:02:29 +0800
Subject: [PATCH] 采购退料申请

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs |  508 ++++++++++++++++++++++++++++++++++++++------------------
 1 files changed, 345 insertions(+), 163 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index 9451777..954c447 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            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 +52,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();
@@ -72,7 +73,7 @@
             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();
@@ -100,20 +101,19 @@
             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();
@@ -123,7 +123,20 @@
             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.gvMx1quantity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = 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.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
             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();
@@ -146,13 +159,13 @@
             ((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 +175,9 @@
             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();
             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
@@ -192,7 +208,7 @@
             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});
@@ -336,8 +354,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 +362,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 +371,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,22 +381,23 @@
             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
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // 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);
@@ -404,9 +421,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;
@@ -566,7 +592,7 @@
             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.VisibleIndex = 23;
             this.gv_tbl022.Width = 94;
             // 
             // gv_itemId
@@ -580,28 +606,28 @@
             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.VisibleIndex = 22;
             this.gv_itemId.Width = 94;
             // 
             // 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
             // 
@@ -614,14 +640,14 @@
             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 = 21;
             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;
@@ -638,7 +664,7 @@
             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.VisibleIndex = 20;
             this.gv_tbl020.Width = 94;
             // 
             // gv_tbl019
@@ -652,7 +678,7 @@
             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.VisibleIndex = 19;
             this.gv_tbl019.Width = 94;
             // 
             // gv_tbl018
@@ -666,7 +692,7 @@
             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.VisibleIndex = 18;
             this.gv_tbl018.Width = 94;
             // 
             // gv_tbl017
@@ -680,7 +706,7 @@
             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.VisibleIndex = 17;
             this.gv_tbl017.Width = 94;
             // 
             // gv_tbl016
@@ -694,7 +720,7 @@
             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.VisibleIndex = 16;
             this.gv_tbl016.Width = 94;
             // 
             // gv_tbl015
@@ -708,7 +734,7 @@
             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.VisibleIndex = 15;
             this.gv_tbl015.Width = 94;
             // 
             // gv_tbl014
@@ -722,14 +748,14 @@
             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.VisibleIndex = 14;
             this.gv_tbl014.Width = 94;
             // 
             // 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;
@@ -746,14 +772,14 @@
             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.VisibleIndex = 13;
             this.gv_tbl013.Width = 94;
             // 
             // 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 +787,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 +806,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 = 12;
             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 +821,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 +840,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 = 11;
             this.gv_tbl011.Width = 94;
             // 
             // gv_tbl010
@@ -828,7 +854,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 = 10;
             this.gv_tbl010.Width = 94;
             // 
             // gv_tbl009
@@ -842,7 +868,7 @@
             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 = 9;
             this.gv_tbl009.Width = 94;
             // 
             // gv_tbl008
@@ -856,7 +882,7 @@
             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.VisibleIndex = 8;
             this.gv_tbl008.Width = 94;
             // 
             // gv_tbl007
@@ -870,14 +896,14 @@
             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.VisibleIndex = 7;
             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,11 +911,11 @@
             // 
             // 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
@@ -903,14 +929,14 @@
             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.VisibleIndex = 6;
             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,28 +953,28 @@
             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 = 5;
             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
             // 
@@ -961,28 +987,28 @@
             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 = 4;
             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
             // 
@@ -995,14 +1021,14 @@
             this.gv_tbl003.OptionsColumn.AllowEdit = false;
             this.gv_tbl003.Tag = "query_a.tbl003";
             this.gv_tbl003.Visible = true;
-            this.gv_tbl003.VisibleIndex = 4;
+            this.gv_tbl003.VisibleIndex = 3;
             this.gv_tbl003.Width = 94;
             // 
             // lb_tbl002
             // 
             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;
@@ -1019,28 +1045,28 @@
             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 = 2;
             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,28 +1079,28 @@
             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 = 1;
             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
             // 
@@ -1087,22 +1113,8 @@
             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 = 0;
             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
             // 
@@ -1136,7 +1148,6 @@
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_id,
             this.gv_billNo,
             this.gv_tbl001,
             this.gv_tbl002,
@@ -1211,10 +1222,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 +1233,149 @@
             // 
             // xtraTabPage3
             // 
+            this.xtraTabPage3.Controls.Add(this.gcMx2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 370);
+            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.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.gvMx1quantity,
+            this.gridColumn7,
+            this.gridColumn4,
+            this.gridColumn9,
+            this.gridColumn8,
+            this.gvMx1createBy,
+            this.gvMx1lotDate});
+            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;
+            // 
+            // 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;
+            // 
+            // 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 = 1;
+            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 = 2;
+            this.gridColumn7.Width = 94;
+            // 
+            // gridColumn4
+            // 
+            this.gridColumn4.Caption = "鐗╂枡缂栫爜";
+            this.gridColumn4.FieldName = "wlbm";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 3;
+            this.gridColumn4.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn9.FieldName = "wlmc";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 4;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn8.FieldName = "wlgg";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 5;
+            this.gridColumn8.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;
             // 
             // 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 +1384,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 +1395,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 +1456,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;
@@ -1366,13 +1532,13 @@
             ((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 +1548,9 @@
             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();
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_tbl020.Properties)).EndInit();
@@ -1419,7 +1588,7 @@
         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;
@@ -1454,24 +1623,23 @@
         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;
@@ -1502,5 +1670,19 @@
         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;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3