lu
2025-03-31 236874a930147c27e46c673d8c1a607f1260e8aa
追溯码
已添加1个文件
已修改10个文件
1723 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 1415 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs 41 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Gs.DevApp.csproj 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.Designer.cs 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Properties/Resources.resx 189 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/Resources/user_32x32.png 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectFont.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/SelectFont.cs 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/DocNoRule.cs
@@ -405,6 +405,7 @@
            dataTable.Rows.Add("IQCYC(IQC异常)");
            dataTable.Rows.Add("IPQCYC(IPQC异常)");
            dataTable.Rows.Add("FQCYC(FQC异常)");
            dataTable.Rows.Add("ZSM(追溯码)");
            txt_docCode.Properties.DataSource = dataTable;
            txt_docCode.Properties.DisplayMember = "docCode"; // 显示的列
            txt_docCode.Properties.ValueMember = "docCode"; // 实际值的列
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,23 +29,39 @@
        /// </summary>
        private void InitializeComponent()
        {
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            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.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            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.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -95,19 +111,13 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_sjXt = new Gs.DevApp.UserControl.UcLookWorkline();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.txt_daa009 = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa001 = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa008 = new DevExpress.XtraEditors.TextEdit();
            this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
            this.txt_saleOrderNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa028 = new DevExpress.XtraEditors.TextEdit();
            this.txt_mesStartProd = new DevExpress.XtraEditors.TextEdit();
@@ -136,24 +146,18 @@
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -207,6 +211,46 @@
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.panMx99 = new System.Windows.Forms.Panel();
            this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_printRemark = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.panMx98 = new System.Windows.Forms.Panel();
            this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
            this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
            this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit();
            this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -226,16 +270,11 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).BeginInit();
@@ -264,24 +303,18 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -291,6 +324,38 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            this.panMx99.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).BeginInit();
            this.layoutMx99.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            this.xtraTabPage3.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            this.panMx98.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit();
            this.layoutMx98.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -351,7 +416,6 @@
            // gcMain1
            // 
            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
@@ -364,7 +428,6 @@
            // 
            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gridView1.Appearance.Row.Options.UseFont = true;
            this.gridView1.ColumnPanelRowHeight = 50;
            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -428,7 +491,6 @@
            // 
            // gv_daa027
            // 
            this.gv_daa027.AppearanceCell.Options.UseFont = true;
            this.gv_daa027.AppearanceHeader.Options.UseTextOptions = true;
            this.gv_daa027.AppearanceHeader.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
@@ -539,7 +601,6 @@
            // 
            // gv_daa018
            // 
            this.gv_daa018.AppearanceCell.Options.UseFont = true;
            this.gv_daa018.Caption = "工单状态";
            this.gv_daa018.FieldName = "daa018";
@@ -564,7 +625,6 @@
            // 
            // gv_daa001
            // 
            this.gv_daa001.AppearanceCell.Options.UseFont = true;
            this.gv_daa001.Caption = "工单单号";
            this.gv_daa001.FieldName = "daa001";
@@ -578,7 +638,6 @@
            // 
            // gv_daa021
            // 
            this.gv_daa021.AppearanceCell.Options.UseFont = true;
            this.gv_daa021.Caption = "投料单号";
            this.gv_daa021.FieldName = "daa014";
@@ -602,7 +661,6 @@
            // 
            // gv_daa003
            // 
            this.gv_daa003.AppearanceCell.Options.UseFont = true;
            this.gv_daa003.Caption = "产品名称";
            this.gv_daa003.FieldName = "daa003";
@@ -616,7 +674,6 @@
            // 
            // gv_daa004
            // 
            this.gv_daa004.AppearanceCell.Options.UseFont = true;
            this.gv_daa004.Caption = "产品规格";
            this.gv_daa004.FieldName = "daa004";
@@ -630,7 +687,6 @@
            // 
            // gv_daa008
            // 
            this.gv_daa008.AppearanceCell.Options.UseFont = true;
            this.gv_daa008.Caption = "工单数量";
            this.gv_daa008.FieldName = "daa008";
@@ -645,7 +701,6 @@
            // 
            // gv_daa011
            // 
            this.gv_daa011.AppearanceCell.Options.UseFont = true;
            this.gv_daa011.Caption = "已生产量";
            this.gv_daa011.FieldName = "daa011";
@@ -671,7 +726,6 @@
            // 
            // gv_daa010
            // 
            this.gv_daa010.AppearanceCell.Options.UseFont = true;
            this.gv_daa010.Caption = "入库数量";
            this.gv_daa010.FieldName = "daa010";
@@ -686,7 +740,6 @@
            // 
            // gv_daa005
            // 
            this.gv_daa005.AppearanceCell.Options.UseFont = true;
            this.gv_daa005.Caption = "单位";
            this.gv_daa005.FieldName = "fname";
@@ -701,7 +754,6 @@
            // 
            // gv_cust
            // 
            this.gv_cust.AppearanceCell.Options.UseFont = true;
            this.gv_cust.Caption = "需求单号";
            this.gv_cust.FieldName = "saleNo";
@@ -725,7 +777,6 @@
            // 
            // gv_daa015
            // 
            this.gv_daa015.AppearanceCell.Options.UseFont = true;
            this.gv_daa015.Caption = "生产线别";
            this.gv_daa015.FieldName = "lineName";
@@ -749,7 +800,6 @@
            // 
            // gv_daa009
            // 
            this.gv_daa009.AppearanceCell.Options.UseFont = true;
            this.gv_daa009.Caption = "备注";
            this.gv_daa009.FieldName = "daa009";
@@ -763,7 +813,6 @@
            // 
            // gv_prepareTime
            // 
            this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
            this.gv_prepareTime.Caption = "预计备料时间";
            this.gv_prepareTime.FieldName = "prepareTime";
@@ -777,7 +826,6 @@
            // 
            // gv_daa028
            // 
            this.gv_daa028.AppearanceCell.Options.UseFont = true;
            this.gv_daa028.Caption = "备料完成时间";
            this.gv_daa028.FieldName = "daa028";
@@ -791,7 +839,6 @@
            // 
            // gv_daa016
            // 
            this.gv_daa016.AppearanceCell.Options.UseFont = true;
            this.gv_daa016.Caption = "实际开工日";
            this.gv_daa016.FieldName = "daa016";
@@ -805,7 +852,6 @@
            // 
            // gv_daa017
            // 
            this.gv_daa017.AppearanceCell.Options.UseFont = true;
            this.gv_daa017.Caption = "实际完工日";
            this.gv_daa017.FieldName = "daa017";
@@ -819,7 +865,6 @@
            // 
            // gv_mesStartProd
            // 
            this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
            this.gv_mesStartProd.Caption = "MES预计开工时间";
            this.gv_mesStartProd.FieldName = "mesStartProd";
@@ -833,7 +878,6 @@
            // 
            // gv_mesEndProd
            // 
            this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
            this.gv_mesEndProd.Caption = "MES预计完工时间";
            this.gv_mesEndProd.FieldName = "mesEndProd";
@@ -939,24 +983,18 @@
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.Size = new System.Drawing.Size(1126, 708);
            this.splitMx1.SplitterPosition = 237;
            this.splitMx1.SplitterPosition = 183;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_kQty);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_sjXt);
            this.layoutMx1.Controls.Add(this.ucBtnPrint1);
            this.layoutMx1.Controls.Add(this.txt_daa009);
            this.layoutMx1.Controls.Add(this.txt_daa013);
            this.layoutMx1.Controls.Add(this.txt_yQty);
            this.layoutMx1.Controls.Add(this.txt_iCount_1);
            this.layoutMx1.Controls.Add(this.txt_daa001);
            this.layoutMx1.Controls.Add(this.txt_psnQty_1);
            this.layoutMx1.Controls.Add(this.textEdit1);
            this.layoutMx1.Controls.Add(this.txt_daa008);
            this.layoutMx1.Controls.Add(this.txt_printRemark);
            this.layoutMx1.Controls.Add(this.txt_saleOrderNo);
            this.layoutMx1.Controls.Add(this.txt_daa028);
            this.layoutMx1.Controls.Add(this.txt_mesStartProd);
@@ -978,23 +1016,11 @@
            this.layoutControlItem29});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 587, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 237);
            this.layoutMx1.Size = new System.Drawing.Size(1126, 183);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            //
            // txt_kQty
            //
            this.txt_kQty.Location = new System.Drawing.Point(947, 76);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(167, 28);
            this.txt_kQty.StyleController = this.layoutMx1;
            this.txt_kQty.TabIndex = 471;
            this.txt_kQty.Tag = "readonly";
            // 
            // lbGuid
            // 
