bug
lu
5 天以前 5c26ea4c8c813ea85acf68fa07e180a12c748f33
DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -36,12 +36,6 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -63,6 +57,7 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
@@ -75,21 +70,29 @@
            this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
            this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
            this.btnZsm = new DevExpress.XtraEditors.SimpleButton();
            this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
            this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit();
            this.txt_lineName = new DevExpress.XtraEditors.TextEdit();
            this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_msg = new DevExpress.XtraEditors.TextEdit();
            this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_daa00111111 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_daa00111111 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -102,21 +105,6 @@
            this.gvMx1pricingUnit = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx100 = new DevExpress.XtraLayout.LayoutControl();
            this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
            this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
            this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -131,7 +119,9 @@
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -161,49 +151,38 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
            this.splitMx98.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
            this.splitMx98.Panel2.SuspendLayout();
            this.splitMx98.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx100)).BeginInit();
            this.layoutMx100.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -460,11 +439,12 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1363, 570);
            this.splitMx1.SplitterPosition = 111;
            this.splitMx1.SplitterPosition = 150;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.ucBtnPrint98);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_releaseNo);
            this.layoutMx1.Controls.Add(this.txt_guid);
@@ -477,18 +457,34 @@
            this.layoutMx1.Controls.Add(this.txt_itemModel);
            this.layoutMx1.Controls.Add(this.txt_erpCheckBy);
            this.layoutMx1.Controls.Add(this.btnZsm);
            this.layoutMx1.Controls.Add(this.txt_daa001);
            this.layoutMx1.Controls.Add(this.txt_aboutGuid);
            this.layoutMx1.Controls.Add(this.txt_lineName);
            this.layoutMx1.Controls.Add(this.txt_workNo);
            this.layoutMx1.Controls.Add(this.txt_msg);
            this.layoutMx1.Controls.Add(this.txt_fngHandle);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem3,
            this.layoutControlItem4});
            this.layoutControlItem4,
            this.txt_daa00111111});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(656, 429, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(239, 530, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1363, 111);
            this.layoutMx1.Size = new System.Drawing.Size(1363, 150);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // ucBtnPrint98
            //
            this.ucBtnPrint98.allClickKey = null;
            this.ucBtnPrint98.guidKey = null;
            this.ucBtnPrint98.Location = new System.Drawing.Point(1002, 111);
            this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint98.Name = "ucBtnPrint98";
            this.ucBtnPrint98.rptParameter = null;
            this.ucBtnPrint98.Size = new System.Drawing.Size(328, 29);
            this.ucBtnPrint98.TabIndex = 9;
            // 
            // lbGuid
            // 
@@ -533,7 +529,7 @@
            // 
            // txt_createBy
            // 
            this.txt_createBy.Location = new System.Drawing.Point(759, 43);
            this.txt_createBy.Location = new System.Drawing.Point(759, 45);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Size = new System.Drawing.Size(239, 24);
            this.txt_createBy.StyleController = this.layoutMx1;
@@ -541,7 +537,7 @@
            // 
            // txt_createDate
            // 
            this.txt_createDate.Location = new System.Drawing.Point(1089, 43);
            this.txt_createDate.Location = new System.Drawing.Point(1089, 45);
            this.txt_createDate.Name = "txt_createDate";
            this.txt_createDate.Size = new System.Drawing.Size(241, 24);
            this.txt_createDate.StyleController = this.layoutMx1;
@@ -549,7 +545,7 @@
            // 
            // txt_fbatchQty
            // 
            this.txt_fbatchQty.Location = new System.Drawing.Point(99, 43);
            this.txt_fbatchQty.Location = new System.Drawing.Point(99, 45);
            this.txt_fbatchQty.Name = "txt_fbatchQty";
            this.txt_fbatchQty.Size = new System.Drawing.Size(239, 24);
            this.txt_fbatchQty.StyleController = this.layoutMx1;
@@ -557,7 +553,7 @@
            // 
            // txt_mrmodeTxt
            // 
            this.txt_mrmodeTxt.Location = new System.Drawing.Point(429, 43);
            this.txt_mrmodeTxt.Location = new System.Drawing.Point(429, 111);
            this.txt_mrmodeTxt.Name = "txt_mrmodeTxt";
            this.txt_mrmodeTxt.Size = new System.Drawing.Size(239, 24);
            this.txt_mrmodeTxt.StyleController = this.layoutMx1;
@@ -573,7 +569,7 @@
            // 
            // txt_erpCheckBy
            // 
            this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 74);
            this.txt_erpCheckBy.Location = new System.Drawing.Point(99, 78);
            this.txt_erpCheckBy.Name = "txt_erpCheckBy";
            this.txt_erpCheckBy.Size = new System.Drawing.Size(239, 24);
            this.txt_erpCheckBy.StyleController = this.layoutMx1;