@@ -1008,293 +1034,217 @@
            // txt_sjXt
            // 
            this.txt_sjXt.IsReadly = false;
            this.txt_sjXt.Location = new System.Drawing.Point(119, 204);
            this.txt_sjXt.Location = new System.Drawing.Point(385, 152);
            this.txt_sjXt.Name = "txt_sjXt";
            this.txt_sjXt.Size = new System.Drawing.Size(165, 28);
            this.txt_sjXt.Size = new System.Drawing.Size(165, 24);
            this.txt_sjXt.TabIndex = 334;
            //
            // ucBtnPrint1
            //
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(840, 204);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(206, 28);
            this.ucBtnPrint1.TabIndex = 463;
            // 
            // txt_daa009
            // 
            this.txt_daa009.Location = new System.Drawing.Point(395, 204);
            this.txt_daa009.Location = new System.Drawing.Point(656, 124);
            this.txt_daa009.Name = "txt_daa009";
            this.txt_daa009.Properties.Appearance.Options.UseFont = true;
            this.txt_daa009.Size = new System.Drawing.Size(165, 28);
            this.txt_daa009.Size = new System.Drawing.Size(165, 24);
            this.txt_daa009.StyleController = this.layoutMx1;
            this.txt_daa009.TabIndex = 240;
            this.txt_daa009.Tag = "";
            // 
            // txt_daa013
            // 
            this.txt_daa013.Location = new System.Drawing.Point(395, 140);
            this.txt_daa013.Location = new System.Drawing.Point(656, 96);
            this.txt_daa013.Name = "txt_daa013";
            this.txt_daa013.Properties.Appearance.Options.UseFont = true;
            this.txt_daa013.Size = new System.Drawing.Size(165, 28);
            this.txt_daa013.Size = new System.Drawing.Size(165, 24);
            this.txt_daa013.StyleController = this.layoutMx1;
            this.txt_daa013.TabIndex = 472;
            this.txt_daa013.Tag = "readonly";
            // 
            // txt_yQty
            //
            this.txt_yQty.Location = new System.Drawing.Point(947, 44);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
            this.txt_yQty.Size = new System.Drawing.Size(167, 28);
            this.txt_yQty.StyleController = this.layoutMx1;
            this.txt_yQty.TabIndex = 469;
            this.txt_yQty.Tag = "readonly";
            //
            // txt_iCount_1
            //
            this.txt_iCount_1.Location = new System.Drawing.Point(947, 172);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(167, 28);
            this.txt_iCount_1.StyleController = this.layoutMx1;
            this.txt_iCount_1.TabIndex = 331;
            this.txt_iCount_1.Tag = "readOnly-1";
            //
            // txt_daa001
            // 
            this.txt_daa001.Location = new System.Drawing.Point(119, 12);
            this.txt_daa001.Location = new System.Drawing.Point(114, 12);
            this.txt_daa001.Name = "txt_daa001";
            this.txt_daa001.Properties.Appearance.Options.UseFont = true;
            this.txt_daa001.Size = new System.Drawing.Size(165, 28);
            this.txt_daa001.Size = new System.Drawing.Size(165, 24);
            this.txt_daa001.StyleController = this.layoutMx1;
            this.txt_daa001.TabIndex = 216;
            this.txt_daa001.Tag = "readonly";
            // 
            // txt_psnQty_1
            //
            this.txt_psnQty_1.Location = new System.Drawing.Point(947, 140);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(167, 28);
            this.txt_psnQty_1.StyleController = this.layoutMx1;
            this.txt_psnQty_1.TabIndex = 329;
            this.txt_psnQty_1.Tag = "readOnly-1";
            //
            // textEdit1
            // 
            this.textEdit1.Location = new System.Drawing.Point(395, 44);
            this.textEdit1.Location = new System.Drawing.Point(385, 40);
            this.textEdit1.Name = "textEdit1";
            this.textEdit1.Properties.Appearance.Options.UseFont = true;
            this.textEdit1.Size = new System.Drawing.Size(165, 28);
            this.textEdit1.Size = new System.Drawing.Size(165, 24);
            this.textEdit1.StyleController = this.layoutMx1;
            this.textEdit1.TabIndex = 467;
            this.textEdit1.Tag = "readonly";
            // 
            // txt_daa008
            // 
            this.txt_daa008.Location = new System.Drawing.Point(671, 12);
            this.txt_daa008.Location = new System.Drawing.Point(656, 12);
            this.txt_daa008.Name = "txt_daa008";
            this.txt_daa008.Properties.Appearance.Options.UseFont = true;
            this.txt_daa008.Size = new System.Drawing.Size(165, 28);
            this.txt_daa008.Size = new System.Drawing.Size(165, 24);
            this.txt_daa008.StyleController = this.layoutMx1;
            this.txt_daa008.TabIndex = 235;
            this.txt_daa008.Tag = "readonly";
            // 
            // txt_printRemark
            //
            this.txt_printRemark.Location = new System.Drawing.Point(947, 108);
            this.txt_printRemark.Name = "txt_printRemark";
            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_printRemark.Size = new System.Drawing.Size(167, 28);
            this.txt_printRemark.StyleController = this.layoutMx1;
            this.txt_printRemark.TabIndex = 333;
            this.txt_printRemark.Tag = "readOnly-1";
            //
            // txt_saleOrderNo
            // 
            this.txt_saleOrderNo.Location = new System.Drawing.Point(119, 76);
            this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
            this.txt_saleOrderNo.Name = "txt_saleOrderNo";
            this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
            this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 28);
            this.txt_saleOrderNo.Size = new System.Drawing.Size(165, 24);
            this.txt_saleOrderNo.StyleController = this.layoutMx1;
            this.txt_saleOrderNo.TabIndex = 465;
            this.txt_saleOrderNo.Tag = "readonly";
            // 
            // txt_daa028
            // 
            this.txt_daa028.Location = new System.Drawing.Point(395, 76);
            this.txt_daa028.Location = new System.Drawing.Point(385, 68);
            this.txt_daa028.Name = "txt_daa028";
            this.txt_daa028.Properties.Appearance.Options.UseFont = true;
            this.txt_daa028.Size = new System.Drawing.Size(165, 28);
            this.txt_daa028.Size = new System.Drawing.Size(165, 24);
            this.txt_daa028.StyleController = this.layoutMx1;
            this.txt_daa028.TabIndex = 341;
            this.txt_daa028.Tag = "readonly";
            // 
            // txt_mesStartProd
            // 
            this.txt_mesStartProd.Location = new System.Drawing.Point(671, 108);
            this.txt_mesStartProd.Location = new System.Drawing.Point(927, 40);
            this.txt_mesStartProd.Name = "txt_mesStartProd";
            this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesStartProd.Size = new System.Drawing.Size(165, 28);
            this.txt_mesStartProd.Size = new System.Drawing.Size(166, 24);
            this.txt_mesStartProd.StyleController = this.layoutMx1;
            this.txt_mesStartProd.TabIndex = 336;
            this.txt_mesStartProd.Tag = "readonly";
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(119, 44);
            this.txt_daa014.Location = new System.Drawing.Point(114, 40);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Properties.Appearance.Options.UseFont = true;
            this.txt_daa014.Size = new System.Drawing.Size(165, 28);
            this.txt_daa014.Size = new System.Drawing.Size(165, 24);
            this.txt_daa014.StyleController = this.layoutMx1;
            this.txt_daa014.TabIndex = 327;
            this.txt_daa014.Tag = "readonly";
            // 
            // txt_daa022Txt
            // 
            this.txt_daa022Txt.Location = new System.Drawing.Point(395, 12);
            this.txt_daa022Txt.Location = new System.Drawing.Point(385, 12);
            this.txt_daa022Txt.Name = "txt_daa022Txt";
            this.txt_daa022Txt.Properties.Appearance.Options.UseFont = true;
            this.txt_daa022Txt.Size = new System.Drawing.Size(165, 28);
            this.txt_daa022Txt.Size = new System.Drawing.Size(165, 24);
            this.txt_daa022Txt.StyleController = this.layoutMx1;
            this.txt_daa022Txt.TabIndex = 462;
            this.txt_daa022Txt.Tag = "readonly";
            // 
            // txt_daa010
            // 
            this.txt_daa010.Location = new System.Drawing.Point(671, 44);
            this.txt_daa010.Location = new System.Drawing.Point(656, 40);
            this.txt_daa010.Name = "txt_daa010";
            this.txt_daa010.Properties.Appearance.Options.UseFont = true;
            this.txt_daa010.Size = new System.Drawing.Size(165, 28);
            this.txt_daa010.Size = new System.Drawing.Size(165, 24);
            this.txt_daa010.StyleController = this.layoutMx1;
            this.txt_daa010.TabIndex = 243;
            this.txt_daa010.Tag = "readonly";
            // 
            // txt_mesEndProd
            // 
            this.txt_mesEndProd.Location = new System.Drawing.Point(671, 140);
            this.txt_mesEndProd.Location = new System.Drawing.Point(927, 68);
            this.txt_mesEndProd.Name = "txt_mesEndProd";
            this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
            this.txt_mesEndProd.Size = new System.Drawing.Size(165, 28);
            this.txt_mesEndProd.Size = new System.Drawing.Size(166, 24);
            this.txt_mesEndProd.StyleController = this.layoutMx1;
            this.txt_mesEndProd.TabIndex = 338;
            this.txt_mesEndProd.Tag = "readonly";
            // 
            // txt_daa011
            // 
            this.txt_daa011.Location = new System.Drawing.Point(671, 76);
            this.txt_daa011.Location = new System.Drawing.Point(656, 68);
            this.txt_daa011.Name = "txt_daa011";
            this.txt_daa011.Properties.Appearance.Options.UseFont = true;
            this.txt_daa011.Size = new System.Drawing.Size(165, 28);
            this.txt_daa011.Size = new System.Drawing.Size(165, 24);
            this.txt_daa011.StyleController = this.layoutMx1;
            this.txt_daa011.TabIndex = 247;
            this.txt_daa011.Tag = "readonly";
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(395, 172);
            this.txt_dptName.Location = new System.Drawing.Point(385, 124);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
            this.txt_dptName.Size = new System.Drawing.Size(165, 28);
            this.txt_dptName.Size = new System.Drawing.Size(165, 24);
            this.txt_dptName.StyleController = this.layoutMx1;
            this.txt_dptName.TabIndex = 258;
            this.txt_dptName.Tag = "readonly";
            // 
            // txt_daa016
            // 
            this.txt_daa016.Location = new System.Drawing.Point(671, 172);
            this.txt_daa016.Location = new System.Drawing.Point(927, 96);
            this.txt_daa016.Name = "txt_daa016";
            this.txt_daa016.Properties.Appearance.Options.UseFont = true;
            this.txt_daa016.Size = new System.Drawing.Size(165, 28);
            this.txt_daa016.Size = new System.Drawing.Size(166, 24);
            this.txt_daa016.StyleController = this.layoutMx1;
            this.txt_daa016.TabIndex = 273;
            this.txt_daa016.Tag = "readonly";
            // 
            // txt_daa029
            // 
            this.txt_daa029.Location = new System.Drawing.Point(119, 108);
            this.txt_daa029.Location = new System.Drawing.Point(114, 96);
            this.txt_daa029.Name = "txt_daa029";
            this.txt_daa029.Properties.Appearance.Options.UseFont = true;
            this.txt_daa029.Size = new System.Drawing.Size(165, 28);
            this.txt_daa029.Size = new System.Drawing.Size(165, 24);
            this.txt_daa029.StyleController = this.layoutMx1;
            this.txt_daa029.TabIndex = 217;
            this.txt_daa029.Tag = "readonly";
            // 
            // txt_lineName
            // 
            this.txt_lineName.Location = new System.Drawing.Point(395, 108);
            this.txt_lineName.Location = new System.Drawing.Point(385, 96);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
            this.txt_lineName.Size = new System.Drawing.Size(165, 28);
            this.txt_lineName.Size = new System.Drawing.Size(165, 24);
            this.txt_lineName.StyleController = this.layoutMx1;
            this.txt_lineName.TabIndex = 267;
            this.txt_lineName.Tag = "readonly";
            // 
            // txt_daa017
            // 
            this.txt_daa017.Location = new System.Drawing.Point(671, 204);
            this.txt_daa017.Location = new System.Drawing.Point(927, 124);
            this.txt_daa017.Name = "txt_daa017";
            this.txt_daa017.Properties.Appearance.Options.UseFont = true;
            this.txt_daa017.Size = new System.Drawing.Size(165, 28);
            this.txt_daa017.Size = new System.Drawing.Size(166, 24);
            this.txt_daa017.StyleController = this.layoutMx1;
            this.txt_daa017.TabIndex = 280;
            this.txt_daa017.Tag = "readonly";
            // 
            // txt_daa003
            // 
            this.txt_daa003.Location = new System.Drawing.Point(119, 172);
            this.txt_daa003.Location = new System.Drawing.Point(114, 152);
            this.txt_daa003.Name = "txt_daa003";
            this.txt_daa003.Properties.Appearance.Options.UseFont = true;
            this.txt_daa003.Size = new System.Drawing.Size(165, 28);
            this.txt_daa003.Size = new System.Drawing.Size(165, 24);
            this.txt_daa003.StyleController = this.layoutMx1;
            this.txt_daa003.TabIndex = 219;
            this.txt_daa003.Tag = "readonly";
            // 
            // txt_dwName
            // 
            this.txt_dwName.Location = new System.Drawing.Point(947, 12);
            this.txt_dwName.Location = new System.Drawing.Point(927, 12);
            this.txt_dwName.Name = "txt_dwName";
            this.txt_dwName.Properties.Appearance.Options.UseFont = true;
            this.txt_dwName.Size = new System.Drawing.Size(167, 28);
            this.txt_dwName.Size = new System.Drawing.Size(166, 24);
            this.txt_dwName.StyleController = this.layoutMx1;
            this.txt_dwName.TabIndex = 226;
            this.txt_dwName.Tag = "readonly";
            // 
            // txt_daa004
            // 
            this.txt_daa004.Location = new System.Drawing.Point(119, 140);
            this.txt_daa004.Location = new System.Drawing.Point(114, 124);
            this.txt_daa004.Name = "txt_daa004";
            this.txt_daa004.Properties.Appearance.Options.UseFont = true;
            this.txt_daa004.Size = new System.Drawing.Size(165, 28);
            this.txt_daa004.Size = new System.Drawing.Size(165, 24);
            this.txt_daa004.StyleController = this.layoutMx1;
            this.txt_daa004.TabIndex = 222;
            this.txt_daa004.Tag = "readonly";
@@ -1326,65 +1276,53 @@
            this.layoutControlItem13,
            this.layoutControlItem14,
            this.layoutControlItem17,
            this.layoutControlItem18,
            this.layoutControlItem19,
            this.layoutControlItem20,
            this.layoutControlItem24,
            this.layoutControlItem25,
            this.layoutControlItem27,
            this.layoutControlItem28,
            this.layoutControlItem6,
            this.layoutControlItem2,
            this.layoutControlItem26,
            this.layoutControlItem15,
            this.layoutControlItem4,
            this.layoutControlItem22,
            this.layoutControlItem8,
            this.layoutControlItem12,
            this.layoutControlItem23,
            this.layoutControlItem16,
            this.layoutControlItem21,
            this.layoutControlItem8});
            this.layoutControlItem18,
            this.layoutControlItem20,
            this.layoutControlItem28,
            this.layoutControlItem27});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition16.Width = 100D;
            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition17.Width = 100D;
            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition18.Width = 100D;
            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition19.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            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;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 20D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition16,
            columnDefinition17,
            columnDefinition18,
            columnDefinition19});
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition14.Height = 100D;
            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(1126, 264);
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12,
            rowDefinition13,
            rowDefinition14});
            this.Root.Size = new System.Drawing.Size(1105, 188);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -1392,301 +1330,232 @@
            this.layoutControlItem1.Control = this.txt_daa001;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem1.Text = "工单单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_daa008;
            this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem3.Text = "工单数量";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_daa014;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem5.Text = "投料单号";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_daa010;
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 32);
            this.layoutControlItem7.Location = new System.Drawing.Point(542, 28);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem7.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem7.Text = "入库数量";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_saleOrderNo;
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem9.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem9.Text = "需求单号";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_daa028;
            this.layoutControlItem10.Location = new System.Drawing.Point(276, 64);
            this.layoutControlItem10.Location = new System.Drawing.Point(271, 56);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem10.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem10.Text = "备料时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_daa011;
            this.layoutControlItem11.Location = new System.Drawing.Point(552, 64);
            this.layoutControlItem11.Location = new System.Drawing.Point(542, 56);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem11.Text = "已生产量";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_daa029;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 96);
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 84);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem13.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem13.Text = "产品编码";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_lineName;
            this.layoutControlItem14.Location = new System.Drawing.Point(276, 96);
            this.layoutControlItem14.Location = new System.Drawing.Point(271, 84);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem14.Text = "生产线别";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_daa004;
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 128);
            this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem17.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem17.Text = "产品规格";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_daa013;
            this.layoutControlItem18.Location = new System.Drawing.Point(276, 128);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem18.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem18.Text = "生产车间";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_daa003;
            this.layoutControlItem19.Location = new System.Drawing.Point(0, 160);
            this.layoutControlItem19.Location = new System.Drawing.Point(0, 140);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem19.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem19.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem19.Text = "产品名称";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem20
            //
            this.layoutControlItem20.Control = this.txt_dptName;
            this.layoutControlItem20.Location = new System.Drawing.Point(276, 160);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem20.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem20.Text = "车间名称";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.Control = this.txt_psnQty_1;
            this.layoutControlItem24.Location = new System.Drawing.Point(828, 128);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem24.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem24.Text = "每张条码数量:";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_iCount_1;
            this.layoutControlItem25.Location = new System.Drawing.Point(828, 160);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem25.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem25.Text = "打印条码张数:";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_sjXt;
            this.layoutControlItem27.Location = new System.Drawing.Point(0, 192);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem27.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem27.Text = "实际线体";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem28
            //
            this.layoutControlItem28.Control = this.txt_daa009;
            this.layoutControlItem28.Location = new System.Drawing.Point(276, 192);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem28.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem28.Text = "工单备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_daa022Txt;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem6.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem6.Text = "通知备料";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.textEdit1;
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 32);
            this.layoutControlItem2.Location = new System.Drawing.Point(271, 28);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem2.Text = "备料状态";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.ucBtnPrint1;
            this.layoutControlItem26.Location = new System.Drawing.Point(828, 192);
            this.layoutControlItem26.MaxSize = new System.Drawing.Size(210, 0);
            this.layoutControlItem26.MinSize = new System.Drawing.Size(5, 5);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem26.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem26.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem26.Text = "打印按钮";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_dwName;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem15.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem15.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem15.Text = "单位";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_mesStartProd;
            this.layoutControlItem4.Location = new System.Drawing.Point(552, 96);
            this.layoutControlItem4.Location = new System.Drawing.Point(813, 28);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem4.Text = "预计开工时间";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem22
            //
            this.layoutControlItem22.Control = this.txt_yQty;
            this.layoutControlItem22.Location = new System.Drawing.Point(828, 32);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem22.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem22.Text = "已打印总量:";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_daa016;
            this.layoutControlItem12.Location = new System.Drawing.Point(552, 160);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem12.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem12.Text = "实际开工时间";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem23
            //
            this.layoutControlItem23.Control = this.txt_kQty;
            this.layoutControlItem23.Location = new System.Drawing.Point(828, 64);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem23.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem23.Text = "可打印总数:";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem16
            //
            this.layoutControlItem16.Control = this.txt_daa017;
            this.layoutControlItem16.Location = new System.Drawing.Point(552, 192);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem16.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem16.Text = "实际完工时间";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(95, 18);
            //
            // layoutControlItem21
            //
            this.layoutControlItem21.Control = this.txt_printRemark;
            this.layoutControlItem21.Location = new System.Drawing.Point(828, 96);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem21.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem21.Text = "打印备注:";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_mesEndProd;
            this.layoutControlItem8.Location = new System.Drawing.Point(552, 128);
            this.layoutControlItem8.Location = new System.Drawing.Point(813, 56);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem8.Text = "预计完工时间";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(95, 18);
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_daa016;
            this.layoutControlItem12.Location = new System.Drawing.Point(813, 84);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem12.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem12.Text = "实际开工时间";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem16
            //
            this.layoutControlItem16.Control = this.txt_daa017;
            this.layoutControlItem16.Location = new System.Drawing.Point(813, 112);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem16.Size = new System.Drawing.Size(272, 28);
            this.layoutControlItem16.Text = "实际完工时间";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_daa013;
            this.layoutControlItem18.Location = new System.Drawing.Point(542, 84);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem18.Text = "生产车间";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem20
            //
            this.layoutControlItem20.Control = this.txt_dptName;
            this.layoutControlItem20.Location = new System.Drawing.Point(271, 112);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem20.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem20.Text = "车间名称";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem28
            //
            this.layoutControlItem28.Control = this.txt_daa009;
            this.layoutControlItem28.Location = new System.Drawing.Point(542, 112);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem28.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem28.Text = "工单备注";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_sjXt;
            this.layoutControlItem27.Location = new System.Drawing.Point(271, 140);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem27.Size = new System.Drawing.Size(271, 28);
            this.layoutControlItem27.Text = "实际线体";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
            // 
            // tabMx
            // 