@@ -582,20 +578,52 @@
            // btnZsm
            // 
            this.btnZsm.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.insert_16x16;
            this.btnZsm.Location = new System.Drawing.Point(342, 74);
            this.btnZsm.Location = new System.Drawing.Point(672, 111);
            this.btnZsm.Name = "btnZsm";
            this.btnZsm.Size = new System.Drawing.Size(116, 27);
            this.btnZsm.Size = new System.Drawing.Size(196, 27);
            this.btnZsm.StyleController = this.layoutMx1;
            this.btnZsm.TabIndex = 242;
            this.btnZsm.Text = "生成追溯码";
            this.btnZsm.Text = "确认反工并生成新追溯码";
            // 
            // txt_daa001
            // txt_aboutGuid
            // 
            this.txt_daa001.Location = new System.Drawing.Point(759, 74);
            this.txt_daa001.Name = "txt_daa001";
            this.txt_daa001.Size = new System.Drawing.Size(239, 24);
            this.txt_daa001.StyleController = this.layoutMx1;
            this.txt_daa001.TabIndex = 243;
            this.txt_aboutGuid.Location = new System.Drawing.Point(770, 80);
            this.txt_aboutGuid.Name = "txt_aboutGuid";
            this.txt_aboutGuid.Size = new System.Drawing.Size(245, 24);
            this.txt_aboutGuid.StyleController = this.layoutMx1;
            this.txt_aboutGuid.TabIndex = 243;
            //
            // txt_lineName
            //
            this.txt_lineName.Location = new System.Drawing.Point(429, 45);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Size = new System.Drawing.Size(239, 24);
            this.txt_lineName.StyleController = this.layoutMx1;
            this.txt_lineName.TabIndex = 244;
            //
            // txt_workNo
            //
            this.txt_workNo.Location = new System.Drawing.Point(99, 111);
            this.txt_workNo.Name = "txt_workNo";
            this.txt_workNo.Size = new System.Drawing.Size(239, 24);
            this.txt_workNo.StyleController = this.layoutMx1;
            this.txt_workNo.TabIndex = 245;
            //
            // txt_msg
            //
            this.txt_msg.Location = new System.Drawing.Point(759, 78);
            this.txt_msg.Name = "txt_msg";
            this.txt_msg.Size = new System.Drawing.Size(571, 24);
            this.txt_msg.StyleController = this.layoutMx1;
            this.txt_msg.TabIndex = 246;
            //
            // txt_fngHandle
            //
            this.txt_fngHandle.Location = new System.Drawing.Point(429, 78);
            this.txt_fngHandle.Name = "txt_fngHandle";
            this.txt_fngHandle.Size = new System.Drawing.Size(239, 24);
            this.txt_fngHandle.StyleController = this.layoutMx1;
            this.txt_fngHandle.TabIndex = 247;
            // 
            // layoutControlItem3
            // 