@@ -1694,17 +1563,18 @@
            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(1126, 459);
            this.tabMx.Size = new System.Drawing.Size(1126, 513);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
            this.tabMxPage2});
            this.tabMxPage2,
            this.xtraTabPage3});
            // 
            // tabMxPage1
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 427);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 481);
            this.tabMxPage1.Text = "备料单身";
            // 
            // gcMx1
@@ -1713,7 +1583,7 @@
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1124, 427);
            this.gcMx1.Size = new System.Drawing.Size(1124, 481);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1778,7 +1648,6 @@
            // 
            // gvMx1dab001
            // 
            this.gvMx1dab001.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab001.Caption = "工单单号";
            this.gvMx1dab001.FieldName = "dab001";
@@ -1791,7 +1660,6 @@
            // 
            // gvMx1dab003
            // 
            this.gvMx1dab003.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab003.Caption = "材料编码";
            this.gvMx1dab003.FieldName = "itemNo";
@@ -1804,7 +1672,6 @@
            // 
            // gvMx1dab004
            // 
            this.gvMx1dab004.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab004.Caption = "材料名称";
            this.gvMx1dab004.FieldName = "dab004";
@@ -1817,7 +1684,6 @@
            // 
            // gvMx1dab005
            // 
            this.gvMx1dab005.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab005.Caption = "材料规格";
            this.gvMx1dab005.FieldName = "dab005";
@@ -1830,7 +1696,6 @@
            // 
            // gvMx1dab006
            // 
            this.gvMx1dab006.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab006.Caption = "需领用量";
            this.gvMx1dab006.FieldName = "dab006";
@@ -1843,7 +1708,6 @@
            // 
            // gvMx1dab007
            // 
            this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab007.Caption = "已领用量";
            this.gvMx1dab007.FieldName = "dab007";
@@ -1865,7 +1729,6 @@
            // 
            // gvMx1dab014
            // 
            this.gvMx1dab014.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab014.Caption = "是否替料";
            this.gvMx1dab014.FieldName = "dab014Txt";
@@ -1897,7 +1760,6 @@
            // 
            // gvMx1dab012
            // 
            this.gvMx1dab012.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab012.Caption = "组成用量";
            this.gvMx1dab012.FieldName = "dab012";
@@ -1910,7 +1772,6 @@
            // 
            // gvMx1dab009
            // 
            this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab009.Caption = "单位";
            this.gvMx1dab009.FieldName = "dwName";
@@ -1923,7 +1784,6 @@
            // 
            // gvMx1scrapqty
            // 
            this.gvMx1scrapqty.AppearanceCell.Options.UseFont = true;
            this.gvMx1scrapqty.Caption = "固定损耗";
            this.gvMx1scrapqty.FieldName = "scrapqty";
@@ -1934,7 +1794,6 @@
            // 
            // gvMx1scraprate
            // 
            this.gvMx1scraprate.AppearanceCell.Options.UseFont = true;
            this.gvMx1scraprate.Caption = "变动损耗率";
            this.gvMx1scraprate.FieldName = "scraprate";
@@ -1945,7 +1804,6 @@
            // 
            // gvMx1zyBl
            // 
            this.gvMx1zyBl.AppearanceCell.Options.UseFont = true;
            this.gvMx1zyBl.Caption = "作业不良";
            this.gvMx1zyBl.FieldName = "zyBl";
@@ -1956,7 +1814,6 @@
            // 
            // gvMx1llBl
            // 
            this.gvMx1llBl.AppearanceCell.Options.UseFont = true;
            this.gvMx1llBl.Caption = "来料不良";
            this.gvMx1llBl.FieldName = "llBl";
@@ -1967,7 +1824,6 @@
            // 
            // gvMx1lpTl
            // 
            this.gvMx1lpTl.AppearanceCell.Options.UseFont = true;
            this.gvMx1lpTl.Caption = "良品退料";
            this.gvMx1lpTl.FieldName = "lpTl";
@@ -1978,7 +1834,6 @@
            // 
            // gvMx1dab021
            // 
            this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab021.Caption = "补领数量";
            this.gvMx1dab021.FieldName = "dab021";
@@ -1989,7 +1844,6 @@
            // 
            // gvMx1dab010
            // 
            this.gvMx1dab010.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab010.Caption = "材料类型";
            this.gvMx1dab010.FieldName = "dab010";
@@ -2000,7 +1854,6 @@
            // 
            // gvMx1dab011
            // 
            this.gvMx1dab011.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab011.Caption = "主料";
            this.gvMx1dab011.FieldName = "dab011";
@@ -2011,7 +1864,6 @@
            // 
            // gvMx1dab013
            // 
            this.gvMx1dab013.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab013.Caption = "底数";
            this.gvMx1dab013.FieldName = "dab013";
@@ -2022,7 +1874,6 @@
            // 
            // gvMx1dab015
            // 
            this.gvMx1dab015.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab015.Caption = "点位";
            this.gvMx1dab015.FieldName = "dab015";
@@ -2033,7 +1884,6 @@
            // 
            // gvMx1dab019
            // 
            this.gvMx1dab019.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab019.Caption = "领料方式";
            this.gvMx1dab019.FieldName = "dab019";
@@ -2044,7 +1894,6 @@
            // 
            // gvMx1dab020
            // 
            this.gvMx1dab020.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab020.Caption = "实领用量";
            this.gvMx1dab020.FieldName = "dab020";
@@ -2055,7 +1904,6 @@
            // 
            // gvMx1dab022
            // 
            this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab022.Caption = "退料数量";
            this.gvMx1dab022.FieldName = "dab022";
@@ -2066,7 +1914,6 @@
            // 
            // gvMx1dab023
            // 
            this.gvMx1dab023.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab023.Caption = "超领数量";
            this.gvMx1dab023.FieldName = "dab023";
@@ -2078,14 +1925,15 @@
            // tabMxPage2
            // 
            this.tabMxPage2.Controls.Add(this.gcMx2);
            this.tabMxPage2.Controls.Add(this.panMx99);
            this.tabMxPage2.Name = "tabMxPage2";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 427);
            this.tabMxPage2.Text = "条码明细";
            this.tabMxPage2.Size = new System.Drawing.Size(1124, 481);
            this.tabMxPage2.Text = "报工条码明细";
            // 
            // gcMx2
            // 
            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.Location = new System.Drawing.Point(0, 54);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
@@ -2099,7 +1947,6 @@
            // 
            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx2.Appearance.Row.Options.UseFont = true;
            this.gvMx2.ColumnPanelRowHeight = 50;
            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
@@ -2128,7 +1975,6 @@
            // 
            // gvMx2guid
            // 
            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
            this.gvMx2guid.Caption = "guid ";
            this.gvMx2guid.FieldName = "guid";
@@ -2161,7 +2007,6 @@
            // 
            // gvMx2itemBarcode
            // 
            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemBarcode.Caption = "物料条码 ";
            this.gvMx2itemBarcode.FieldName = "itemBarcode";
@@ -2174,7 +2019,6 @@
            // 
            // gvMx2quantity
            // 
            this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
            this.gvMx2quantity.Caption = "数量 ";
            this.gvMx2quantity.FieldName = "quantity";
@@ -2187,7 +2031,6 @@
            // 
            // gvMx2unit
            // 
            this.gvMx2unit.AppearanceCell.Options.UseFont = true;
            this.gvMx2unit.Caption = "单位 ";
            this.gvMx2unit.FieldName = "dwName";
@@ -2210,7 +2053,6 @@
            // 
            // gvMx2itemSname
            // 
            this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemSname.Caption = "物料名称 ";
            this.gvMx2itemSname.FieldName = "itemName";
@@ -2233,7 +2075,6 @@
            // 
            // gvMx2createBy
            // 
            this.gvMx2createBy.AppearanceCell.Options.UseFont = true;
            this.gvMx2createBy.Caption = "创建人 ";
            this.gvMx2createBy.FieldName = "createBy";
@@ -2246,7 +2087,6 @@
            // 
            // gvMx2createDate
            // 
            this.gvMx2createDate.AppearanceCell.Options.UseFont = true;
            this.gvMx2createDate.Caption = "创建时间 ";
            this.gvMx2createDate.FieldName = "createDate";