@@ -618,6 +646,17 @@
            this.layoutControlItem4.Text = "主键GUID";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(50, 20);
            // 
            // txt_daa00111111
            //
            this.txt_daa00111111.Control = this.txt_aboutGuid;
            this.txt_daa00111111.Location = new System.Drawing.Point(671, 68);
            this.txt_daa00111111.Name = "txt_daa00111111";
            this.txt_daa00111111.OptionsTableLayoutItem.ColumnIndex = 2;
            this.txt_daa00111111.OptionsTableLayoutItem.RowIndex = 2;
            this.txt_daa00111111.Size = new System.Drawing.Size(336, 34);
            this.txt_daa00111111.Text = "工单Guid";
            this.txt_daa00111111.TextSize = new System.Drawing.Size(75, 18);
            //
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -628,12 +667,16 @@
            this.layoutControlItem2,
            this.layoutControlItem6,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem7,
            this.layoutControlItem11,
            this.layoutControlItem14,
            this.layoutControlItem15,
            this.layoutControlItem8,
            this.txt_daa00111111});
            this.layoutControlItem10,
            this.layoutControlItem12,
            this.layoutControlItem17,
            this.layoutControlItem16,
            this.layoutControlItem13});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -655,11 +698,14 @@
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3});
            this.Root.Size = new System.Drawing.Size(1342, 113);
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1342, 152);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -667,7 +713,7 @@
            this.layoutControlItem1.Control = this.txt_releaseNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem1.Text = "检验单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -677,7 +723,7 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(330, 0);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem5.Text = "产品编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -687,50 +733,39 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem2.Text = "产品名称";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_createBy;
            this.layoutControlItem6.Location = new System.Drawing.Point(660, 31);
            this.layoutControlItem6.Location = new System.Drawing.Point(660, 33);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem6.Text = "开单人";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_fbatchQty;
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 33);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem9.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem9.Text = "需返工数量";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_mrmodeTxt;
            this.layoutControlItem10.Location = new System.Drawing.Point(330, 31);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem10.Text = "返工工序";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_createDate;
            this.layoutControlItem7.Location = new System.Drawing.Point(990, 31);
            this.layoutControlItem7.Location = new System.Drawing.Point(990, 33);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(332, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem7.Text = "开单日期";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -740,45 +775,89 @@
            this.layoutControlItem11.Location = new System.Drawing.Point(990, 0);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.Size = new System.Drawing.Size(332, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem11.Text = "产品规格";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_erpCheckBy;
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 66);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem14.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem14.Text = "已返工数量";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_workNo;
            this.layoutControlItem15.Location = new System.Drawing.Point(0, 99);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem15.Text = "工单单号";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.btnZsm;
            this.layoutControlItem8.Location = new System.Drawing.Point(330, 62);
            this.layoutControlItem8.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem8.MinSize = new System.Drawing.Size(86, 31);
            this.layoutControlItem8.Location = new System.Drawing.Point(660, 99);
            this.layoutControlItem8.MaxSize = new System.Drawing.Size(200, 31);
            this.layoutControlItem8.MinSize = new System.Drawing.Size(105, 31);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(330, 31);
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem8.Text = "生成追溯码";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
            // 
            // txt_daa00111111
            // layoutControlItem10
            // 
            this.txt_daa00111111.Control = this.txt_daa001;
            this.txt_daa00111111.Location = new System.Drawing.Point(660, 62);
            this.txt_daa00111111.Name = "txt_daa00111111";
            this.txt_daa00111111.OptionsTableLayoutItem.ColumnIndex = 2;
            this.txt_daa00111111.OptionsTableLayoutItem.RowIndex = 2;
            this.txt_daa00111111.Size = new System.Drawing.Size(330, 31);
            this.txt_daa00111111.Text = "工单Guid";
            this.txt_daa00111111.TextSize = new System.Drawing.Size(75, 18);
            this.layoutControlItem10.Control = this.txt_mrmodeTxt;
            this.layoutControlItem10.Location = new System.Drawing.Point(330, 99);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem10.Text = "返工工序";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_lineName;
            this.layoutControlItem12.Location = new System.Drawing.Point(330, 33);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem12.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem12.Text = "产线";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.txt_fngHandle;
            this.layoutControlItem17.Location = new System.Drawing.Point(330, 66);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem17.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem17.Text = "处置结果";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem16
            //
            this.layoutControlItem16.Control = this.txt_msg;
            this.layoutControlItem16.Location = new System.Drawing.Point(660, 66);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(662, 33);
            this.layoutControlItem16.Text = "违规类别";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
            // 
            // tabMx
            // 
@@ -786,7 +865,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1363, 447);
            this.tabMx.Size = new System.Drawing.Size(1363, 408);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -796,7 +875,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1361, 415);
            this.tabMxPage1.Size = new System.Drawing.Size(1361, 376);
            this.tabMxPage1.Text = "卡板明细";
            // 
            // gcMx1