@@ -2320,13 +2160,495 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions4.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, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", 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);
            //
            // panMx99
            //
            this.panMx99.Controls.Add(this.layoutMx99);
            this.panMx99.Dock = System.Windows.Forms.DockStyle.Top;
            this.panMx99.Location = new System.Drawing.Point(0, 0);
            this.panMx99.Name = "panMx99";
            this.panMx99.Size = new System.Drawing.Size(1124, 54);
            this.panMx99.TabIndex = 1;
            //
            // layoutMx99
            //
            this.layoutMx99.Controls.Add(this.ucBtnPrint1);
            this.layoutMx99.Controls.Add(this.txt_iCount_1);
            this.layoutMx99.Controls.Add(this.txt_psnQty_1);
            this.layoutMx99.Controls.Add(this.txt_printRemark);
            this.layoutMx99.Controls.Add(this.txt_kQty);
            this.layoutMx99.Controls.Add(this.txt_yQty);
            this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx99.Location = new System.Drawing.Point(0, 0);
            this.layoutMx99.Name = "layoutMx99";
            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 65, 812, 500);
            this.layoutMx99.Root = this.layoutControlGroup1;
            this.layoutMx99.Size = new System.Drawing.Size(1124, 54);
            this.layoutMx99.TabIndex = 0;
            this.layoutMx99.Text = "layoutControl1";
            //
            // ucBtnPrint1
            //
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(932, 12);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(180, 30);
            this.ucBtnPrint1.TabIndex = 464;
            //
            // txt_iCount_1
            //
            this.txt_iCount_1.Location = new System.Drawing.Point(850, 12);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(78, 24);
            this.txt_iCount_1.StyleController = this.layoutMx99;
            this.txt_iCount_1.TabIndex = 332;
            this.txt_iCount_1.Tag = "readOnly-1";
            //
            // txt_psnQty_1
            //
            this.txt_psnQty_1.Location = new System.Drawing.Point(666, 12);
            this.txt_psnQty_1.Name = "txt_psnQty_1";
            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
            this.txt_psnQty_1.Size = new System.Drawing.Size(78, 24);
            this.txt_psnQty_1.StyleController = this.layoutMx99;
            this.txt_psnQty_1.TabIndex = 330;
            this.txt_psnQty_1.Tag = "readOnly-1";
            //
            // txt_printRemark
            //
            this.txt_printRemark.Location = new System.Drawing.Point(482, 12);
            this.txt_printRemark.Name = "txt_printRemark";
            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_printRemark.Size = new System.Drawing.Size(78, 24);
            this.txt_printRemark.StyleController = this.layoutMx99;
            this.txt_printRemark.TabIndex = 334;
            this.txt_printRemark.Tag = "readOnly-1";
            //
            // txt_kQty
            //
            this.txt_kQty.EditValue = "";
            this.txt_kQty.Location = new System.Drawing.Point(298, 12);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(78, 24);
            this.txt_kQty.StyleController = this.layoutMx99;
            this.txt_kQty.TabIndex = 472;
            this.txt_kQty.Tag = "readonly";
            //
            // txt_yQty
            //
            this.txt_yQty.Location = new System.Drawing.Point(114, 12);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;
            this.txt_yQty.Size = new System.Drawing.Size(78, 24);
            this.txt_yQty.StyleController = this.layoutMx99;
            this.txt_yQty.TabIndex = 470;
            this.txt_yQty.Tag = "readonly";
            //
            // layoutControlGroup1
            //
            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup1.GroupBordersVisible = false;
            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem22,
            this.layoutControlItem23,
            this.layoutControlItem21,
            this.layoutControlItem24,
            this.layoutControlItem25,
            this.layoutControlItem26});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition20.Width = 100D;
            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition21.Width = 100D;
            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition22.Width = 100D;
            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition23.Width = 100D;
            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition24.Width = 100D;
            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition25.Width = 100D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition20,
            columnDefinition21,
            columnDefinition22,
            columnDefinition23,
            columnDefinition24,
            columnDefinition25});
            rowDefinition15.Height = 100D;
            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition15});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54);
            this.layoutControlGroup1.TextVisible = false;
            //
            // layoutControlItem22
            //
            this.layoutControlItem22.Control = this.txt_yQty;
            this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.Size = new System.Drawing.Size(184, 34);
            this.layoutControlItem22.Text = "已打印数量";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem23
            //
            this.layoutControlItem23.Control = this.txt_kQty;
            this.layoutControlItem23.Location = new System.Drawing.Point(184, 0);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem23.Size = new System.Drawing.Size(184, 34);
            this.layoutControlItem23.Text = "可打印数量";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem21
            //
            this.layoutControlItem21.Control = this.txt_printRemark;
            this.layoutControlItem21.Location = new System.Drawing.Point(368, 0);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem21.Size = new System.Drawing.Size(184, 34);
            this.layoutControlItem21.Text = "打印备注";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.Control = this.txt_psnQty_1;
            this.layoutControlItem24.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem24.Size = new System.Drawing.Size(184, 34);
            this.layoutControlItem24.Text = "每张条码数量";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_iCount_1;
            this.layoutControlItem25.Location = new System.Drawing.Point(736, 0);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem25.Size = new System.Drawing.Size(184, 34);
            this.layoutControlItem25.Text = "打印条码张数";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.ucBtnPrint1;
            this.layoutControlItem26.Location = new System.Drawing.Point(920, 0);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem26.Size = new System.Drawing.Size(184, 34);
            this.layoutControlItem26.Text = "报工打印";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
            //
            // xtraTabPage3
            //
            this.xtraTabPage3.Controls.Add(this.gcMx3);
            this.xtraTabPage3.Controls.Add(this.panMx98);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 481);
            this.xtraTabPage3.Text = "工单追溯码";
            //
            // gcMx3
            //
            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx3.Location = new System.Drawing.Point(0, 48);
            this.gcMx3.MainView = this.gvMx3;
            this.gcMx3.Name = "gcMx3";
            this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit2});
            this.gcMx3.Size = new System.Drawing.Size(1124, 433);
            this.gcMx3.TabIndex = 1;
            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx3});
            //
            // gvMx3
            //
            this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx3.Appearance.Row.Options.UseFont = true;
            this.gvMx3.ColumnPanelRowHeight = 50;
            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn33,
            this.gridColumn38,
            this.gridColumn34,
            this.gridColumn36,
            this.gridColumn37,
            this.gridColumn42,
            this.gridColumn43,
            this.gridColumn49});
            this.gvMx3.GridControl = this.gcMx3;
            this.gvMx3.Name = "gvMx3";
            this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx3.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn33
            //
            this.gridColumn33.AppearanceCell.Options.UseFont = true;
            this.gridColumn33.Caption = "guid ";
            this.gridColumn33.FieldName = "guid";
            this.gridColumn33.MinWidth = 50;
            this.gridColumn33.Name = "gridColumn33";
            this.gridColumn33.Tag = "query_a.guid";
            this.gridColumn33.Width = 94;
            //
            // gridColumn36
            //
            this.gridColumn36.AppearanceCell.Options.UseFont = true;
            this.gridColumn36.Caption = "追溯码";
            this.gridColumn36.FieldName = "barCode";
            this.gridColumn36.MinWidth = 50;
            this.gridColumn36.Name = "gridColumn36";
            this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
            this.gridColumn36.Visible = true;
            this.gridColumn36.VisibleIndex = 1;
            this.gridColumn36.Width = 94;
            //
            // gridColumn37
            //
            this.gridColumn37.AppearanceCell.Options.UseFont = true;
            this.gridColumn37.Caption = "数量 ";
            this.gridColumn37.FieldName = "quantity";
            this.gridColumn37.MinWidth = 50;
            this.gridColumn37.Name = "gridColumn37";
            this.gridColumn37.Tag = "query_a.QUANTITY";
            this.gridColumn37.Visible = true;
            this.gridColumn37.VisibleIndex = 2;
            this.gridColumn37.Width = 94;
            //
            // gridColumn38
            //
            this.gridColumn38.AppearanceCell.Options.UseFont = true;
            this.gridColumn38.Caption = "工单号";
            this.gridColumn38.FieldName = "daa001";
            this.gridColumn38.MinWidth = 50;
            this.gridColumn38.Name = "gridColumn38";
            this.gridColumn38.Tag = "query_a.UNIT";
            this.gridColumn38.Visible = true;
            this.gridColumn38.VisibleIndex = 0;
            this.gridColumn38.Width = 94;
            //
            // gridColumn42
            //
            this.gridColumn42.AppearanceCell.Options.UseFont = true;
            this.gridColumn42.Caption = "创建人 ";
            this.gridColumn42.FieldName = "createBy";
            this.gridColumn42.MinWidth = 50;
            this.gridColumn42.Name = "gridColumn42";
            this.gridColumn42.Tag = "query_a.CREATE_BY";
            this.gridColumn42.Visible = true;
            this.gridColumn42.VisibleIndex = 3;
            this.gridColumn42.Width = 94;
            //
            // gridColumn43
            //
            this.gridColumn43.AppearanceCell.Options.UseFont = true;
            this.gridColumn43.Caption = "创建时间 ";
            this.gridColumn43.FieldName = "createDate";
            this.gridColumn43.MinWidth = 50;
            this.gridColumn43.Name = "gridColumn43";
            this.gridColumn43.Tag = "query_a.CREATE_DATE";
            this.gridColumn43.Visible = true;
            this.gridColumn43.VisibleIndex = 4;
            this.gridColumn43.Width = 94;
            //
            // gridColumn49
            //
            this.gridColumn49.Caption = "移出";
            this.gridColumn49.ColumnEdit = this.repositoryItemButtonEdit2;
            this.gridColumn49.MinWidth = 25;
            this.gridColumn49.Name = "gridColumn49";
            this.gridColumn49.Visible = true;
            this.gridColumn49.VisibleIndex = 6;
            this.gridColumn49.Width = 94;
            //
            // repositoryItemButtonEdit2
            //
            this.repositoryItemButtonEdit2.AutoHeight = false;
            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            //
            // panMx98
            //
            this.panMx98.Controls.Add(this.layoutMx98);
            this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
            this.panMx98.Location = new System.Drawing.Point(0, 0);
            this.panMx98.Name = "panMx98";
            this.panMx98.Size = new System.Drawing.Size(1124, 48);
            this.panMx98.TabIndex = 0;
            //
            // layoutMx98
            //
            this.layoutMx98.Controls.Add(this.ucBtnPrint98);
            this.layoutMx98.Controls.Add(this.txt_yQty98);
            this.layoutMx98.Controls.Add(this.txt_kQty98);
            this.layoutMx98.Controls.Add(this.txt_printRemark98);
            this.layoutMx98.Controls.Add(this.txt_iCount_98);
            this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx98.Location = new System.Drawing.Point(0, 0);
            this.layoutMx98.Name = "layoutMx98";
            this.layoutMx98.Root = this.layoutControlGroup2;
            this.layoutMx98.Size = new System.Drawing.Size(1124, 48);
            this.layoutMx98.TabIndex = 0;
            this.layoutMx98.Text = "layoutControl1";
            //
            // ucBtnPrint98
            //
            this.ucBtnPrint98.guidKey = null;
            this.ucBtnPrint98.Location = new System.Drawing.Point(895, 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(217, 24);
            this.ucBtnPrint98.TabIndex = 8;
            //
            // txt_yQty98
            //
            this.txt_yQty98.Location = new System.Drawing.Point(114, 12);
            this.txt_yQty98.Name = "txt_yQty98";
            this.txt_yQty98.Properties.ReadOnly = true;
            this.txt_yQty98.Size = new System.Drawing.Size(114, 24);
            this.txt_yQty98.StyleController = this.layoutMx98;
            this.txt_yQty98.TabIndex = 4;
            //
            // txt_kQty98
            //
            this.txt_kQty98.Location = new System.Drawing.Point(334, 12);
            this.txt_kQty98.Name = "txt_kQty98";
            this.txt_kQty98.Properties.ReadOnly = true;
            this.txt_kQty98.Size = new System.Drawing.Size(115, 24);
            this.txt_kQty98.StyleController = this.layoutMx98;
            this.txt_kQty98.TabIndex = 5;
            //
            // txt_printRemark98
            //
            this.txt_printRemark98.Location = new System.Drawing.Point(555, 12);
            this.txt_printRemark98.Name = "txt_printRemark98";
            this.txt_printRemark98.Size = new System.Drawing.Size(115, 24);
            this.txt_printRemark98.StyleController = this.layoutMx98;
            this.txt_printRemark98.TabIndex = 6;
            //
            // txt_iCount_98
            //
            this.txt_iCount_98.Location = new System.Drawing.Point(776, 12);
            this.txt_iCount_98.Name = "txt_iCount_98";
            this.txt_iCount_98.Size = new System.Drawing.Size(115, 24);
            this.txt_iCount_98.StyleController = this.layoutMx98;
            this.txt_iCount_98.TabIndex = 7;
            //
            // layoutControlGroup2
            //
            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup2.GroupBordersVisible = false;
            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem30,
            this.layoutControlItem31,
            this.layoutControlItem32,
            this.layoutControlItem33,
            this.layoutControlItem34});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "layoutControlGroup2";
            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition26.Width = 100D;
            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition27.Width = 100D;
            columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition28.Width = 100D;
            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition29.Width = 100D;
            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition30.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition26,
            columnDefinition27,
            columnDefinition28,
            columnDefinition29,
            columnDefinition30});
            rowDefinition16.Height = 100D;
            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition16});
            this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 48);
            this.layoutControlGroup2.TextVisible = false;
            //
            // layoutControlItem30
            //
            this.layoutControlItem30.Control = this.txt_yQty98;
            this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.Size = new System.Drawing.Size(220, 28);
            this.layoutControlItem30.Text = "已打印数量";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem31
            //
            this.layoutControlItem31.Control = this.txt_kQty98;
            this.layoutControlItem31.Location = new System.Drawing.Point(220, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem31.Size = new System.Drawing.Size(221, 28);
            this.layoutControlItem31.Text = "可打印数量";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem32
            //
            this.layoutControlItem32.Control = this.txt_printRemark98;
            this.layoutControlItem32.Location = new System.Drawing.Point(441, 0);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem32.Size = new System.Drawing.Size(221, 28);
            this.layoutControlItem32.Text = "打印备注";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem33
            //
            this.layoutControlItem33.Control = this.txt_iCount_98;
            this.layoutControlItem33.Location = new System.Drawing.Point(662, 0);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem33.Size = new System.Drawing.Size(221, 28);
            this.layoutControlItem33.Text = "本次打印张数";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem34
            //
            this.layoutControlItem34.Control = this.ucBtnPrint98;
            this.layoutControlItem34.Location = new System.Drawing.Point(883, 0);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem34.Size = new System.Drawing.Size(221, 28);
            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem34.TextVisible = false;
            //
            // gridColumn34
            //
            this.gridColumn34.Caption = "线别";
            this.gridColumn34.FieldName = "lineId";
            this.gridColumn34.MinWidth = 25;
            this.gridColumn34.Name = "gridColumn34";
            this.gridColumn34.Visible = true;
            this.gridColumn34.VisibleIndex = 1;
            this.gridColumn34.Width = 94;
            // 
            // Frm_Womdaa
            // 
@@ -2356,16 +2678,11 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa009.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa013.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa001.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa008.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_saleOrderNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa028.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_mesStartProd.Properties)).EndInit();
@@ -2394,24 +2711,18 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2421,6 +2732,38 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            this.panMx99.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx99)).EndInit();
            this.layoutMx99.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            this.xtraTabPage3.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            this.panMx98.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit();
            this.layoutMx98.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2473,19 +2816,13 @@
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private DevExpress.XtraEditors.TextEdit txt_daa013;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraEditors.TextEdit textEdit1;
        private DevExpress.XtraEditors.TextEdit txt_saleOrderNo;
        private UserControl.UcBtnPrint ucBtnPrint1;
        private DevExpress.XtraEditors.TextEdit txt_daa022Txt;
        private DevExpress.XtraEditors.TextEdit txt_daa028;
        private DevExpress.XtraEditors.TextEdit txt_mesEndProd;
        private DevExpress.XtraEditors.TextEdit txt_mesStartProd;
        private UserControl.UcLookWorkline txt_sjXt;
        private DevExpress.XtraEditors.TextEdit txt_printRemark;
        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.TextEdit txt_daa014;
        private DevExpress.XtraEditors.TextEdit txt_daa017;