@@ -805,7 +884,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1361, 415);
            this.gcMx1.Size = new System.Drawing.Size(1361, 376);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -903,209 +982,10 @@
            // 
            // tabMxPage2
            // 
            this.tabMxPage2.Controls.Add(this.splitMx98);
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1361, 403);
            this.tabMxPage2.Size = new System.Drawing.Size(1361, 332);
            this.tabMxPage2.Text = "追溯码明细";
            //
            // splitMx98
            //
            this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
            this.splitMx98.Horizontal = false;
            this.splitMx98.Location = new System.Drawing.Point(0, 0);
            this.splitMx98.Name = "splitMx98";
            //
            // splitMx98.Panel1
            //
            this.splitMx98.Panel1.Controls.Add(this.layoutMx100);
            this.splitMx98.Panel1.Text = "Panel1";
            //
            // splitMx98.Panel2
            //
            this.splitMx98.Panel2.Controls.Add(this.gcMx2);
            this.splitMx98.Panel2.Text = "Panel2";
            this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx98.Size = new System.Drawing.Size(1361, 403);
            this.splitMx98.SplitterPosition = 56;
            this.splitMx98.TabIndex = 2;
            //
            // layoutMx100
            //
            this.layoutMx100.Controls.Add(this.ucBtnPrint98);
            this.layoutMx100.Controls.Add(this.txt_zQty98);
            this.layoutMx100.Controls.Add(this.txt_yQty98);
            this.layoutMx100.Controls.Add(this.txt_kQty98);
            this.layoutMx100.Controls.Add(this.txt_iCount_98);
            this.layoutMx100.Controls.Add(this.txt_printRemark98);
            this.layoutMx100.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx100.Location = new System.Drawing.Point(0, 0);
            this.layoutMx100.Name = "layoutMx100";
            this.layoutMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(454, 530, 812, 500);
            this.layoutMx100.Root = this.layoutControlGroup1;
            this.layoutMx100.Size = new System.Drawing.Size(1361, 56);
            this.layoutMx100.TabIndex = 0;
            this.layoutMx100.Text = "layoutControl1";
            //
            // ucBtnPrint98
            //
            this.ucBtnPrint98.allClickKey = null;
            this.ucBtnPrint98.guidKey = null;
            this.ucBtnPrint98.Location = new System.Drawing.Point(1127, 12);
            this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint98.Name = "ucBtnPrint98";
            this.ucBtnPrint98.rptParameter = null;
            this.ucBtnPrint98.Size = new System.Drawing.Size(222, 32);
            this.ucBtnPrint98.TabIndex = 9;
            //
            // txt_zQty98
            //
            this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
            this.txt_zQty98.Name = "txt_zQty98";
            this.txt_zQty98.Properties.ReadOnly = true;
            this.txt_zQty98.Size = new System.Drawing.Size(117, 24);
            this.txt_zQty98.StyleController = this.layoutMx100;
            this.txt_zQty98.TabIndex = 4;
            //
            // txt_yQty98
            //
            this.txt_yQty98.Location = new System.Drawing.Point(337, 12);
            this.txt_yQty98.Name = "txt_yQty98";
            this.txt_yQty98.Properties.ReadOnly = true;
            this.txt_yQty98.Size = new System.Drawing.Size(117, 24);
            this.txt_yQty98.StyleController = this.layoutMx100;
            this.txt_yQty98.TabIndex = 5;
            //
            // txt_kQty98
            //
            this.txt_kQty98.Location = new System.Drawing.Point(560, 12);
            this.txt_kQty98.Name = "txt_kQty98";
            this.txt_kQty98.Properties.ReadOnly = true;
            this.txt_kQty98.Size = new System.Drawing.Size(117, 24);
            this.txt_kQty98.StyleController = this.layoutMx100;
            this.txt_kQty98.TabIndex = 6;
            //
            // txt_iCount_98
            //
            this.txt_iCount_98.Location = new System.Drawing.Point(1006, 12);
            this.txt_iCount_98.Name = "txt_iCount_98";
            this.txt_iCount_98.Size = new System.Drawing.Size(117, 24);
            this.txt_iCount_98.StyleController = this.layoutMx100;
            this.txt_iCount_98.TabIndex = 7;
            //
            // txt_printRemark98
            //
            this.txt_printRemark98.Location = new System.Drawing.Point(783, 12);
            this.txt_printRemark98.Name = "txt_printRemark98";
            this.txt_printRemark98.Size = new System.Drawing.Size(117, 24);
            this.txt_printRemark98.StyleController = this.layoutMx100;
            this.txt_printRemark98.TabIndex = 10;
            //
            // layoutControlGroup1
            //
            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup1.GroupBordersVisible = false;
            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem42,
            this.layoutControlItem43,
            this.layoutControlItem44,
            this.layoutControlItem45,
            this.layoutControlItem13,
            this.layoutControlItem12});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8,
            columnDefinition9,
            columnDefinition10});
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition4});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1361, 56);
            this.layoutControlGroup1.TextVisible = false;
            //
            // layoutControlItem42
            //
            this.layoutControlItem42.Control = this.txt_zQty98;
            this.layoutControlItem42.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem42.CustomizationFormText = "工单总量";
            this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem42.Name = "layoutControlItem42";
            this.layoutControlItem42.Size = new System.Drawing.Size(223, 36);
            this.layoutControlItem42.Text = "工单总量";
            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem43
            //
            this.layoutControlItem43.Control = this.txt_yQty98;
            this.layoutControlItem43.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem43.CustomizationFormText = "已打印数";
            this.layoutControlItem43.Location = new System.Drawing.Point(223, 0);
            this.layoutControlItem43.Name = "layoutControlItem43";
            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem43.Size = new System.Drawing.Size(223, 36);
            this.layoutControlItem43.Text = "已打印数";
            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem44
            //
            this.layoutControlItem44.Control = this.txt_kQty98;
            this.layoutControlItem44.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem44.CustomizationFormText = "可打印数";
            this.layoutControlItem44.Location = new System.Drawing.Point(446, 0);
            this.layoutControlItem44.Name = "layoutControlItem44";
            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem44.Size = new System.Drawing.Size(223, 36);
            this.layoutControlItem44.Text = "可打印数字";
            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem45
            //
            this.layoutControlItem45.Control = this.txt_iCount_98;
            this.layoutControlItem45.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem45.CustomizationFormText = "本次打印张数";
            this.layoutControlItem45.Location = new System.Drawing.Point(892, 0);
            this.layoutControlItem45.Name = "layoutControlItem45";
            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem45.Size = new System.Drawing.Size(223, 36);
            this.layoutControlItem45.Text = "本次打印张数";
            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.ucBtnPrint98;
            this.layoutControlItem13.Location = new System.Drawing.Point(1115, 0);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(226, 36);
            this.layoutControlItem13.Text = "打印按钮";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_printRemark98;
            this.layoutControlItem12.Location = new System.Drawing.Point(669, 0);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(223, 36);
            this.layoutControlItem12.Text = "打印备注";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            // 
            // gcMx2
            // 