@@ -2513,13 +2850,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraTab.XtraTabControl tabMx;
        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2572,19 +2903,59 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private System.Windows.Forms.Panel panMx99;
        private DevExpress.XtraLayout.LayoutControl layoutMx99;
        private DevExpress.XtraEditors.TextEdit txt_printRemark;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private UserControl.UcBtnPrint ucBtnPrint1;
        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraGrid.GridControl gcMx3;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
        private System.Windows.Forms.Panel panMx98;
        private DevExpress.XtraLayout.LayoutControl layoutMx98;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private UserControl.UcBtnPrint ucBtnPrint98;
        private DevExpress.XtraEditors.TextEdit txt_yQty98;
        private DevExpress.XtraEditors.TextEdit txt_kQty98;
        private DevExpress.XtraEditors.TextEdit txt_printRemark98;
        private DevExpress.XtraEditors.TextEdit txt_iCount_98;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -33,6 +33,7 @@
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, null, null, "", (value) =>
           {
               Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
@@ -47,6 +48,7 @@
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
          
            //这是报工码
            this.ucBtnPrint1.btnDesignClick += (s, e) =>
            {
                ucBtnPrint1.rptParameter = "rpt_daa{}";
@@ -55,7 +57,17 @@
            {
                _print();
            };
            //这是追溯码
            this.ucBtnPrint98.btnDesignClick += (s, e) => {
                ucBtnPrint98.rptParameter = "rpt_trace{}";
            };
            this.ucBtnPrint98.btnReportClick += (s, e) =>
            {
                _print98();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -371,6 +383,24 @@
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                    }
                    JArray array3 = new JArray();
                    foreach (var a in _job["rtnData"]["list3"])
                    {
                        array3.Add(a);
                    }
                    DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
                    if (dt3.Rows.Count > 0)
                    {
                        gcMx3.BindingContext = new BindingContext();
                        gcMx3.DataSource = dt3;
                        gcMx3.ForceInitialize();
                        gvMx3.BestFitColumns();
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -496,6 +526,32 @@
                   + "," + txt_psnQty_1.Text.Trim()
                   + "}";
        }
        private void _print98()
        {
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_daa001, gridView1);
            ucBtnPrint98.guidKey = rowGuid;
            if (rowGuid.Length < 36)
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择你要打印的行!");
                this.ucBtnPrint98.rptParameter = "return false";
                return;
            }
            if (string.IsNullOrEmpty(txt_iCount_98.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码张数!");
                txt_iCount_98.Focus();
                this.ucBtnPrint98.rptParameter = "return false";
                return;
            }
            this.ucBtnPrint98.rptParameter = "rpt_trace{" + ""
                   + "," + txt_printRemark.Text.Trim()
                   + "," + ""
                   + "," + txt_iCount_98.Text.Trim()
                   + "," + 1
                   + "}";
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
        {
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.Designer.cs
@@ -29,8 +29,8 @@
        private void InitializeComponent()
        {
            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
            this.label1 = new System.Windows.Forms.Label();
            this.label2 = new System.Windows.Forms.Label();
            this.label1 = new System.Windows.Forms.Label();
            this.btnLogin = new DevExpress.XtraEditors.SimpleButton();
            this.txt_gx = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_bc = new DevExpress.XtraEditors.ComboBoxEdit();
@@ -52,55 +52,54 @@
            this.panelControl1.Controls.Add(this.label1);
            this.panelControl1.Location = new System.Drawing.Point(162, 116);
            this.panelControl1.Name = "panelControl1";
            this.panelControl1.Size = new System.Drawing.Size(366, 249);
            this.panelControl1.Size = new System.Drawing.Size(280, 249);
            this.panelControl1.TabIndex = 0;
            //
            // label2
            //
            this.label2.AutoSize = true;
            this.label2.Location = new System.Drawing.Point(45, 99);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(38, 18);
            this.label2.TabIndex = 2;
            this.label2.Text = "工序";
            // 
            // label1
            // 
            this.label1.AutoSize = true;
            this.label1.Location = new System.Drawing.Point(45, 35);
            this.label1.Name = "label1";
            this.label1.Size = new System.Drawing.Size(50, 24);
            this.label1.Size = new System.Drawing.Size(38, 18);
            this.label1.TabIndex = 0;
            this.label1.Text = "班次";
            // 
            // label2
            //
            this.label2.AutoSize = true;
            this.label2.Location = new System.Drawing.Point(45, 99);
            this.label2.Name = "label2";
            this.label2.Size = new System.Drawing.Size(50, 24);
            this.label2.TabIndex = 2;
            this.label2.Text = "工序";
            //
            // btnLogin
            // 
            this.btnLogin.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            this.btnLogin.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Question;
            this.btnLogin.Appearance.Options.UseBackColor = true;
            this.btnLogin.Appearance.Options.UseFont = true;
            this.btnLogin.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_16x162;
            this.btnLogin.Location = new System.Drawing.Point(59, 162);
            this.btnLogin.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.user_32x32;
            this.btnLogin.Location = new System.Drawing.Point(45, 162);
            this.btnLogin.Name = "btnLogin";
            this.btnLogin.Size = new System.Drawing.Size(180, 40);
            this.btnLogin.TabIndex = 4;
            this.btnLogin.Text = "确定";
            this.btnLogin.Text = "确定进入";
            // 
            // txt_gx
            // 
            this.txt_gx.Location = new System.Drawing.Point(114, 96);
            this.txt_gx.Location = new System.Drawing.Point(100, 96);
            this.txt_gx.Name = "txt_gx";
            this.txt_gx.Properties.Appearance.Options.UseFont = true;
            this.txt_gx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_gx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_gx.Size = new System.Drawing.Size(125, 30);
            this.txt_gx.Size = new System.Drawing.Size(125, 24);
            this.txt_gx.TabIndex = 3;
            // 
            // txt_bc
            // 
            this.txt_bc.EditValue = "白班";
            this.txt_bc.Location = new System.Drawing.Point(114, 32);
            this.txt_bc.Location = new System.Drawing.Point(100, 32);
            this.txt_bc.Name = "txt_bc";
            this.txt_bc.Properties.Appearance.Options.UseFont = true;
            this.txt_bc.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -109,7 +108,7 @@
            "白班",
            "夜班"});
            this.txt_bc.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_bc.Size = new System.Drawing.Size(125, 30);
            this.txt_bc.Size = new System.Drawing.Size(125, 24);
            this.txt_bc.TabIndex = 1;
            // 
            // Frm_WorkStart
DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1602,6 +1602,7 @@
  </ItemGroup>
  <ItemGroup>
    <Content Include="logo_ico.ico" />
    <None Include="Resources\user_32x32.png" />
    <None Include="Resources\user_16x162.png" />
    <None Include="Resources\wordwrap_32x32.png" />
    <None Include="Resources\wraptext2_16x16.png" />
DevApp/Gs.DevApp/Properties/Resources.Designer.cs
@@ -2303,6 +2303,16 @@
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap user_32x32 {
            get {
                object obj = ResourceManager.GetObject("user_32x32", resourceCulture);
                return ((System.Drawing.Bitmap)(obj));
            }
        }
        /// <summary>
        ///   查找 System.Drawing.Bitmap 类型的本地化资源。
        /// </summary>
        internal static System.Drawing.Bitmap usergroup_32x32 {
            get {
                object obj = ResourceManager.GetObject("usergroup_32x32", resourceCulture);
DevApp/Gs.DevApp/Properties/Resources.resx
@@ -127,11 +127,6 @@
  <data name="refresh_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bo_dashboard" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bo_dashboard.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
@@ -146,21 +141,11 @@
  <data name="checkbuttons_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="updatetableofcontents_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\updatetableofcontents_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="projectfile_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\projectfile_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -226,10 +211,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="bodetails_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodetails_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -248,16 +231,17 @@
  <data name="alignhorizontalcenter1" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignhorizontalcenter1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bouser_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bouser_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -265,8 +249,8 @@
  <data name="sortbyorderdate_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortbyorderdate_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
  <data name="sortasc_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortasc_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -297,16 +281,13 @@
  <data name="checkbox2_32x323" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x323.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="sortandfilter_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\sortandfilter_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="radiobuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\radiobuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="operatingsystem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\operatingsystem_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_previous_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_previous_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -336,8 +317,11 @@
  <data name="replace_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="encryptdocument_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x32.png;System.Drawing.Bitmap,
@@ -346,6 +330,9 @@
  </data>
  <data name="up2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\up2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -356,21 +343,14 @@
  <data name="calculatenow" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\calculatenow.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox2_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_16x161.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletelist2_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletelist2_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="globalcolorscheme_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\globalcolorscheme_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -527,6 +507,9 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="subreport_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\subreport_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="employee_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\employee_32x321.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -535,13 +518,13 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="dafualtfax_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\dafualtfax_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ide_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ide_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -572,8 +555,8 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="reset_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\reset_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="fill_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="trackingchanges_next_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\trackingchanges_next_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -618,6 +601,11 @@
  <data name="knowledgebasearticle_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\knowledgebasearticle_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="deletetablecells_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -628,6 +616,9 @@
    <value>..\Resources\doubleprev_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="refresh_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\refresh_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -674,9 +665,6 @@
  <data name="open2" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\open2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  </data>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="selectvaluespivottable_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\selectvaluespivottable_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -691,6 +679,9 @@
  <data name="deletetablecells_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\deletetablecells_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="showworktimeonly_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\showworktimeonly_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -699,11 +690,6 @@
  </data>
  <data name="task_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\task_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -779,9 +765,6 @@
  <data name="wordwrap_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\wordwrap_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="recurringappointment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\recurringappointment_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -827,13 +810,16 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="group_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\group_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="edit_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\edit_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="replace_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\replace_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
@@ -852,8 +838,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="fill_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\fill_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="alignmiddlecenter_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignmiddlecenter_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="addcalculatedfield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\addcalculatedfield_16x16.png;System.Drawing.Bitmap,
@@ -880,8 +868,10 @@
  <data name="3dclusteredcolumn_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\3dclusteredcolumn_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="spellcheck_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\spellcheck_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="checkbox2_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox2_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="convert_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\convert_32x32.png;System.Drawing.Bitmap,
@@ -893,8 +883,10 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="printlayoutview_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\printlayoutview_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -902,16 +894,23 @@
  <data name="checkbuttons_32x322" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x322.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="area3d_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\area3d_32x32.png;System.Drawing.Bitmap,
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="checkbox_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbox_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="loadfrom_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\loadfrom_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="drilldownonarguments_chart_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\drilldownonarguments_chart_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="show_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="changedatasourcepivottable_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\changedatasourcepivottable_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -940,19 +939,19 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x161" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x161.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="viewmergeddata_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\viewmergeddata_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="lookup&amp;reference_16x163" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\lookup&amp;reference_16x163.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="ico_noCheck" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\ico_noCheck.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="logo_png_black" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\logo_png_black.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="insertdatafield_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\insertdatafield_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="upload_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\upload_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="column2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\column2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -973,13 +972,15 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="bodepartment_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\bodepartment_16x16.png;System.Drawing.Bitmap,
  <data name="apply_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\apply_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="time" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\time.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="checkbuttons_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\checkbuttons_32x32.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="show_16x162" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\show_16x162.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -990,16 +991,18 @@
  <data name="add_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\add_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="converttorange_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\converttorange_32x32.png;System.Drawing.Bitmap,
  <data name="newitem_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\newitem_16x16.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="boposition2_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\boposition2_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="alignverticalleft" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\alignverticalleft.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
  <data name="encryptdocument_32x321" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\encryptdocument_32x321.png;System.Drawing.Bitmap,
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="pie3_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\pie3_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -1009,7 +1012,7 @@
            System.Drawing, Version=4.0.0.0, Culture=neutral,
            PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
  <data name="subreport_16x16" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\subreport_16x16.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  <data name="user_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
    <value>..\Resources\user_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
  </data>
</root>
DevApp/Gs.DevApp/Resources/user_32x32.png
DevApp/Gs.DevApp/UserControl/SelectFont.Designer.cs
@@ -37,7 +37,7 @@
            // comboBoxEdit1
            // 
            this.comboBoxEdit1.EditValue = "--请选择--";
            this.comboBoxEdit1.Location = new System.Drawing.Point(73, 80);
            this.comboBoxEdit1.Location = new System.Drawing.Point(71, 80);
            this.comboBoxEdit1.Name = "comboBoxEdit1";
            this.comboBoxEdit1.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -52,7 +52,7 @@
            // 
            // simpleButton1
            // 
            this.simpleButton1.Location = new System.Drawing.Point(73, 146);
            this.simpleButton1.Location = new System.Drawing.Point(71, 146);
            this.simpleButton1.Name = "simpleButton1";
            this.simpleButton1.Size = new System.Drawing.Size(125, 29);
            this.simpleButton1.TabIndex = 1;
DevApp/Gs.DevApp/UserControl/SelectFont.cs
@@ -37,6 +37,8 @@
            DevExpress.XtraEditors.WindowsFormsSettings.DefaultMenuFont = new System.Drawing.Font(ary[0], _ft);
            DevExpress.XtraEditors.WindowsFormsSettings.DefaultPrintFont = new System.Drawing.Font(ary[0], _ft);
            #endregion
            Gs.DevApp.ToolBox.MsgHelper.ShowInformation("设置成功!");
        }
    }
}
DevApp/Gs.DevApp/UserControl/UcBtnPrint.Designer.cs
@@ -36,7 +36,7 @@
            // 
            this.btnReport.Dock = System.Windows.Forms.DockStyle.Right;
            this.btnReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            this.btnReport.Location = new System.Drawing.Point(106, 0);
            this.btnReport.Location = new System.Drawing.Point(138, 0);
            this.btnReport.Margin = new System.Windows.Forms.Padding(0);
            this.btnReport.Name = "btnReport";
            this.btnReport.Size = new System.Drawing.Size(94, 36);
@@ -62,7 +62,7 @@
            this.Controls.Add(this.btnDesign);
            this.Margin = new System.Windows.Forms.Padding(0);
            this.Name = "UcBtnPrint";
            this.Size = new System.Drawing.Size(200, 36);
            this.Size = new System.Drawing.Size(232, 36);
            this.ResumeLayout(false);
        }