@@ -1113,8 +993,8 @@
            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(1361, 335);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.Size = new System.Drawing.Size(1361, 332);
            this.gcMx2.TabIndex = 2;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
@@ -1135,7 +1015,8 @@
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn8});
            this.gridColumn8,
            this.gridColumn9});
            this.gvMx2.GridControl = this.gcMx2;
            this.gvMx2.Name = "gvMx2";
            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1145,6 +1026,7 @@
            // gridColumn4
            // 
            this.gridColumn4.Caption = "新的追溯码";
            this.gridColumn4.FieldName = "barCode";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
@@ -1208,7 +1090,7 @@
            // gridColumn47
            // 
            this.gridColumn47.Caption = "旧的追溯码";
            this.gridColumn47.FieldName = "barCode";
            this.gridColumn47.FieldName = "barCodeOld";
            this.gridColumn47.MinWidth = 25;
            this.gridColumn47.Name = "gridColumn47";
            this.gridColumn47.Visible = true;
@@ -1228,6 +1110,7 @@
            // gridColumn5
            // 
            this.gridColumn5.Caption = "绑定人";
            this.gridColumn5.FieldName = "bdDateTime";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
@@ -1237,6 +1120,7 @@
            // gridColumn6
            // 
            this.gridColumn6.Caption = "托板码";
            this.gridColumn6.FieldName = "tbCode";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
@@ -1246,6 +1130,7 @@
            // gridColumn7
            // 
            this.gridColumn7.Caption = "生产工单";
            this.gridColumn7.FieldName = "daa001";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
@@ -1255,11 +1140,34 @@
            // gridColumn8
            // 
            this.gridColumn8.Caption = "线别";
            this.gridColumn8.FieldName = "xtName";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 10;
            this.gridColumn8.Width = 156;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "状态";
            this.gridColumn9.FieldName = "barCodeStatus";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 11;
            this.gridColumn9.Width = 94;
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.ucBtnPrint98;
            this.layoutControlItem13.Location = new System.Drawing.Point(990, 99);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem13.Text = "确定打印";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            // 
            // Frm_WomFanGong
            // 
@@ -1299,49 +1207,38 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_msg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
            this.splitMx98.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
            this.splitMx98.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
            this.splitMx98.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx100)).EndInit();
            this.layoutMx100.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1395,15 +1292,19 @@
        private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
        private DevExpress.XtraEditors.TextEdit txt_mrmodeTxt;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraEditors.TextEdit txt_itemModel;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraEditors.SimpleButton btnZsm;
        private UserControl.UcBtnPrint ucBtnPrint98;
        private DevExpress.XtraEditors.TextEdit txt_aboutGuid;
        private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
        private DevExpress.XtraGrid.GridControl gcMx2;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
@@ -1411,29 +1312,21 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
        private DevExpress.XtraEditors.SimpleButton btnZsm;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraEditors.SplitContainerControl splitMx98;
        private DevExpress.XtraLayout.LayoutControl layoutMx100;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraEditors.TextEdit txt_zQty98;
        private DevExpress.XtraEditors.TextEdit txt_yQty98;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
        private DevExpress.XtraEditors.TextEdit txt_kQty98;
        private DevExpress.XtraEditors.TextEdit txt_iCount_98;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem44;
        private UserControl.UcBtnPrint ucBtnPrint98;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraEditors.TextEdit txt_daa001;
        private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
        private DevExpress.XtraEditors.TextEdit txt_printRemark98;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraEditors.TextEdit txt_lineName;
        private DevExpress.XtraEditors.TextEdit txt_workNo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraEditors.TextEdit txt_msg;
        private DevExpress.XtraEditors.TextEdit txt_fngHandle;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
    }
}