lu
6 天以前 862e5ac5f10f553f64a8d75c69bb6b2683d0e532
生产
已修改18个文件
2929 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs 197 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs 251 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs 56 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs 19 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs 274 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs 824 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs 182 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs 18 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs 270 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 637 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 57 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs 22 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.Designer.cs
@@ -30,17 +30,17 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            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.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 columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -76,16 +76,18 @@
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_description = new DevExpress.XtraEditors.TextEdit();
            this.txt_depottype = new DevExpress.XtraEditors.TextEdit();
            this.txt_remark5 = new DevExpress.XtraEditors.ComboBoxEdit();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -98,8 +100,9 @@
            this.gvMx1lastupdateDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -127,16 +130,18 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -235,7 +240,8 @@
            this.gridColumn3,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10});
            this.gridColumn10,
            this.gridColumn12});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -396,7 +402,7 @@
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Tag = "query_a.lastupdate_date";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 13;
            this.gridColumn3.VisibleIndex = 14;
            this.gridColumn3.Width = 180;
            // 
            // gridColumn8
@@ -424,7 +430,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 12;
            this.gridColumn10.VisibleIndex = 13;
            this.gridColumn10.Width = 94;
            // 
            // pageBar1
@@ -464,7 +470,6 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1264, 570);
            this.splitMx1.SplitterPosition = 82;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
@@ -478,14 +483,16 @@
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_description);
            this.layoutMx1.Controls.Add(this.txt_depottype);
            this.layoutMx1.Controls.Add(this.txt_remark5);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem9});
            this.layoutControlItem9,
            this.layoutControlItem6});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(460, 453, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1264, 82);
            this.layoutMx1.Size = new System.Drawing.Size(1264, 100);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -510,7 +517,7 @@
            // 
            // txt_isNg
            // 
            this.txt_isNg.Location = new System.Drawing.Point(1032, 43);
            this.txt_isNg.Location = new System.Drawing.Point(1032, 52);
            this.txt_isNg.Name = "txt_isNg";
            this.txt_isNg.Properties.Appearance.Options.UseFont = true;
            this.txt_isNg.Size = new System.Drawing.Size(220, 24);
@@ -530,7 +537,7 @@
            // 
            // txt_zuid
            // 
            this.txt_zuid.Location = new System.Drawing.Point(721, 43);
            this.txt_zuid.Location = new System.Drawing.Point(721, 52);
            this.txt_zuid.Name = "txt_zuid";
            this.txt_zuid.Properties.Appearance.Options.UseFont = true;
            this.txt_zuid.Size = new System.Drawing.Size(220, 24);
@@ -560,7 +567,7 @@
            // 
            // txt_description
            // 
            this.txt_description.Location = new System.Drawing.Point(99, 43);
            this.txt_description.Location = new System.Drawing.Point(99, 52);
            this.txt_description.Name = "txt_description";
            this.txt_description.Properties.Appearance.Options.UseFont = true;
            this.txt_description.Size = new System.Drawing.Size(220, 24);
@@ -570,13 +577,28 @@
            // 
            // txt_depottype
            // 
            this.txt_depottype.Location = new System.Drawing.Point(410, 43);
            this.txt_depottype.Location = new System.Drawing.Point(410, 52);
            this.txt_depottype.Name = "txt_depottype";
            this.txt_depottype.Properties.Appearance.Options.UseFont = true;
            this.txt_depottype.Size = new System.Drawing.Size(220, 24);
            this.txt_depottype.StyleController = this.layoutMx1;
            this.txt_depottype.TabIndex = 231;
            this.txt_depottype.Tag = "readonly";
            //
            // txt_remark5
            //
            this.txt_remark5.EditValue = "否";
            this.txt_remark5.Location = new System.Drawing.Point(721, 52);
            this.txt_remark5.Name = "txt_remark5";
            this.txt_remark5.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_remark5.Properties.Items.AddRange(new object[] {
            "否",
            "是"});
            this.txt_remark5.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_remark5.Size = new System.Drawing.Size(220, 24);
            this.txt_remark5.StyleController = this.layoutMx1;
            this.txt_remark5.TabIndex = 292;
            // 
            // layoutControlItem9
            // 
@@ -590,6 +612,17 @@
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
            // 
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_zuid;
            this.layoutControlItem6.Location = new System.Drawing.Point(622, 40);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem6.Text = "分组";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
            //
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -600,32 +633,32 @@
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem5,
            this.layoutControlItem6,
            this.layoutControlItem7,
            this.layoutControlItem8});
            this.layoutControlItem8,
            this.layoutControlItem10});
            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;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            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;
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2});
            this.Root.Size = new System.Drawing.Size(1264, 82);
            rowDefinition3,
            rowDefinition4});
            this.Root.Size = new System.Drawing.Size(1264, 100);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -633,7 +666,7 @@
            this.layoutControlItem1.Control = this.txt_depotCode;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem1.Text = "仓库编码";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -643,7 +676,7 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(311, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem2.Text = "仓库名称";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -653,41 +686,31 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(622, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem3.Text = "仓库负责人";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_description;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem4.CustomizationFormText = "仓库备注";
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 40);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem4.Text = "备注";
            this.layoutControlItem4.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem4.Text = "仓库备注";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_depottype;
            this.layoutControlItem5.Location = new System.Drawing.Point(311, 31);
            this.layoutControlItem5.Location = new System.Drawing.Point(311, 40);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem5.Text = "仓库类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_zuid;
            this.layoutControlItem6.Location = new System.Drawing.Point(622, 31);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem6.Text = "分组";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem7
            // 
@@ -695,20 +718,31 @@
            this.layoutControlItem7.Location = new System.Drawing.Point(933, 0);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem7.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem7.Text = "允许负库存";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_isNg;
            this.layoutControlItem8.Location = new System.Drawing.Point(933, 31);
            this.layoutControlItem8.Location = new System.Drawing.Point(933, 40);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(311, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem8.Text = "禁用状态";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(75, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_remark5;
            this.layoutControlItem10.Location = new System.Drawing.Point(622, 40);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(311, 40);
            this.layoutControlItem10.Text = "特殊仓库";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(75, 18);
            // 
            // tabMx
            // 
@@ -716,7 +750,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1264, 476);
            this.tabMx.Size = new System.Drawing.Size(1264, 458);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -725,7 +759,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1262, 444);
            this.tabMxPage1.Size = new System.Drawing.Size(1262, 426);
            this.tabMxPage1.Text = "仓位列表";
            // 
            // gcMx1
@@ -736,7 +770,7 @@
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1262, 444);
            this.gcMx1.Size = new System.Drawing.Size(1262, 426);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -846,10 +880,10 @@
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "移出", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -863,6 +897,16 @@
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 5;
            this.gridColumn11.Width = 94;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "特殊仓";
            this.gridColumn12.FieldName = "remark5";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 12;
            this.gridColumn12.Width = 94;
            // 
            // Frm_MesDepot
            // 
@@ -900,16 +944,18 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_description.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depottype.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remark5.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -979,5 +1025,8 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraEditors.ComboBoxEdit txt_remark5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
    }
}
DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesDepot.cs
@@ -159,14 +159,14 @@
            toolBarMenu1.isSetBtn = false;
            if (string.IsNullOrEmpty(txt_depotCode.Text.Trim()))
            {
                MsgHelper.Warning("仓库编码不能为空!");
                MsgHelper.ShowError("仓库编码不能为空!");
                txt_depotCode.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_depotName.Text.Trim()))
            {
                MsgHelper.Warning("仓库名称不能为空!");
                MsgHelper.ShowError("仓库名称不能为空!");
                txt_depotName.Focus();
                return;
            }
@@ -203,18 +203,18 @@
                DepotCode = txt_depotCode.Text,
                DepotName = txt_depotName.Text,
                Description = txt_description.Text,
                Remark5=txt_remark5.Text.Trim(),
                list = lst
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModel",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData;
                    toolBarMenu1.isSetBtn = true;
                    var gridViews = new List<GridView>();
@@ -223,10 +223,12 @@
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.Designer.cs
@@ -76,7 +76,6 @@
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_fOwnerIdHead = new Gs.DevApp.UserControl.UcLookOrg();
            this.txt_fPurchaserId = new Gs.DevApp.UserControl.UcLookStaff();
            this.txt_fPurchaseDeptId = new Gs.DevApp.UserControl.UcLookDepartment();
            this.txt_fRequireOrgId = new Gs.DevApp.UserControl.UcLookOrg();
            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
@@ -113,11 +112,6 @@
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -148,6 +142,10 @@
            this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -197,11 +195,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -210,6 +203,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -535,13 +532,12 @@
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.SplitterPosition = 172;
            this.splitMx1.SplitterPosition = 187;
            this.splitMx1.TabIndex = 0;
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_fOwnerIdHead);
            this.layoutMx1.Controls.Add(this.txt_fPurchaserId);
            this.layoutMx1.Controls.Add(this.txt_fPurchaseDeptId);
            this.layoutMx1.Controls.Add(this.txt_fRequireOrgId);
            this.layoutMx1.Controls.Add(this.btnSelect);
@@ -569,30 +565,22 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 172);
            this.layoutMx1.Size = new System.Drawing.Size(1126, 187);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_fOwnerIdHead
            // 
            this.txt_fOwnerIdHead.IsReadly = false;
            this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 135);
            this.txt_fOwnerIdHead.Location = new System.Drawing.Point(360, 146);
            this.txt_fOwnerIdHead.Name = "txt_fOwnerIdHead";
            this.txt_fOwnerIdHead.Size = new System.Drawing.Size(200, 24);
            this.txt_fOwnerIdHead.TabIndex = 537;
            // 
            // txt_fPurchaserId
            //
            this.txt_fPurchaserId.IsReadly = false;
            this.txt_fPurchaserId.Location = new System.Drawing.Point(912, 135);
            this.txt_fPurchaserId.Name = "txt_fPurchaserId";
            this.txt_fPurchaserId.Size = new System.Drawing.Size(202, 24);
            this.txt_fPurchaserId.TabIndex = 536;
            //
            // txt_fPurchaseDeptId
            // 
            this.txt_fPurchaseDeptId.IsReadly = false;
            this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 135);
            this.txt_fPurchaseDeptId.Location = new System.Drawing.Point(636, 146);
            this.txt_fPurchaseDeptId.Name = "txt_fPurchaseDeptId";
            this.txt_fPurchaseDeptId.Size = new System.Drawing.Size(200, 24);
            this.txt_fPurchaseDeptId.TabIndex = 535;
@@ -600,7 +588,7 @@
            // txt_fRequireOrgId
            // 
            this.txt_fRequireOrgId.IsReadly = false;
            this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 135);
            this.txt_fRequireOrgId.Location = new System.Drawing.Point(84, 146);
            this.txt_fRequireOrgId.Name = "txt_fRequireOrgId";
            this.txt_fRequireOrgId.Size = new System.Drawing.Size(200, 24);
            this.txt_fRequireOrgId.TabIndex = 534;
@@ -608,7 +596,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 99);
            this.btnSelect.Location = new System.Drawing.Point(12, 110);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -627,7 +615,7 @@
            // txt_thOrgId
            // 
            this.txt_thOrgId.IsReadly = false;
            this.txt_thOrgId.Location = new System.Drawing.Point(84, 41);
            this.txt_thOrgId.Location = new System.Drawing.Point(84, 44);
            this.txt_thOrgId.Name = "txt_thOrgId";
            this.txt_thOrgId.Size = new System.Drawing.Size(200, 24);
            this.txt_thOrgId.TabIndex = 526;
@@ -635,7 +623,7 @@
            // txt_returnType
            // 
            this.txt_returnType.EditValue = "-请选择-";
            this.txt_returnType.Location = new System.Drawing.Point(360, 70);
            this.txt_returnType.Location = new System.Drawing.Point(360, 77);
            this.txt_returnType.Name = "txt_returnType";
            this.txt_returnType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -664,7 +652,7 @@
            // txt_returnMethod
            // 
            this.txt_returnMethod.EditValue = "-请选择-";
            this.txt_returnMethod.Location = new System.Drawing.Point(360, 41);
            this.txt_returnMethod.Location = new System.Drawing.Point(360, 44);
            this.txt_returnMethod.Name = "txt_returnMethod";
            this.txt_returnMethod.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -679,7 +667,7 @@
            // 
            // txt_checkDate
            // 
            this.txt_checkDate.Location = new System.Drawing.Point(912, 41);
            this.txt_checkDate.Location = new System.Drawing.Point(912, 44);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
            this.txt_checkDate.Size = new System.Drawing.Size(202, 24);
@@ -689,7 +677,7 @@
            // 
            // txt_remark
            // 
            this.txt_remark.Location = new System.Drawing.Point(636, 70);
            this.txt_remark.Location = new System.Drawing.Point(636, 77);
            this.txt_remark.Name = "txt_remark";
            this.txt_remark.Properties.Appearance.Options.UseFont = true;
            this.txt_remark.Size = new System.Drawing.Size(200, 24);
@@ -709,7 +697,7 @@
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(84, 70);
            this.txt_suppId.Location = new System.Drawing.Point(84, 77);
            this.txt_suppId.Margin = new System.Windows.Forms.Padding(0);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(200, 24);
@@ -727,7 +715,7 @@
            // 
            // txt_status
            // 
            this.txt_status.Location = new System.Drawing.Point(840, 70);
            this.txt_status.Location = new System.Drawing.Point(840, 77);
            this.txt_status.Name = "txt_status";
            this.txt_status.Properties.Caption = "审核标识";
            this.txt_status.Size = new System.Drawing.Size(274, 24);
@@ -737,7 +725,7 @@
            // 
            // txt_isFinish
            // 
            this.txt_isFinish.Location = new System.Drawing.Point(840, 99);
            this.txt_isFinish.Location = new System.Drawing.Point(840, 110);
            this.txt_isFinish.Name = "txt_isFinish";
            this.txt_isFinish.Properties.Caption = "完结标识";
            this.txt_isFinish.Size = new System.Drawing.Size(274, 24);
@@ -756,7 +744,7 @@
            // 
            // lastUpdateTime
            // 
            this.lastUpdateTime.Location = new System.Drawing.Point(636, 41);
            this.lastUpdateTime.Location = new System.Drawing.Point(636, 44);
            this.lastUpdateTime.Name = "lastUpdateTime";
            this.lastUpdateTime.Size = new System.Drawing.Size(200, 24);
            this.lastUpdateTime.StyleController = this.layoutMx1;
@@ -773,7 +761,7 @@
            // 
            // txt_fHasLinkRad
            // 
            this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 99);
            this.txt_fHasLinkRad.Location = new System.Drawing.Point(360, 110);
            this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
            this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "有源单"),
@@ -827,9 +815,8 @@
            this.layoutControlItem7,
            this.layoutControlItem3,
            this.layItem1,
            this.layItem3,
            this.layItem2,
            this.layItem4});
            this.layItem4,
            this.layItem2});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -861,7 +848,7 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1126, 172);
            this.Root.Size = new System.Drawing.Size(1126, 187);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -869,39 +856,39 @@
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_thOrgId;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 29);
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem2.Text = "选择组织";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_returnType;
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 58);
            this.layoutControlItem6.Location = new System.Drawing.Point(276, 65);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem6.Text = "退料原因";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
            // 
            this.layoutControlItem5.Control = this.txt_returnMethod;
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 29);
            this.layoutControlItem5.Location = new System.Drawing.Point(276, 32);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem5.Text = "退料方式";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -911,7 +898,7 @@
            this.layoutControlItem8.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem8.Text = "委外标识";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem8.TextVisible = false;
@@ -923,18 +910,18 @@
            this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem9.Size = new System.Drawing.Size(278, 32);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_checkDate;
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 29);
            this.layoutControlItem10.Location = new System.Drawing.Point(828, 32);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem10.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -945,29 +932,29 @@
            this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem14.Text = "更新人员";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.lastUpdateTime;
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 29);
            this.layoutControlItem15.Location = new System.Drawing.Point(552, 32);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem15.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem15.Text = "更新时间";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_status;
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 58);
            this.layoutControlItem11.Location = new System.Drawing.Point(828, 65);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
            this.layoutControlItem11.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem11.Text = "审核标识";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -975,17 +962,17 @@
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_suppId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 58);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 65);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem4.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem4.Text = "选供应商";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.btnSelect;
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 87);
            this.layoutControlItem16.Location = new System.Drawing.Point(0, 98);
            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
@@ -999,7 +986,7 @@
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_isFinish;
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 87);
            this.layoutControlItem12.Location = new System.Drawing.Point(828, 98);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
@@ -1011,77 +998,13 @@
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_remark;
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 58);
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 65);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 29);
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem7.Text = "申请备注";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
            this.layoutControlItem3.Control = this.txt_fHasLinkRad;
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 87);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 36);
            this.layoutControlItem3.Text = "源单类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem1
            //
            this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem1.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem1.Control = this.txt_fRequireOrgId;
            this.layItem1.Location = new System.Drawing.Point(0, 123);
            this.layItem1.Name = "layItem1";
            this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem1.Size = new System.Drawing.Size(276, 29);
            this.layItem1.Text = "需求组织";
            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem3
            //
            this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem3.Control = this.txt_fPurchaserId;
            this.layItem3.Location = new System.Drawing.Point(828, 123);
            this.layItem3.Name = "layItem3";
            this.layItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layItem3.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem3.Size = new System.Drawing.Size(278, 29);
            this.layItem3.Text = "员工编号";
            this.layItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem2
            //
            this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem2.Control = this.txt_fPurchaseDeptId;
            this.layItem2.Location = new System.Drawing.Point(552, 123);
            this.layItem2.Name = "layItem2";
            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem2.Size = new System.Drawing.Size(276, 29);
            this.layItem2.Text = "采购部门";
            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem4
            //
            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem4.Control = this.txt_fOwnerIdHead;
            this.layItem4.Location = new System.Drawing.Point(276, 123);
            this.layItem4.Name = "layItem4";
            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem4.Size = new System.Drawing.Size(276, 29);
            this.layItem4.Text = "货主";
            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -1089,7 +1012,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 386);
            this.tabMx.Size = new System.Drawing.Size(1126, 371);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -1098,7 +1021,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 354);
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 339);
            this.tabMxPage1.Text = "申请明细";
            // 
            // gcMx1
@@ -1110,7 +1033,7 @@
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1,
            this.rptCk});
            this.gcMx1.Size = new System.Drawing.Size(1124, 354);
            this.gcMx1.Size = new System.Drawing.Size(1124, 339);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1418,6 +1341,57 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem3
            //
            this.layoutControlItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layoutControlItem3.AppearanceItemCaption.Options.UseBackColor = true;
            this.layoutControlItem3.Control = this.txt_fHasLinkRad;
            this.layoutControlItem3.Location = new System.Drawing.Point(276, 98);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(276, 36);
            this.layoutControlItem3.Text = "源单类型";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem1
            //
            this.layItem1.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem1.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem1.Control = this.txt_fRequireOrgId;
            this.layItem1.Location = new System.Drawing.Point(0, 134);
            this.layItem1.Name = "layItem1";
            this.layItem1.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem1.Size = new System.Drawing.Size(276, 33);
            this.layItem1.Text = "需求组织";
            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem4
            //
            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem4.Control = this.txt_fOwnerIdHead;
            this.layItem4.Location = new System.Drawing.Point(276, 134);
            this.layItem4.Name = "layItem4";
            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layItem4.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem4.Size = new System.Drawing.Size(276, 33);
            this.layItem4.Text = "货主";
            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
            //
            // layItem2
            //
            this.layItem2.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
            this.layItem2.AppearanceItemCaption.Options.UseBackColor = true;
            this.layItem2.Control = this.txt_fPurchaseDeptId;
            this.layItem2.Location = new System.Drawing.Point(552, 134);
            this.layItem2.Name = "layItem2";
            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layItem2.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem2.Size = new System.Drawing.Size(276, 33);
            this.layItem2.Text = "采购部门";
            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // Frm_MesCgthSq
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1477,11 +1451,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1490,6 +1459,10 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1583,15 +1556,13 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private UserControl.UcLookStaff txt_fPurchaserId;
        private UserControl.UcLookDepartment txt_fPurchaseDeptId;
        private UserControl.UcLookOrg txt_fRequireOrgId;
        private DevExpress.XtraLayout.LayoutControlItem layItem1;
        private DevExpress.XtraLayout.LayoutControlItem layItem3;
        private DevExpress.XtraLayout.LayoutControlItem layItem2;
        private UserControl.UcLookOrg txt_fOwnerIdHead;
        private DevExpress.XtraLayout.LayoutControlItem layItem4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layItem1;
        private DevExpress.XtraLayout.LayoutControlItem layItem4;
        private DevExpress.XtraLayout.LayoutControlItem layItem2;
    }
}
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesCgthSq.cs
@@ -53,7 +53,6 @@
                    return;
                txt_suppId.getSuppler(orgId, _ucGys);
                txt_fPurchaseDeptId.getSuppler(orgId, _ucBm);
                // txt_fPurchaserId.getSuppler();
            };
            //选择需要的明细
            btnSelect.Click += (s, e) =>
@@ -151,7 +150,7 @@
            txt_fHasLinkRad.SelectedIndex = 0;
            layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            txt_fHasLinkRad.SelectedIndexChanged += (s, e) =>
            {
@@ -343,7 +342,7 @@
            txt_fRequireOrgId.IsReadly = true;
            txt_fOwnerIdHead.IsReadly = true;
            txt_fPurchaseDeptId.IsReadly = true;
            txt_fPurchaserId.IsReadly = true;
          //  txt_fPurchaserId.IsReadly = true;
        }
        /// <summary>
        /// 新增事件
@@ -377,7 +376,8 @@
            string _xqzz = txt_fRequireOrgId.GetId();//需求组织
            string _hz = txt_fOwnerIdHead.GetId();//货主
            string _bm = txt_fPurchaseDeptId.GetId();//部门
            string _ygbh = txt_fPurchaserId.GetId();//员工
            //string _ygbh = txt_fPurchaserId.GetId();//员工
            string _ygbh = "";
            if (string.IsNullOrEmpty(_orgId))
            {
                MsgHelper.ShowError("请选择组织!");
@@ -423,12 +423,12 @@
                    txt_fPurchaseDeptId.Focus();
                    return;
                }
                if (string.IsNullOrEmpty(_ygbh))
                {
                    MsgHelper.ShowError("请选择员工!");
                    txt_fPurchaserId.Focus();
                    return;
                }
                //if (string.IsNullOrEmpty(_ygbh))
                //{
                //    MsgHelper.ShowError("请选择员工!");
                //    txt_fPurchaserId.Focus();
                //    return;
                //}
            }
            var _obj = new
            {
@@ -758,14 +758,14 @@
            {
                layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
               // layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            }
            else
            {
                layItem1.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                layItem2.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                //layItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
                layItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Always;
            }
        }
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.Designer.cs
@@ -82,6 +82,7 @@
            this.txt_status = new DevExpress.XtraEditors.CheckEdit();
            this.txt_dldh = new DevExpress.XtraEditors.TextEdit();
            this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
            this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -98,6 +99,7 @@
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.sp_fSubsidiary = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -129,8 +131,6 @@
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.txt_depotId = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -164,6 +164,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
@@ -180,6 +181,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -189,8 +191,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -578,7 +578,8 @@
            this.layoutMx1.Controls.Add(this.txt_depotId);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem13});
            this.layoutControlItem13,
            this.layoutControlItem15});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(576, 277, 812, 500);
@@ -720,6 +721,14 @@
            this.txt_fSubsidiary.StyleController = this.layoutMx1;
            this.txt_fSubsidiary.TabIndex = 578;
            // 
            // txt_depotId
            //
            this.txt_depotId.Location = new System.Drawing.Point(912, 99);
            this.txt_depotId.Name = "txt_depotId";
            this.txt_depotId.Size = new System.Drawing.Size(202, 24);
            this.txt_depotId.StyleController = this.layoutMx1;
            this.txt_depotId.TabIndex = 579;
            //
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.lbGuid;
@@ -750,8 +759,7 @@
            this.layoutControlItem12,
            this.layoutControlItem5,
            this.layoutControlItem14,
            this.sp_fSubsidiary,
            this.layoutControlItem15});
            this.sp_fSubsidiary});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -930,6 +938,17 @@
            this.sp_fSubsidiary.Size = new System.Drawing.Size(276, 30);
            this.sp_fSubsidiary.Text = "生产组织";
            this.sp_fSubsidiary.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_depotId;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem15.Text = "仓库ID";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -1278,25 +1297,6 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // txt_depotId
            //
            this.txt_depotId.Location = new System.Drawing.Point(912, 99);
            this.txt_depotId.Name = "txt_depotId";
            this.txt_depotId.Size = new System.Drawing.Size(202, 24);
            this.txt_depotId.StyleController = this.layoutMx1;
            this.txt_depotId.TabIndex = 579;
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_depotId;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 87);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 30);
            this.layoutControlItem15.Text = "仓库ID";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            //
            // Frm_MesInvItemOut_SCLL
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1340,6 +1340,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dldh.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
@@ -1356,6 +1357,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.sp_fSubsidiary)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -1365,8 +1367,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_depotId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            this.ResumeLayout(false);
        }
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesInvItemOut_SCLL.cs
@@ -186,7 +186,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -200,7 +200,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -258,11 +258,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -287,7 +287,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -304,9 +304,10 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -315,10 +316,12 @@
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -300,35 +300,35 @@
            string inKcfx = txt_qt020.Text.Trim();//库存方向
            if (string.IsNullOrEmpty(inOrgId))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择库存组织!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择库存组织!");
                txt_qt023.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inHzlx))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择货主类型!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主类型!");
                return;
            }
            if (string.IsNullOrEmpty(inHz))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择货主!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择货主!");
                return;
            }
            if (txt_qt019.SelectedIndex <= 0)
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择单据类型!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择单据类型!");
                txt_qt019.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inLyOrg))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择领用组织!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择领用组织!");
                txt_qt024.Focus();
                return;
            }
            if (string.IsNullOrEmpty(inLyCus) && string.IsNullOrEmpty(inLyDepart))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("客户或部门必选一个!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("客户或部门必选一个!");
                return;
            }
            //if (txt_qt020.SelectedIndex <= 0)
@@ -392,9 +392,10 @@
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    lbGuid.Text = _rtn.rtnData.outGuid;
                    txt_qtck.Text = _rtn.rtnData.outNo;
                    toolBarMenu1.isSetBtn = true;
@@ -405,10 +406,12 @@
                    toolBarMenu1.currentAction = "";
                    Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 6);
                }
                else
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -95,13 +95,7 @@
            this.txt_bl005 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -110,8 +104,6 @@
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -136,6 +128,14 @@
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -172,13 +172,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl005.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
@@ -187,8 +181,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
@@ -197,6 +189,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -657,7 +657,7 @@
            // btnSelect
            // 
            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
            this.btnSelect.Location = new System.Drawing.Point(12, 111);
            this.btnSelect.Location = new System.Drawing.Point(12, 144);
            this.btnSelect.Name = "btnSelect";
            this.btnSelect.Size = new System.Drawing.Size(116, 27);
            this.btnSelect.StyleController = this.layoutMx1;
@@ -677,7 +677,7 @@
            // 
            this.txt_aboutGuid.category = null;
            this.txt_aboutGuid.IsReadly = false;
            this.txt_aboutGuid.Location = new System.Drawing.Point(89, 78);
            this.txt_aboutGuid.Location = new System.Drawing.Point(89, 111);
            this.txt_aboutGuid.Name = "txt_aboutGuid";
            this.txt_aboutGuid.Size = new System.Drawing.Size(195, 24);
            this.txt_aboutGuid.TabIndex = 283;
@@ -685,7 +685,7 @@
            // txt_orgId
            // 
            this.txt_orgId.IsReadly = false;
            this.txt_orgId.Location = new System.Drawing.Point(89, 45);
            this.txt_orgId.Location = new System.Drawing.Point(89, 78);
            this.txt_orgId.Name = "txt_orgId";
            this.txt_orgId.Size = new System.Drawing.Size(195, 24);
            this.txt_orgId.TabIndex = 289;
@@ -693,7 +693,7 @@
            // txt_bl017
            // 
            this.txt_bl017.Enabled = false;
            this.txt_bl017.Location = new System.Drawing.Point(365, 12);
            this.txt_bl017.Location = new System.Drawing.Point(89, 45);
            this.txt_bl017.Name = "txt_bl017";
            this.txt_bl017.Properties.Appearance.Options.UseFont = true;
            this.txt_bl017.Size = new System.Drawing.Size(195, 24);
@@ -703,10 +703,10 @@
            // 
            // txt_bl007
            // 
            this.txt_bl007.Location = new System.Drawing.Point(365, 144);
            this.txt_bl007.Location = new System.Drawing.Point(365, 111);
            this.txt_bl007.Name = "txt_bl007";
            this.txt_bl007.Properties.Appearance.Options.UseFont = true;
            this.txt_bl007.Size = new System.Drawing.Size(471, 24);
            this.txt_bl007.Size = new System.Drawing.Size(195, 24);
            this.txt_bl007.StyleController = this.layoutMx1;
            this.txt_bl007.TabIndex = 228;
            // 
@@ -732,7 +732,7 @@
            // 
            // txt_bl012
            // 
            this.txt_bl012.Location = new System.Drawing.Point(365, 111);
            this.txt_bl012.Location = new System.Drawing.Point(365, 78);
            this.txt_bl012.Name = "txt_bl012";
            this.txt_bl012.Properties.Appearance.Options.UseFont = true;
            this.txt_bl012.Size = new System.Drawing.Size(195, 24);
@@ -762,7 +762,7 @@
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(365, 78);
            this.txt_dptName.Location = new System.Drawing.Point(365, 45);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
            this.txt_dptName.Size = new System.Drawing.Size(195, 24);
@@ -811,7 +811,7 @@
            // 
            // txt_tldh
            // 
            this.txt_tldh.Location = new System.Drawing.Point(365, 45);
            this.txt_tldh.Location = new System.Drawing.Point(365, 12);
            this.txt_tldh.Name = "txt_tldh";
            this.txt_tldh.Size = new System.Drawing.Size(195, 24);
            this.txt_tldh.StyleController = this.layoutMx1;
@@ -854,13 +854,7 @@
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem2,
            this.layoutControlItem5,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem11,
            this.layoutControlItem12,
            this.layoutControlItem17,
            this.layoutControlItem6,
            this.layoutControlItem7,
            this.layoutControlItem8,
@@ -869,9 +863,15 @@
            this.layoutControlItem19,
            this.layoutControlItem15,
            this.layoutControlItem4,
            this.layoutControlItem14,
            this.layoutControlItem1,
            this.layoutControlItem13,
            this.layoutControlItem1});
            this.layoutControlItem9,
            this.layoutControlItem5,
            this.layoutControlItem2,
            this.layoutControlItem17,
            this.layoutControlItem10,
            this.layoutControlItem11,
            this.layoutControlItem14});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -906,58 +906,6 @@
            this.Root.Size = new System.Drawing.Size(1126, 187);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_bl017;
            this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem2.Text = "单据类型";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_orgId;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 33);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem5.Text = "生产组织";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_aboutGuid;
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 66);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem9.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem9.Text = "生产工单";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_dptName;
            this.layoutControlItem10.Location = new System.Drawing.Point(276, 66);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem10.Text = "补料车间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_bl012;
            this.layoutControlItem11.Location = new System.Drawing.Point(276, 99);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem11.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem11.Text = "补料产线";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_bl013;
@@ -967,17 +915,6 @@
            this.layoutControlItem12.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem12.Text = "任务单号";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.txt_tldh;
            this.layoutControlItem17.Location = new System.Drawing.Point(276, 33);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem17.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem17.Text = "投料单号";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem6
            // 
@@ -1067,32 +1004,6 @@
            this.layoutControlItem4.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem4.Text = "审核人员";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_bl007;
            this.layoutControlItem14.Location = new System.Drawing.Point(276, 132);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem14.Size = new System.Drawing.Size(552, 35);
            this.layoutControlItem14.Text = "申请原因";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.btnSelect;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 99);
            this.layoutControlItem13.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem13.MinSize = new System.Drawing.Size(95, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem13.Text = "选择物料";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            // 
            // layoutControlItem1
            // 
@@ -1372,6 +1283,93 @@
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.btnSelect;
            this.layoutControlItem13.Location = new System.Drawing.Point(0, 132);
            this.layoutControlItem13.MaxSize = new System.Drawing.Size(120, 31);
            this.layoutControlItem13.MinSize = new System.Drawing.Size(95, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 35);
            this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem13.Text = "选择物料";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            //
            // layoutControlItem9
            //
            this.layoutControlItem9.Control = this.txt_aboutGuid;
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 99);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem9.Text = "生产工单";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_orgId;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem5.Text = "生产组织";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_bl017;
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem2.Text = "单据类型";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem17
            //
            this.layoutControlItem17.Control = this.txt_tldh;
            this.layoutControlItem17.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem17.Text = "投料单号";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_dptName;
            this.layoutControlItem10.Location = new System.Drawing.Point(276, 33);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem10.Text = "补料车间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_bl012;
            this.layoutControlItem11.Location = new System.Drawing.Point(276, 66);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem11.Text = "补料产线";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_bl007;
            this.layoutControlItem14.Location = new System.Drawing.Point(276, 99);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem14.Text = "申请原因";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
            //
            // UcBlcl
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1417,13 +1415,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_bl005.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
@@ -1432,8 +1424,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
@@ -1442,6 +1432,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1493,10 +1491,6 @@
        private DevExpress.XtraEditors.TextEdit txt_blNo;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraEditors.CheckEdit txt_bl018;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -1522,9 +1516,7 @@
        private DevExpress.XtraEditors.TextEdit txt_tldh;
        private DevExpress.XtraEditors.TextEdit txt_bl004;
        private DevExpress.XtraEditors.TextEdit txt_bl005;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
@@ -1536,9 +1528,15 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraEditors.SimpleButton btnSelect;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
    }
}
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.cs
@@ -75,13 +75,12 @@
                txt_bl013.Text = txt_aboutGuid.GetRwd();
                txt_tldh.Text = txt_aboutGuid.GetTldh();
            };
            //选择需要入库的明细
            btnSelect.Click += (s, e) =>
            {
                if (string.IsNullOrEmpty(this.txt_orgId.GetId()))
                {
                    MsgHelper.Warning("请选择生产组织!");
                    MsgHelper.ShowError("请选择生产组织!");
                    txt_orgId.Focus();
                    return;
                }
@@ -215,7 +214,7 @@
                lbGuid, txt_blNo, gridView1, "blNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
@@ -239,13 +238,12 @@
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        /// <summary>
@@ -295,6 +293,9 @@
                gvList.Add(gvMx1);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_orgId.IsReadly = true;
            txt_aboutGuid.IsReadly = true;
        }
        /// <summary>
        /// 新增事件
@@ -548,13 +549,14 @@
                case 0:
                    strMsg = "反审核";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_blNo, gridView1, "blNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -570,9 +572,10 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -582,10 +585,12 @@
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "bl018", "bl016", "bl006", picCheckBox, parentForm, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
@@ -617,13 +622,15 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    else
                        MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
DevApp/Gs.DevApp/DevFrm/Ck/UcBlclDj.cs
@@ -204,7 +204,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
        private void getModel(string strGuid)
@@ -214,7 +214,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -272,11 +272,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -301,7 +301,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemOutNo, gridView1, "itemOutNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -318,9 +318,9 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -330,10 +330,12 @@
                    Form parentForm = this.FindForm();
                    UtilityHelper.SetCheckIco(gridView1, "statusChk", "checkUser", "checkDate", picCheckBox, parentForm, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -39,6 +39,16 @@
            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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = 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();
@@ -72,6 +82,7 @@
            this.gv_tbl012 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -95,8 +106,11 @@
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_id = new DevExpress.XtraEditors.TextEdit();
            this.txt_daa014 = new DevExpress.XtraEditors.TextEdit();
            this.txt_tbl026 = new DevExpress.XtraEditors.TextEdit();
            this.txt_tbl025 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -109,14 +123,45 @@
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lab_daa014 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
            this.lay99 = new DevExpress.XtraLayout.LayoutControl();
            this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
            this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.radOut = new DevExpress.XtraEditors.RadioGroup();
            this.dataLayoutControl1 = new DevExpress.XtraDataLayout.DataLayoutControl();
            this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txtWlid = new DevExpress.XtraEditors.TextEdit();
            this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
            this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
            this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
            this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
            this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
            this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1tlid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -191,8 +236,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl026.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl025.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
@@ -205,15 +253,51 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
            this.split99.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
            this.split99.Panel2.SuspendLayout();
            this.split99.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.lay99)).BeginInit();
            this.lay99.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).BeginInit();
            this.dataLayoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
@@ -236,7 +320,7 @@
            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
            this.toolBarMenu1.Name = "toolBarMenu1";
            this.toolBarMenu1.rptParameter = null;
            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
            this.toolBarMenu1.Size = new System.Drawing.Size(1260, 80);
            this.toolBarMenu1.TabIndex = 0;
            this.toolBarMenu1.xlsInService = null;
            this.toolBarMenu1.xlsOutParameter = null;
@@ -247,7 +331,7 @@
            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
            this.xtraTabControl1.Name = "xtraTabControl1";
            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 624);
            this.xtraTabControl1.Size = new System.Drawing.Size(1260, 624);
            this.xtraTabControl1.TabIndex = 3;
            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.xtraTabPage1,
@@ -257,7 +341,7 @@
            // 
            this.xtraTabPage1.Controls.Add(this.split1);
            this.xtraTabPage1.Name = "xtraTabPage1";
            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 592);
            this.xtraTabPage1.Size = new System.Drawing.Size(1258, 592);
            this.xtraTabPage1.Text = "数据列表";
            // 
            // split1
@@ -278,7 +362,7 @@
            // 
            this.split1.Panel2.Text = "Panel2";
            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split1.Size = new System.Drawing.Size(1126, 592);
            this.split1.Size = new System.Drawing.Size(1258, 592);
            this.split1.SplitterPosition = 0;
            this.split1.TabIndex = 0;
            // 
@@ -288,7 +372,7 @@
            this.gcMain1.Location = new System.Drawing.Point(0, 0);
            this.gcMain1.MainView = this.gridView1;
            this.gcMain1.Name = "gcMain1";
            this.gcMain1.Size = new System.Drawing.Size(1126, 541);
            this.gcMain1.Size = new System.Drawing.Size(1258, 541);
            this.gcMain1.TabIndex = 2;
            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1});
@@ -316,7 +400,8 @@
            this.gv_tbl011,
            this.gv_tbl012,
            this.gridColumn11,
            this.gridColumn12});
            this.gridColumn12,
            this.gridColumn21});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.IndicatorWidth = 50;
            this.gridView1.Name = "gridView1";
@@ -358,7 +443,7 @@
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Tag = "org.fnamber";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.Width = 94;
            // 
            // gv_billNo
@@ -371,7 +456,7 @@
            this.gv_billNo.OptionsColumn.AllowEdit = false;
            this.gv_billNo.Tag = "query_a.bill_no";
            this.gv_billNo.Visible = true;
            this.gv_billNo.VisibleIndex = 2;
            this.gv_billNo.VisibleIndex = 3;
            this.gv_billNo.Width = 94;
            // 
            // gv_tbl003
@@ -384,7 +469,7 @@
            this.gv_tbl003.OptionsColumn.AllowEdit = false;
            this.gv_tbl003.Tag = "query_a.tbl003";
            this.gv_tbl003.Visible = true;
            this.gv_tbl003.VisibleIndex = 3;
            this.gv_tbl003.VisibleIndex = 4;
            this.gv_tbl003.Width = 94;
            // 
            // gv_tbl002
@@ -397,7 +482,7 @@
            this.gv_tbl002.OptionsColumn.AllowEdit = false;
            this.gv_tbl002.Tag = "query_a.tbl002";
            this.gv_tbl002.Visible = true;
            this.gv_tbl002.VisibleIndex = 4;
            this.gv_tbl002.VisibleIndex = 5;
            this.gv_tbl002.Width = 94;
            // 
            // gv_tbl021
@@ -410,7 +495,7 @@
            this.gv_tbl021.OptionsColumn.AllowEdit = false;
            this.gv_tbl021.Tag = "query_a.tbl021";
            this.gv_tbl021.Visible = true;
            this.gv_tbl021.VisibleIndex = 5;
            this.gv_tbl021.VisibleIndex = 6;
            this.gv_tbl021.Width = 94;
            // 
            // gridColumn6
@@ -420,7 +505,7 @@
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.VisibleIndex = 7;
            this.gridColumn6.Width = 94;
            // 
            // gridColumn10
@@ -430,7 +515,7 @@
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 7;
            this.gridColumn10.VisibleIndex = 8;
            this.gridColumn10.Width = 94;
            // 
            // gv_tbl004
@@ -443,7 +528,7 @@
            this.gv_tbl004.OptionsColumn.AllowEdit = false;
            this.gv_tbl004.Tag = "query_a.tbl004";
            this.gv_tbl004.Visible = true;
            this.gv_tbl004.VisibleIndex = 8;
            this.gv_tbl004.VisibleIndex = 9;
            this.gv_tbl004.Width = 94;
            // 
            // gv_tbl005
@@ -456,7 +541,7 @@
            this.gv_tbl005.OptionsColumn.AllowEdit = false;
            this.gv_tbl005.Tag = "query_a.tbl005";
            this.gv_tbl005.Visible = true;
            this.gv_tbl005.VisibleIndex = 9;
            this.gv_tbl005.VisibleIndex = 10;
            this.gv_tbl005.Width = 94;
            // 
            // gv_tbl009
@@ -469,7 +554,7 @@
            this.gv_tbl009.OptionsColumn.AllowEdit = false;
            this.gv_tbl009.Tag = "query_a.tbl009";
            this.gv_tbl009.Visible = true;
            this.gv_tbl009.VisibleIndex = 10;
            this.gv_tbl009.VisibleIndex = 11;
            this.gv_tbl009.Width = 94;
            // 
            // gv_tbl010
@@ -482,7 +567,7 @@
            this.gv_tbl010.OptionsColumn.AllowEdit = false;
            this.gv_tbl010.Tag = "query_a.tbl010";
            this.gv_tbl010.Visible = true;
            this.gv_tbl010.VisibleIndex = 11;
            this.gv_tbl010.VisibleIndex = 12;
            this.gv_tbl010.Width = 94;
            // 
            // gv_tbl011
@@ -495,7 +580,7 @@
            this.gv_tbl011.OptionsColumn.AllowEdit = false;
            this.gv_tbl011.Tag = "query_a.tbl011";
            this.gv_tbl011.Visible = true;
            this.gv_tbl011.VisibleIndex = 12;
            this.gv_tbl011.VisibleIndex = 13;
            this.gv_tbl011.Width = 94;
            // 
            // gv_tbl012
@@ -508,7 +593,7 @@
            this.gv_tbl012.OptionsColumn.AllowEdit = false;
            this.gv_tbl012.Tag = "query_a.tbl012";
            this.gv_tbl012.Visible = true;
            this.gv_tbl012.VisibleIndex = 13;
            this.gv_tbl012.VisibleIndex = 14;
            this.gv_tbl012.Width = 94;
            // 
            // gridColumn11
@@ -526,8 +611,18 @@
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 14;
            this.gridColumn12.VisibleIndex = 15;
            this.gridColumn12.Width = 94;
            //
            // gridColumn21
            //
            this.gridColumn21.Caption = "批准";
            this.gridColumn21.FieldName = "tbl024Chk";
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 1;
            this.gridColumn21.Width = 94;
            // 
            // pageBar1
            // 
@@ -537,7 +632,7 @@
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1126, 39);
            this.pageBar1.Size = new System.Drawing.Size(1258, 39);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
@@ -545,7 +640,7 @@
            // 
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 592);
            this.xtraTabPage2.Size = new System.Drawing.Size(1258, 592);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // splitMx1
@@ -565,7 +660,7 @@
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1126, 592);
            this.splitMx1.Size = new System.Drawing.Size(1258, 592);
            this.splitMx1.SplitterPosition = 170;
            this.splitMx1.TabIndex = 0;
            // 
@@ -590,15 +685,18 @@
            this.layoutMx1.Controls.Add(this.txt_itemNo);
            this.layoutMx1.Controls.Add(this.txt_id);
            this.layoutMx1.Controls.Add(this.txt_daa014);
            this.layoutMx1.Controls.Add(this.txt_tbl026);
            this.layoutMx1.Controls.Add(this.txt_tbl025);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem7,
            this.layoutControlItem17});
            this.layoutControlItem17,
            this.layoutControlItem14});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(55, 282, 812, 616);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 170);
            this.layoutMx1.Size = new System.Drawing.Size(1258, 170);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -626,7 +724,7 @@
            this.txt_tbl023.IsReadly = false;
            this.txt_tbl023.Location = new System.Drawing.Point(84, 43);
            this.txt_tbl023.Name = "txt_tbl023";
            this.txt_tbl023.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl023.Size = new System.Drawing.Size(228, 24);
            this.txt_tbl023.TabIndex = 462;
            // 
            // txt_tbl005
@@ -642,16 +740,16 @@
            "来料不良退料",
            "作业不良退料"});
            this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_tbl005.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl005.Size = new System.Drawing.Size(228, 24);
            this.txt_tbl005.StyleController = this.layoutMx1;
            this.txt_tbl005.TabIndex = 459;
            // 
            // txt_tbl006
            // 
            this.txt_tbl006.Location = new System.Drawing.Point(355, 105);
            this.txt_tbl006.Location = new System.Drawing.Point(388, 105);
            this.txt_tbl006.Name = "txt_tbl006";
            this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl006.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl006.Size = new System.Drawing.Size(228, 24);
            this.txt_tbl006.StyleController = this.layoutMx1;
            this.txt_tbl006.TabIndex = 226;
            // 
@@ -661,25 +759,25 @@
            this.txt_tbl002.IsReadly = false;
            this.txt_tbl002.Location = new System.Drawing.Point(84, 74);
            this.txt_tbl002.Name = "txt_tbl002";
            this.txt_tbl002.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl002.Size = new System.Drawing.Size(228, 24);
            this.txt_tbl002.TabIndex = 458;
            // 
            // txt_workName
            // 
            this.txt_workName.Location = new System.Drawing.Point(355, 43);
            this.txt_workName.Location = new System.Drawing.Point(388, 43);
            this.txt_workName.Name = "txt_workName";
            this.txt_workName.Properties.Appearance.Options.UseFont = true;
            this.txt_workName.Size = new System.Drawing.Size(195, 24);
            this.txt_workName.Size = new System.Drawing.Size(228, 24);
            this.txt_workName.StyleController = this.layoutMx1;
            this.txt_workName.TabIndex = 298;
            this.txt_workName.Tag = "readonly";
            // 
            // txt_tbl012
            // 
            this.txt_tbl012.Location = new System.Drawing.Point(897, 43);
            this.txt_tbl012.Location = new System.Drawing.Point(996, 43);
            this.txt_tbl012.Name = "txt_tbl012";
            this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl012.Size = new System.Drawing.Size(196, 24);
            this.txt_tbl012.Size = new System.Drawing.Size(229, 24);
            this.txt_tbl012.StyleController = this.layoutMx1;
            this.txt_tbl012.TabIndex = 247;
            this.txt_tbl012.Tag = "readonly";
@@ -689,66 +787,66 @@
            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
            this.txt_billNo.Name = "txt_billNo";
            this.txt_billNo.Properties.Appearance.Options.UseFont = true;
            this.txt_billNo.Size = new System.Drawing.Size(195, 24);
            this.txt_billNo.Size = new System.Drawing.Size(228, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 211;
            this.txt_billNo.Tag = "readonly";
            // 
            // txt_rwd
            // 
            this.txt_rwd.Location = new System.Drawing.Point(355, 12);
            this.txt_rwd.Location = new System.Drawing.Point(388, 12);
            this.txt_rwd.Name = "txt_rwd";
            this.txt_rwd.Properties.Appearance.Options.UseFont = true;
            this.txt_rwd.Size = new System.Drawing.Size(195, 24);
            this.txt_rwd.Size = new System.Drawing.Size(228, 24);
            this.txt_rwd.StyleController = this.layoutMx1;
            this.txt_rwd.TabIndex = 217;
            this.txt_rwd.Tag = "readonly";
            // 
            // txt_tbl011
            // 
            this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
            this.txt_tbl011.Location = new System.Drawing.Point(996, 12);
            this.txt_tbl011.Name = "txt_tbl011";
            this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
            this.txt_tbl011.Size = new System.Drawing.Size(196, 24);
            this.txt_tbl011.Size = new System.Drawing.Size(229, 24);
            this.txt_tbl011.StyleController = this.layoutMx1;
            this.txt_tbl011.TabIndex = 243;
            this.txt_tbl011.Tag = "readonly";
            // 
            // txt_itemName
            // 
            this.txt_itemName.Location = new System.Drawing.Point(355, 74);
            this.txt_itemName.Location = new System.Drawing.Point(388, 74);
            this.txt_itemName.Name = "txt_itemName";
            this.txt_itemName.Properties.Appearance.Options.UseFont = true;
            this.txt_itemName.Size = new System.Drawing.Size(195, 24);
            this.txt_itemName.Size = new System.Drawing.Size(228, 24);
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 219;
            this.txt_itemName.Tag = "readonly";
            // 
            // txt_tbl013
            // 
            this.txt_tbl013.Location = new System.Drawing.Point(825, 74);
            this.txt_tbl013.Location = new System.Drawing.Point(924, 74);
            this.txt_tbl013.Name = "txt_tbl013";
            this.txt_tbl013.Properties.Caption = "审核状态";
            this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
            this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
            this.txt_tbl013.Size = new System.Drawing.Size(301, 24);
            this.txt_tbl013.StyleController = this.layoutMx1;
            this.txt_tbl013.TabIndex = 463;
            this.txt_tbl013.Tag = "readonly";
            // 
            // txt_tbl009
            // 
            this.txt_tbl009.Location = new System.Drawing.Point(626, 12);
            this.txt_tbl009.Location = new System.Drawing.Point(692, 12);
            this.txt_tbl009.Name = "txt_tbl009";
            this.txt_tbl009.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl009.Size = new System.Drawing.Size(228, 24);
            this.txt_tbl009.StyleController = this.layoutMx1;
            this.txt_tbl009.TabIndex = 464;
            this.txt_tbl009.Tag = "readonly";
            // 
            // txt_tbl010
            // 
            this.txt_tbl010.Location = new System.Drawing.Point(626, 43);
            this.txt_tbl010.Location = new System.Drawing.Point(692, 43);
            this.txt_tbl010.Name = "txt_tbl010";
            this.txt_tbl010.Size = new System.Drawing.Size(195, 24);
            this.txt_tbl010.Size = new System.Drawing.Size(228, 24);
            this.txt_tbl010.StyleController = this.layoutMx1;
            this.txt_tbl010.TabIndex = 465;
            this.txt_tbl010.Tag = "readonly";
@@ -765,9 +863,9 @@
            // 
            // txt_itemNo
            // 
            this.txt_itemNo.Location = new System.Drawing.Point(626, 74);
            this.txt_itemNo.Location = new System.Drawing.Point(692, 74);
            this.txt_itemNo.Name = "txt_itemNo";
            this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
            this.txt_itemNo.Size = new System.Drawing.Size(228, 24);
            this.txt_itemNo.StyleController = this.layoutMx1;
            this.txt_itemNo.TabIndex = 467;
            this.txt_itemNo.Tag = "readonly";
@@ -783,12 +881,30 @@
            // 
            // txt_daa014
            // 
            this.txt_daa014.Location = new System.Drawing.Point(626, 105);
            this.txt_daa014.Location = new System.Drawing.Point(692, 105);
            this.txt_daa014.Name = "txt_daa014";
            this.txt_daa014.Size = new System.Drawing.Size(195, 24);
            this.txt_daa014.Size = new System.Drawing.Size(228, 24);
            this.txt_daa014.StyleController = this.layoutMx1;
            this.txt_daa014.TabIndex = 469;
            this.txt_daa014.Tag = "readonly";
            //
            // txt_tbl026
            //
            this.txt_tbl026.Location = new System.Drawing.Point(996, 105);
            this.txt_tbl026.Name = "txt_tbl026";
            this.txt_tbl026.Size = new System.Drawing.Size(229, 24);
            this.txt_tbl026.StyleController = this.layoutMx1;
            this.txt_tbl026.TabIndex = 470;
            this.txt_tbl026.Tag = "readonly";
            //
            // txt_tbl025
            //
            this.txt_tbl025.Location = new System.Drawing.Point(996, 136);
            this.txt_tbl025.Name = "txt_tbl025";
            this.txt_tbl025.Size = new System.Drawing.Size(229, 24);
            this.txt_tbl025.StyleController = this.layoutMx1;
            this.txt_tbl025.TabIndex = 471;
            this.txt_tbl025.Tag = "readonly";
            // 
            // layoutControlItem7
            // 
@@ -813,6 +929,18 @@
            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem17.TextVisible = false;
            // 
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_tbl020;
            this.layoutControlItem14.Location = new System.Drawing.Point(813, 93);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem14.Text = "完结";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
            //
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -829,12 +957,13 @@
            this.layoutControlItem3,
            this.layoutControlItem15,
            this.layoutControlItem18,
            this.layoutControlItem14,
            this.layoutControlItem1,
            this.layoutControlItem8,
            this.layoutControlItem6,
            this.layoutControlItem2,
            this.lab_daa014});
            this.lab_daa014,
            this.layoutControlItem19,
            this.layoutControlItem20});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -866,38 +995,38 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1105, 175);
            this.Root.Size = new System.Drawing.Size(1237, 175);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_tbl011;
            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
            this.layoutControlItem9.Location = new System.Drawing.Point(912, 0);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem9.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem9.Text = "审核人员";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_tbl012;
            this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
            this.layoutControlItem10.Location = new System.Drawing.Point(912, 31);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem10.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem10.Text = "审核时间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_tbl013;
            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
            this.layoutControlItem11.Location = new System.Drawing.Point(912, 62);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem11.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem11.Text = "审核状态";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
@@ -905,21 +1034,21 @@
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_tbl009;
            this.layoutControlItem12.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem12.Location = new System.Drawing.Point(608, 0);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem12.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem12.Text = "申请人员";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_tbl010;
            this.layoutControlItem13.Location = new System.Drawing.Point(542, 31);
            this.layoutControlItem13.Location = new System.Drawing.Point(608, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem13.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem13.Text = "申请时间";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -931,7 +1060,7 @@
            this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem16.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem16.Text = "选取物料";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -943,7 +1072,7 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem5.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem5.Text = "退料类型";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -953,7 +1082,7 @@
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem4.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem4.Text = "生产工单";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -963,95 +1092,105 @@
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem3.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem3.Text = "生产组织";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_tbl006;
            this.layoutControlItem15.Location = new System.Drawing.Point(271, 93);
            this.layoutControlItem15.Location = new System.Drawing.Point(304, 93);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem15.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem15.Text = "备注说明";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem18
            // 
            this.layoutControlItem18.Control = this.txt_itemNo;
            this.layoutControlItem18.Location = new System.Drawing.Point(542, 62);
            this.layoutControlItem18.Location = new System.Drawing.Point(608, 62);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem18.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem18.Text = "产品编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_tbl020;
            this.layoutControlItem14.Location = new System.Drawing.Point(813, 93);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(272, 31);
            this.layoutControlItem14.Text = "完结";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
            // 
            // layoutControlItem1
            // 
            this.layoutControlItem1.Control = this.txt_billNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem1.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem1.Text = "申请单号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_itemName;
            this.layoutControlItem8.Location = new System.Drawing.Point(271, 62);
            this.layoutControlItem8.Location = new System.Drawing.Point(304, 62);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem8.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem8.Text = "产品名称";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_workName;
            this.layoutControlItem6.Location = new System.Drawing.Point(271, 31);
            this.layoutControlItem6.Location = new System.Drawing.Point(304, 31);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem6.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem6.Text = "生产车间";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_rwd;
            this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(304, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
            this.layoutControlItem2.Size = new System.Drawing.Size(304, 31);
            this.layoutControlItem2.Text = "任务单号";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
            // lab_daa014
            // 
            this.lab_daa014.Control = this.txt_daa014;
            this.lab_daa014.Location = new System.Drawing.Point(542, 93);
            this.lab_daa014.Location = new System.Drawing.Point(608, 93);
            this.lab_daa014.Name = "lab_daa014";
            this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 2;
            this.lab_daa014.OptionsTableLayoutItem.RowIndex = 3;
            this.lab_daa014.Size = new System.Drawing.Size(271, 31);
            this.lab_daa014.Size = new System.Drawing.Size(304, 31);
            this.lab_daa014.Text = "投料单号";
            this.lab_daa014.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem19
            //
            this.layoutControlItem19.Control = this.txt_tbl026;
            this.layoutControlItem19.Location = new System.Drawing.Point(912, 93);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem19.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem19.Text = "批准人员";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem20
            //
            this.layoutControlItem20.Control = this.txt_tbl025;
            this.layoutControlItem20.Location = new System.Drawing.Point(912, 124);
            this.layoutControlItem20.Name = "layoutControlItem20";
            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem20.Size = new System.Drawing.Size(305, 31);
            this.layoutControlItem20.Text = "批准时间";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -1059,7 +1198,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 410);
            this.tabMx.Size = new System.Drawing.Size(1258, 410);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
@@ -1067,10 +1206,415 @@
            // 
            // tabMxPage1
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Controls.Add(this.split99);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 378);
            this.tabMxPage1.Size = new System.Drawing.Size(1256, 378);
            this.tabMxPage1.Text = "退料明细";
            //
            // split99
            //
            this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
            this.split99.Horizontal = false;
            this.split99.Location = new System.Drawing.Point(0, 0);
            this.split99.Name = "split99";
            //
            // split99.Panel1
            //
            this.split99.Panel1.Controls.Add(this.lay99);
            this.split99.Panel1.Text = "Panel1";
            //
            // split99.Panel2
            //
            this.split99.Panel2.Controls.Add(this.gcMx1);
            this.split99.Panel2.Text = "Panel2";
            this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.split99.Size = new System.Drawing.Size(1256, 378);
            this.split99.SplitterPosition = 138;
            this.split99.TabIndex = 1;
            //
            // lay99
            //
            this.lay99.Controls.Add(this.lbMxGuid);
            this.lay99.Controls.Add(this.ucBtnPrint1);
            this.lay99.Controls.Add(this.radOut);
            this.lay99.Controls.Add(this.dataLayoutControl1);
            this.lay99.Controls.Add(this.txtWlid);
            this.lay99.Controls.Add(this.txtQuantity);
            this.lay99.Controls.Add(this.txt_kQty);
            this.lay99.Controls.Add(this.txtWlmc);
            this.lay99.Controls.Add(this.txt_yQty);
            this.lay99.Controls.Add(this.txt_psnQty_1);
            this.lay99.Controls.Add(this.txtWlgg);
            this.lay99.Dock = System.Windows.Forms.DockStyle.Fill;
            this.lay99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem33});
            this.lay99.Location = new System.Drawing.Point(0, 0);
            this.lay99.Name = "lay99";
            this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(306, 272, 812, 500);
            this.lay99.Root = this.layoutControlGroup1;
            this.lay99.Size = new System.Drawing.Size(1256, 138);
            this.lay99.TabIndex = 0;
            this.lay99.Text = "layoutControl1";
            //
            // lbMxGuid
            //
            this.lbMxGuid.Location = new System.Drawing.Point(1032, 84);
            this.lbMxGuid.Name = "lbMxGuid";
            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
            this.lbMxGuid.StyleController = this.lay99;
            this.lbMxGuid.TabIndex = 479;
            this.lbMxGuid.Text = "lbMxGuid";
            //
            // ucBtnPrint1
            //
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
            this.ucBtnPrint1.TabIndex = 478;
            //
            // radOut
            //
            this.radOut.Location = new System.Drawing.Point(1032, 12);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
            this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "全打"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.radOut.Size = new System.Drawing.Size(336, 32);
            this.radOut.StyleController = this.lay99;
            this.radOut.TabIndex = 477;
            //
            // dataLayoutControl1
            //
            this.dataLayoutControl1.Controls.Add(this.txt_iCount_1);
            this.dataLayoutControl1.Controls.Add(this.txt_yuliang_1);
            this.dataLayoutControl1.Location = new System.Drawing.Point(692, 84);
            this.dataLayoutControl1.Name = "dataLayoutControl1";
            this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 186, 812, 500);
            this.dataLayoutControl1.Root = this.layoutControlGroup2;
            this.dataLayoutControl1.Size = new System.Drawing.Size(336, 32);
            this.dataLayoutControl1.TabIndex = 227;
            this.dataLayoutControl1.Text = "dataLayoutControl1";
            //
            // txt_iCount_1
            //
            this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
            this.txt_iCount_1.StyleController = this.dataLayoutControl1;
            this.txt_iCount_1.TabIndex = 228;
            //
            // txt_yuliang_1
            //
            this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
            this.txt_yuliang_1.Name = "txt_yuliang_1";
            this.txt_yuliang_1.Properties.ReadOnly = true;
            this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
            this.txt_yuliang_1.StyleController = this.dataLayoutControl1;
            this.txt_yuliang_1.TabIndex = 229;
            //
            // layoutControlGroup2
            //
            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            this.layoutControlGroup2.GroupBordersVisible = false;
            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem30,
            this.layoutControlItem29});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6});
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition6});
            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
            this.layoutControlGroup2.TextVisible = false;
            //
            // layoutControlItem30
            //
            this.layoutControlItem30.Control = this.txt_yuliang_1;
            this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem30.CustomizationFormText = "打印余数";
            this.layoutControlItem30.Location = new System.Drawing.Point(168, 0);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem30.Size = new System.Drawing.Size(168, 32);
            this.layoutControlItem30.Text = "打印余数";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem29
            //
            this.layoutControlItem29.Control = this.txt_iCount_1;
            this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem29.CustomizationFormText = "打印整张数值";
            this.layoutControlItem29.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.Size = new System.Drawing.Size(168, 32);
            this.layoutControlItem29.Text = "打印整张数值";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
            //
            // txtWlid
            //
            this.txtWlid.Location = new System.Drawing.Point(114, 12);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
            this.txtWlid.Size = new System.Drawing.Size(234, 24);
            this.txtWlid.StyleController = this.lay99;
            this.txtWlid.TabIndex = 214;
            //
            // txtQuantity
            //
            this.txtQuantity.Location = new System.Drawing.Point(454, 12);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
            this.txtQuantity.Size = new System.Drawing.Size(234, 24);
            this.txtQuantity.StyleController = this.lay99;
            this.txtQuantity.TabIndex = 220;
            //
            // txt_kQty
            //
            this.txt_kQty.Location = new System.Drawing.Point(794, 12);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
            this.txt_kQty.Properties.ReadOnly = true;
            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
            this.txt_kQty.StyleController = this.lay99;
            this.txt_kQty.TabIndex = 224;
            //
            // txtWlmc
            //
            this.txtWlmc.Location = new System.Drawing.Point(114, 48);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
            this.txtWlmc.Size = new System.Drawing.Size(234, 24);
            this.txtWlmc.StyleController = this.lay99;
            this.txtWlmc.TabIndex = 216;
            //
            // txt_yQty
            //
            this.txt_yQty.Location = new System.Drawing.Point(454, 48);
            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(234, 24);
            this.txt_yQty.StyleController = this.lay99;
            this.txt_yQty.TabIndex = 222;
            //
            // txt_psnQty_1
            //
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
            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(234, 24);
            this.txt_psnQty_1.StyleController = this.lay99;
            this.txt_psnQty_1.TabIndex = 226;
            //
            // txtWlgg
            //
            this.txtWlgg.Location = new System.Drawing.Point(114, 84);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
            this.txtWlgg.Size = new System.Drawing.Size(574, 24);
            this.txtWlgg.StyleController = this.lay99;
            this.txtWlgg.TabIndex = 218;
            //
            // 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.layoutControlItem27,
            this.layoutControlItem24,
            this.layoutControlItem25,
            this.layoutControlItem26,
            this.layoutControlItem28,
            this.layoutControlItem31,
            this.layoutControlItem21,
            this.layoutControlItem32});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition7,
            columnDefinition8,
            columnDefinition9,
            columnDefinition10});
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition7,
            rowDefinition8,
            rowDefinition9});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
            this.layoutControlGroup1.TextVisible = false;
            //
            // layoutControlItem22
            //
            this.layoutControlItem22.Control = this.txtQuantity;
            this.layoutControlItem22.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem22.CustomizationFormText = "本次申请总量";
            this.layoutControlItem22.Location = new System.Drawing.Point(340, 0);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem22.Text = "本次申请总量";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem23
            //
            this.layoutControlItem23.Control = this.txt_kQty;
            this.layoutControlItem23.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem23.CustomizationFormText = "可打印总数";
            this.layoutControlItem23.Location = new System.Drawing.Point(680, 0);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem23.Text = "可打印总数";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txtWlgg;
            this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem27.CustomizationFormText = "物料规格";
            this.layoutControlItem27.Location = new System.Drawing.Point(0, 72);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnSpan = 2;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem27.Size = new System.Drawing.Size(680, 36);
            this.layoutControlItem27.Text = "物料规格";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.Control = this.txtWlmc;
            this.layoutControlItem24.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem24.CustomizationFormText = "物料名称";
            this.layoutControlItem24.Location = new System.Drawing.Point(0, 36);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem24.Text = "物料名称";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_yQty;
            this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem25.CustomizationFormText = "已打印总量";
            this.layoutControlItem25.Location = new System.Drawing.Point(340, 36);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem25.Text = "已打印总量";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_psnQty_1;
            this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem26.CustomizationFormText = "每张条码数量";
            this.layoutControlItem26.Location = new System.Drawing.Point(680, 36);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem26.Text = "每张条码数量";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem28
            //
            this.layoutControlItem28.Control = this.dataLayoutControl1;
            this.layoutControlItem28.Location = new System.Drawing.Point(680, 72);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem28.Text = "打印张数";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem28.TextVisible = false;
            //
            // layoutControlItem31
            //
            this.layoutControlItem31.Control = this.radOut;
            this.layoutControlItem31.Location = new System.Drawing.Point(1020, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem31.Text = "自动计算";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem31.TextVisible = false;
            //
            // layoutControlItem21
            //
            this.layoutControlItem21.Control = this.txtWlid;
            this.layoutControlItem21.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem21.CustomizationFormText = "物料编码";
            this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem21.Text = "物料编码";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
            //
            // layoutControlItem32
            //
            this.layoutControlItem32.Control = this.ucBtnPrint1;
            this.layoutControlItem32.Location = new System.Drawing.Point(1020, 36);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem32.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem32.Text = "打印按钮";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem32.TextVisible = false;
            //
            // layoutControlItem33
            //
            this.layoutControlItem33.Control = this.lbMxGuid;
            this.layoutControlItem33.Location = new System.Drawing.Point(1020, 72);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem33.Size = new System.Drawing.Size(340, 36);
            this.layoutControlItem33.Text = "lbMxGuid";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem33.TextVisible = false;
            // 
            // gcMx1
            // 
@@ -1082,7 +1626,7 @@
            this.repositoryItemButtonEdit1,
            this.rptBl,
            this.repositoryItemMemoEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 378);
            this.gcMx1.Size = new System.Drawing.Size(1256, 228);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1340,7 +1884,7 @@
            // 
            this.xtraTabPage3.Controls.Add(this.gcMx2);
            this.xtraTabPage3.Name = "xtraTabPage3";
            this.xtraTabPage3.Size = new System.Drawing.Size(1124, 378);
            this.xtraTabPage3.Size = new System.Drawing.Size(1256, 378);
            this.xtraTabPage3.Text = "已打条码明细";
            // 
            // gcMx2
@@ -1349,7 +1893,7 @@
            this.gcMx2.Location = new System.Drawing.Point(0, 0);
            this.gcMx2.MainView = this.gvMx2;
            this.gcMx2.Name = "gcMx2";
            this.gcMx2.Size = new System.Drawing.Size(1124, 378);
            this.gcMx2.Size = new System.Drawing.Size(1256, 378);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
@@ -1530,7 +2074,7 @@
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1128, 704);
            this.ClientSize = new System.Drawing.Size(1260, 704);
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
@@ -1570,8 +2114,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa014.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl026.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_tbl025.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
@@ -1584,15 +2131,51 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.lab_daa014)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
            this.split99.Panel1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
            this.split99.Panel2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
            this.split99.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.lay99)).EndInit();
            this.lay99.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.dataLayoutControl1)).EndInit();
            this.dataLayoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
@@ -1714,5 +2297,40 @@
        private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
        private DevExpress.XtraLayout.LayoutControlItem lab_daa014;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraEditors.TextEdit txt_tbl026;
        private DevExpress.XtraEditors.TextEdit txt_tbl025;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraEditors.SplitContainerControl split99;
        private DevExpress.XtraLayout.LayoutControl lay99;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
        private DevExpress.XtraEditors.TextEdit txtWlid;
        private DevExpress.XtraEditors.TextEdit txtQuantity;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
        private DevExpress.XtraEditors.TextEdit txt_kQty;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
        private DevExpress.XtraEditors.TextEdit txtWlmc;
        private DevExpress.XtraEditors.TextEdit txt_yQty;
        private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
        private DevExpress.XtraEditors.TextEdit txtWlgg;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraDataLayout.DataLayoutControl dataLayoutControl1;
        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraEditors.TextEdit txt_iCount_1;
        private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private UserControl.UcBtnPrint ucBtnPrint1;
        private DevExpress.XtraEditors.RadioGroup radOut;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private DevExpress.XtraEditors.LabelControl lbMxGuid;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -1,4 +1,5 @@
using Gs.DevApp.DevFrm.Rk;
using Gs.DevApp.DevFrm.Rpt;
using Gs.DevApp.DevFrm.Work;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
@@ -56,7 +57,7 @@
                if (string.IsNullOrEmpty(orgdId)) return;
                txt_tbl002.getSuppler(orgdId, _ucGg);
            };
            //设置工单子
            //设置工单
            txt_tbl002.EditChanged += (s, e) =>
            {
                string daaId = txt_tbl002.GetId();
@@ -102,13 +103,96 @@
                    }
                    catch (Exception ex)
                    {
                        MessageBox.Show(ex.Message);
                        MsgHelper.ShowError(ex.Message);
                    }
                };
                frm.ShowDialog();
            };
            //打印事件
            this.ucBtnPrint1.btnPrintClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
                ucBtnPrint1.guidKey = rowGuid;
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请输入正确的条码数量!");
                    txt_iCount_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_psnQty_1.Text.Trim()))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印条码数量!");
                    txt_psnQty_1.Focus();
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                if (lbMxGuid.Text.Trim().Length < 10)
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择打印的行!");
                    this.ucBtnPrint1.rptParameter = "return false";
                    return;
                }
                this.ucBtnPrint1.rptParameter = "rpt_SCTL{"
                       + lbMxGuid.Text.Trim()//关联主键
                       + "," + ""
                       + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//余数
                       + "," + txt_iCount_1.Text.Trim()//张数
                       + "," + txt_psnQty_1.Text.Trim()//每张条码数量
                       + "}";
                txt_iCount_1.Text = "";
                txt_psnQty_1.Text = "";
            };
            //打印批量操作事件
            this.ucBtnPrint1.btnAllClick += (s, e) =>
            {
                string rowGuid = lbMxGuid.Text.Trim();
                SelectDeleteBar frm = new SelectDeleteBar(rowGuid, "采购入库");
                string strCodeList = "";
                string strAction = "";
                frm.UpdateParent += (ss, ee) =>
                {
                    strCodeList = ee.StringSingle;
                    strAction = ee.Data;
                };
                frm.ShowDialog();
                if (string.IsNullOrEmpty(strCodeList))
                    return;
                if (strAction == "print")
                {
                    try
                    {
                        string rptParameter = "rpt_SCTL{"
                        + "100"//重打都是传100,
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + ""
                        + "," + strCodeList
                        + "}";
                        using (Form rpt = new RptPreview(rowGuid, rptParameter))
                        {
                            rpt.ShowDialog();
                        }
                        frm.Close();
                    }
                    catch (Exception ex)
                    {
                        MsgHelper.ShowError(ex.Message);
                    }
                }
            };
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            //打印自动计算
            txt_psnQty_1.TextChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
            };
            radOut.SelectedIndexChanged += (s, e) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
            };
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
@@ -162,7 +246,7 @@
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// 批准
        /// </summary>
@@ -224,7 +308,7 @@
                lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定删除吗?"))
@@ -242,18 +326,19 @@
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                    if (xtraTabControl1.SelectedTabPageIndex == 0)
                    { }
                    else
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
                    getPageList(this.pageBar1.CurrentPage);
                }
                MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                else
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -305,7 +390,10 @@
                gvList.Add(gvMx2);
                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
            }
            //2025/07/12加上修改状态下不能修改
            txt_tbl023.IsReadly = true;
            txt_tbl002.IsReadly = true;
            txt_tbl005.ReadOnly = true;
        }
        /// <summary>
        /// 新增事件
@@ -337,19 +425,19 @@
            string orgId = txt_tbl023.GetId();
            if (string.IsNullOrEmpty(orgId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择组织!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择组织!");
                txt_tbl023.Focus();
                return;
            }
            if (string.IsNullOrEmpty(workId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择工单!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择工单!");
                txt_tbl002.Focus();
                return;
            }
            if (string.IsNullOrEmpty(txt_tbl005.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("请选择原因!");
                Gs.DevApp.ToolBox.MsgHelper.ShowError("请选择原因!");
                txt_tbl005.Focus();
                return;
            }
@@ -394,15 +482,15 @@
                        AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
                        Sl = _sl, //申请数量
                        Remark = _tld014,
                        Bllb = row["tld015"].ToString().Replace("|",",")
                });
                        Bllb = row["tld015"].ToString().Replace("|", ",")
                    });
                }
            }
            try
            {
                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
                if (_rtn.rtnCode > 0)
                {
                    ToolBox.MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
@@ -475,7 +563,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                ToolBox.MsgHelper.Warning("请先选择你要操作的行!");
                ToolBox.MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -496,6 +584,17 @@
                    gvList.Add(gvMx2);
                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
                    _ucGg = "";
                    if (txt_tbl005.Text == "良品退料")
                    {
                        split99.Panel1.Enabled = false;
                        split99.Panel1.Visible = false;
                    }
                    else
                    {
                        split99.Panel1.Enabled = true;
                        split99.Panel1.Enabled = true;
                    }
                    JObject _job = JObject.Parse(strJson);
                    JArray array = new JArray();
                    foreach (var a in _job["rtnData"]["list"])
@@ -533,13 +632,14 @@
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -577,13 +677,15 @@
                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                    if (_rtn.rtnCode > 0)
                    {
                        if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        getModel(lbGuid.Text);
                    }
                    MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    else
                    MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                }
                catch (Exception ex)
                {
                    MsgHelper.Warning("提示:" + ex.Message);
                    MsgHelper.ShowError("提示:" + ex.Message);
                }
            }
        }
@@ -609,13 +711,14 @@
                case 3:
                    strMsg = "反批准";
                    break;
            };
            }
            ;
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -623,7 +726,8 @@
            //如果是审核,询问要不要生成补料beg
            string txt_chkOut = "0";
            if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "作业不良退料") {
            if (_inFieldValue == 1 && txt_tbl005.Text.Trim() == "作业不良退料")
            {
                var frm = new Frm_MesItemTblShow();
                frm.UpdateParent += (ss, ee) =>
                {
@@ -701,5 +805,35 @@
            };
            frm.ShowDialog();
        }
        private void GvMx1_FocusedRowChanged(object sender, DevExpress.XtraGrid.Views.Base.FocusedRowChangedEventArgs e)
        {
            if (e.FocusedRowHandle >= 0)
            {
                DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
                lbMxGuid.Text = row["tlid"].ToString();
                toolBarMenu1.guidKey = row["tlid"].ToString();
                txtWlid.Text = row["tld002"].ToString();
                txtWlgg.Text = row["tld004"].ToString();
                txtWlmc.Text = row["tld003"].ToString();
                txtQuantity.Text = row["tld005"].ToString();//申请总量
                txt_yQty.Text = row["ydy"].ToString();//已打印总量
                txt_kQty.Text = row["kdy"].ToString();//可打印总量
                txt_psnQty_1.Text = row["mrtmsl"].ToString(); //默认每张条码数量
            }
            else
            {
                lbMxGuid.Text = "";
                ucBtnPrint1.guidKey = "";
                txtWlid.Text = "";
                txtWlgg.Text = "";
                txtWlmc.Text = "";
                txtQuantity.Text = "";
                txt_yQty.Text = "";
                txt_kQty.Text = "";
                txt_psnQty_1.Text = "";
                txt_iCount_1.Text = "";
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl_RK.cs
@@ -142,7 +142,6 @@
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1.DataSource = null;var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "create_date", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
@@ -175,7 +174,7 @@
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -186,7 +185,7 @@
            if (toolBarMenu1.currentAction == "edit") isEdit = true;
            if (string.IsNullOrEmpty(strGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            var _obj = new
@@ -242,11 +241,11 @@
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -271,7 +270,7 @@
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -288,9 +287,10 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -299,10 +299,12 @@
                    gridView1.FocusedRowHandle = rowHandle;
                    UtilityHelper.SetCheckIco(gridView1, "checkStatus", "checkUser", "checkUser", picCheckBox, this, _inFieldValue.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.Designer.cs
@@ -35,8 +35,12 @@
            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();
            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
            this.lb_cgthsqcgy = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtckdcgy = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtckdllr = new DevExpress.XtraEditors.LabelControl();
            this.lb_qtkg = new DevExpress.XtraEditors.LabelControl();
@@ -48,24 +52,32 @@
            this.txt_qtkg = new DevExpress.XtraEditors.CheckEdit();
            this.txt_qtckdllr = new DevExpress.XtraEditors.TextEdit();
            this.txt_qtckdcgy = new DevExpress.XtraEditors.TextEdit();
            this.txt_cgthsqcgy = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_sctlbfb = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.lb_sctlbfb = new DevExpress.XtraEditors.LabelControl();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
            this.splitContainerControl1.Panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
            this.splitContainerControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
            this.groupControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
            this.layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtrkdysy.Properties)).BeginInit();
@@ -73,20 +85,24 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtkg.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdllr.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdcgy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cgthsqcgy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
            this.groupControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            this.SuspendLayout();
            // 
            // splitContainerControl1
@@ -106,11 +122,22 @@
            this.splitContainerControl1.Panel2.Text = "Panel2";
            this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitContainerControl1.Size = new System.Drawing.Size(757, 533);
            this.splitContainerControl1.SplitterPosition = 359;
            this.splitContainerControl1.SplitterPosition = 398;
            this.splitContainerControl1.TabIndex = 0;
            //
            // groupControl1
            //
            this.groupControl1.Controls.Add(this.layoutControl1);
            this.groupControl1.Location = new System.Drawing.Point(22, 31);
            this.groupControl1.Name = "groupControl1";
            this.groupControl1.Size = new System.Drawing.Size(553, 349);
            this.groupControl1.TabIndex = 0;
            this.groupControl1.Text = "基础配置";
            // 
            // layoutControl1
            // 
            this.layoutControl1.Controls.Add(this.lb_sctlbfb);
            this.layoutControl1.Controls.Add(this.lb_cgthsqcgy);
            this.layoutControl1.Controls.Add(this.lb_qtckdcgy);
            this.layoutControl1.Controls.Add(this.lb_qtckdllr);
            this.layoutControl1.Controls.Add(this.lb_qtkg);
@@ -122,20 +149,33 @@
            this.layoutControl1.Controls.Add(this.txt_qtkg);
            this.layoutControl1.Controls.Add(this.txt_qtckdllr);
            this.layoutControl1.Controls.Add(this.txt_qtckdcgy);
            this.layoutControl1.Controls.Add(this.txt_cgthsqcgy);
            this.layoutControl1.Controls.Add(this.txt_sctlbfb);
            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutControl1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem9,
            this.layoutControlItem10,
            this.layoutControlItem11});
            this.layoutControlItem11,
            this.layoutControlItem13,
            this.layoutControlItem15,
            this.layoutControlItem10});
            this.layoutControl1.Location = new System.Drawing.Point(2, 28);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(633, 377, 812, 500);
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(517, 545, 812, 500);
            this.layoutControl1.Root = this.Root;
            this.layoutControl1.Size = new System.Drawing.Size(549, 252);
            this.layoutControl1.Size = new System.Drawing.Size(549, 319);
            this.layoutControl1.TabIndex = 0;
            this.layoutControl1.Text = "layoutControl1";
            //
            // lb_cgthsqcgy
            //
            this.lb_cgthsqcgy.Location = new System.Drawing.Point(433, 177);
            this.lb_cgthsqcgy.Name = "lb_cgthsqcgy";
            this.lb_cgthsqcgy.Size = new System.Drawing.Size(104, 18);
            this.lb_cgthsqcgy.StyleController = this.layoutControl1;
            this.lb_cgthsqcgy.TabIndex = 17;
            this.lb_cgthsqcgy.Text = "FPURCHASERID";
            // 
            // lb_qtckdcgy
            // 
@@ -148,7 +188,7 @@
            // 
            // lb_qtckdllr
            // 
            this.lb_qtckdllr.Location = new System.Drawing.Point(380, 126);
            this.lb_qtckdllr.Location = new System.Drawing.Point(464, 197);
            this.lb_qtckdllr.Name = "lb_qtckdllr";
            this.lb_qtckdllr.Size = new System.Drawing.Size(73, 18);
            this.lb_qtckdllr.StyleController = this.layoutControl1;
@@ -184,24 +224,24 @@
            // 
            // txt_qtrkdysy
            // 
            this.txt_qtrkdysy.Location = new System.Drawing.Point(144, 12);
            this.txt_qtrkdysy.Location = new System.Drawing.Point(174, 12);
            this.txt_qtrkdysy.Name = "txt_qtrkdysy";
            this.txt_qtrkdysy.Size = new System.Drawing.Size(393, 24);
            this.txt_qtrkdysy.Size = new System.Drawing.Size(363, 24);
            this.txt_qtrkdysy.StyleController = this.layoutControl1;
            this.txt_qtrkdysy.TabIndex = 4;
            // 
            // txt_qtrkdcgy
            // 
            this.txt_qtrkdcgy.Location = new System.Drawing.Point(144, 49);
            this.txt_qtrkdcgy.Location = new System.Drawing.Point(174, 49);
            this.txt_qtrkdcgy.Name = "txt_qtrkdcgy";
            this.txt_qtrkdcgy.Size = new System.Drawing.Size(393, 24);
            this.txt_qtrkdcgy.Size = new System.Drawing.Size(363, 24);
            this.txt_qtrkdcgy.StyleController = this.layoutControl1;
            this.txt_qtrkdcgy.TabIndex = 5;
            // 
            // btnSave
            // 
            this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
            this.btnSave.Location = new System.Drawing.Point(12, 205);
            this.btnSave.Location = new System.Drawing.Point(12, 271);
            this.btnSave.Name = "btnSave";
            this.btnSave.Size = new System.Drawing.Size(96, 27);
            this.btnSave.StyleController = this.layoutControl1;
@@ -210,7 +250,7 @@
            // 
            // txt_qtkg
            // 
            this.txt_qtkg.Location = new System.Drawing.Point(12, 88);
            this.txt_qtkg.Location = new System.Drawing.Point(12, 86);
            this.txt_qtkg.Name = "txt_qtkg";
            this.txt_qtkg.Properties.Caption = "齐套开工";
            this.txt_qtkg.Size = new System.Drawing.Size(525, 24);
@@ -219,19 +259,27 @@
            // 
            // txt_qtckdllr
            // 
            this.txt_qtckdllr.Location = new System.Drawing.Point(144, 127);
            this.txt_qtckdllr.Location = new System.Drawing.Point(174, 123);
            this.txt_qtckdllr.Name = "txt_qtckdllr";
            this.txt_qtckdllr.Size = new System.Drawing.Size(393, 24);
            this.txt_qtckdllr.Size = new System.Drawing.Size(363, 24);
            this.txt_qtckdllr.StyleController = this.layoutControl1;
            this.txt_qtckdllr.TabIndex = 9;
            // 
            // txt_qtckdcgy
            // 
            this.txt_qtckdcgy.Location = new System.Drawing.Point(144, 166);
            this.txt_qtckdcgy.Location = new System.Drawing.Point(174, 160);
            this.txt_qtckdcgy.Name = "txt_qtckdcgy";
            this.txt_qtckdcgy.Size = new System.Drawing.Size(393, 24);
            this.txt_qtckdcgy.Size = new System.Drawing.Size(363, 24);
            this.txt_qtckdcgy.StyleController = this.layoutControl1;
            this.txt_qtckdcgy.TabIndex = 10;
            //
            // txt_cgthsqcgy
            //
            this.txt_cgthsqcgy.Location = new System.Drawing.Point(174, 197);
            this.txt_cgthsqcgy.Name = "txt_cgthsqcgy";
            this.txt_cgthsqcgy.Size = new System.Drawing.Size(363, 24);
            this.txt_cgthsqcgy.StyleController = this.layoutControl1;
            this.txt_cgthsqcgy.TabIndex = 16;
            // 
            // layoutControlItem7
            // 
@@ -265,17 +313,6 @@
            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem9.TextVisible = false;
            // 
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.lb_qtckdllr;
            this.layoutControlItem10.Location = new System.Drawing.Point(368, 114);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem10.Size = new System.Drawing.Size(369, 38);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
            //
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.lb_qtckdcgy;
@@ -287,6 +324,17 @@
            this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem11.TextVisible = false;
            // 
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.lb_cgthsqcgy;
            this.layoutControlItem13.Location = new System.Drawing.Point(421, 165);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(108, 33);
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem13.TextVisible = false;
            //
            // Root
            // 
            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -295,9 +343,11 @@
            this.layoutControlItem1,
            this.layoutControlItem2,
            this.layoutControlItem3,
            this.layoutControlItem4,
            this.layoutControlItem5,
            this.layoutControlItem6});
            this.layoutControlItem6,
            this.layoutControlItem12,
            this.layoutControlItem4,
            this.layoutControlItem14});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -316,14 +366,20 @@
            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 = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(549, 252);
            rowDefinition6,
            rowDefinition7,
            rowDefinition8});
            this.Root.Size = new System.Drawing.Size(549, 319);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem1
@@ -333,7 +389,7 @@
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem1.Text = "其它入库单验收员";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(120, 18);
            this.layoutControlItem1.TextSize = new System.Drawing.Size(150, 18);
            // 
            // layoutControlItem2
            // 
@@ -341,63 +397,113 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 37);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem2.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem2.Text = "其它入库单仓管员";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(120, 18);
            this.layoutControlItem2.TextSize = new System.Drawing.Size(150, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_qtkg;
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 76);
            this.layoutControlItem3.Location = new System.Drawing.Point(0, 74);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem3.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem3.Text = "齐套开工";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem3.TextVisible = false;
            // 
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_qtckdllr;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 111);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem5.Text = "其它出库单领料人";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(150, 18);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_qtckdcgy;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 148);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem6.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem6.Text = "其它出库单仓管员";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(150, 18);
            //
            // layoutControlItem12
            //
            this.layoutControlItem12.Control = this.txt_cgthsqcgy;
            this.layoutControlItem12.Location = new System.Drawing.Point(0, 185);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem12.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem12.Text = "采购退货申请采购员";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(150, 18);
            //
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.btnSave;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 193);
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 259);
            this.layoutControlItem4.MaxSize = new System.Drawing.Size(100, 31);
            this.layoutControlItem4.MinSize = new System.Drawing.Size(90, 31);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem4.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem4.Size = new System.Drawing.Size(529, 40);
            this.layoutControlItem4.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem4.Text = "确定保存";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem4.TextVisible = false;
            // 
            // layoutControlItem5
            // txt_sctlbfb
            // 
            this.layoutControlItem5.Control = this.txt_qtckdllr;
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 115);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem5.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem5.Text = "其它出库单领料人";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(120, 18);
            this.txt_sctlbfb.Location = new System.Drawing.Point(174, 234);
            this.txt_sctlbfb.Name = "txt_sctlbfb";
            this.txt_sctlbfb.Size = new System.Drawing.Size(363, 24);
            this.txt_sctlbfb.StyleController = this.layoutControl1;
            this.txt_sctlbfb.TabIndex = 18;
            // 
            // layoutControlItem6
            // layoutControlItem14
            // 
            this.layoutControlItem6.Control = this.txt_qtckdcgy;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 154);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem6.Size = new System.Drawing.Size(529, 39);
            this.layoutControlItem6.Text = "其它出库单仓管员";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(120, 18);
            this.layoutControlItem14.Control = this.txt_sctlbfb;
            this.layoutControlItem14.Location = new System.Drawing.Point(0, 222);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem14.Size = new System.Drawing.Size(529, 37);
            this.layoutControlItem14.Text = "生产退料超%则要审核";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(150, 18);
            // 
            // groupControl1
            // layoutControlItem10
            // 
            this.groupControl1.Controls.Add(this.layoutControl1);
            this.groupControl1.Location = new System.Drawing.Point(22, 31);
            this.groupControl1.Name = "groupControl1";
            this.groupControl1.Size = new System.Drawing.Size(553, 282);
            this.groupControl1.TabIndex = 0;
            this.groupControl1.Text = "基础配置";
            this.layoutControlItem10.Control = this.lb_qtckdllr;
            this.layoutControlItem10.Location = new System.Drawing.Point(452, 185);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem10.Size = new System.Drawing.Size(77, 37);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
            //
            // lb_sctlbfb
            //
            this.lb_sctlbfb.Location = new System.Drawing.Point(464, 234);
            this.lb_sctlbfb.Name = "lb_sctlbfb";
            this.lb_sctlbfb.Size = new System.Drawing.Size(60, 18);
            this.lb_sctlbfb.StyleController = this.layoutControl1;
            this.lb_sctlbfb.TabIndex = 19;
            this.lb_sctlbfb.Text = "SXTLBFB";
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.lb_sctlbfb;
            this.layoutControlItem15.Location = new System.Drawing.Point(452, 222);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem15.Size = new System.Drawing.Size(77, 37);
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
            // 
            // Frm_Config
            // 
@@ -412,6 +518,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
            this.splitContainerControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
            this.groupControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
            this.layoutControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtrkdysy.Properties)).EndInit();
@@ -419,20 +527,24 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtkg.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdllr.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_qtckdcgy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_cgthsqcgy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
            this.groupControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_sctlbfb.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            this.ResumeLayout(false);
        }
@@ -451,7 +563,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraEditors.TextEdit txt_qtckdllr;
        private DevExpress.XtraEditors.TextEdit txt_qtckdcgy;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraEditors.LabelControl lb_qtckdcgy;
@@ -461,9 +572,18 @@
        private DevExpress.XtraEditors.LabelControl lb_qtrkdysy;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraEditors.GroupControl groupControl1;
        private DevExpress.XtraEditors.TextEdit txt_cgthsqcgy;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraEditors.LabelControl lb_cgthsqcgy;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraEditors.TextEdit txt_sctlbfb;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraEditors.LabelControl lb_sctlbfb;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
    }
}
DevApp/Gs.DevApp/DevFrm/Sys/Frm_Config.cs
@@ -42,6 +42,15 @@
            //其它出库单仓管员
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_qtckdcgy.Text.Trim() + "','" + txt_qtckdcgy.Text.Trim() + "','" + layoutControlItem6.Text.Trim() + "')");
            //采购退货申请采购员
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_cgthsqcgy.Text.Trim() + "','" + txt_cgthsqcgy.Text.Trim() + "','" + layoutControlItem12.Text.Trim() + "')");
            //生产退料超%则要计划审核,即批准
            sb.Append(" insert into [dbo].[MES_CONFIG](guid,parameter,parameterValue,remark) ");
            sb.Append(" values(newid(),'" + lb_sctlbfb.Text.Trim() + "','" + txt_sctlbfb.Text.Trim() + "','" + layoutControlItem14.Text.Trim() + "')");
            var _obj = new
            {
                sql = sb.ToString(),
@@ -112,6 +121,17 @@
                            txt_qtckdcgy.Text = row["parameterValue"].ToString();
                            continue;
                        }
                        if (row["remark"].ToString() == layoutControlItem12.Text)
                        {
                            txt_cgthsqcgy.Text = row["parameterValue"].ToString();
                            continue;
                        }
                        if (row["remark"].ToString() == layoutControlItem14.Text)
                        {
                            txt_sctlbfb.Text = row["parameterValue"].ToString();
                            continue;
                        }
                    }
                }
                else
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,41 +30,41 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
            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.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition73 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition74 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition75 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition76 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition34 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition35 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition36 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition37 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition38 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition39 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition77 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition78 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition40 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition79 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition80 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition81 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition82 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition83 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition41 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition42 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition84 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition85 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition86 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition87 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition88 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition89 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition43 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition90 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition91 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition92 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition93 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition94 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition95 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition96 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition44 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -132,6 +132,7 @@
            this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_dptNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
            this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -157,6 +158,7 @@
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -285,6 +287,20 @@
            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
            this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx6 = new DevExpress.XtraGrid.GridControl();
            this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -328,6 +344,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
@@ -353,6 +370,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -438,6 +456,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
            this.xtraTabPage5.SuspendLayout();
            this.xtraTabPage6.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -622,7 +643,7 @@
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 6;
            this.gridColumn27.VisibleIndex = 18;
            this.gridColumn27.Width = 94;
            // 
            // gv_daa018
@@ -659,7 +680,7 @@
            this.gv_daa001.OptionsColumn.AllowEdit = false;
            this.gv_daa001.Tag = "query_a.daa001";
            this.gv_daa001.Visible = true;
            this.gv_daa001.VisibleIndex = 7;
            this.gv_daa001.VisibleIndex = 6;
            this.gv_daa001.Width = 120;
            // 
            // gv_daa021
@@ -672,7 +693,7 @@
            this.gv_daa021.OptionsColumn.AllowEdit = false;
            this.gv_daa021.Tag = "query_a.daa021";
            this.gv_daa021.Visible = true;
            this.gv_daa021.VisibleIndex = 8;
            this.gv_daa021.VisibleIndex = 7;
            this.gv_daa021.Width = 100;
            // 
            // gridColumn3
@@ -800,7 +821,7 @@
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 18;
            this.gridColumn1.VisibleIndex = 19;
            this.gridColumn1.Width = 94;
            // 
            // gv_daa015
@@ -813,7 +834,7 @@
            this.gv_daa015.OptionsColumn.AllowEdit = false;
            this.gv_daa015.Tag = "query_a.daa015";
            this.gv_daa015.Visible = true;
            this.gv_daa015.VisibleIndex = 19;
            this.gv_daa015.VisibleIndex = 8;
            this.gv_daa015.Width = 94;
            // 
            // gv_daa009
@@ -1017,6 +1038,7 @@
            this.layoutMx1.Controls.Add(this.txt_lineNo);
            this.layoutMx1.Controls.Add(this.txt_dptNo);
            this.layoutMx1.Controls.Add(this.txt_isQiTao);
            this.layoutMx1.Controls.Add(this.txt_daa018);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem29,
@@ -1262,6 +1284,15 @@
            this.txt_isQiTao.StyleController = this.layoutMx1;
            this.txt_isQiTao.TabIndex = 476;
            // 
            // txt_daa018
            //
            this.txt_daa018.Location = new System.Drawing.Point(918, 152);
            this.txt_daa018.Name = "txt_daa018";
            this.txt_daa018.Size = new System.Drawing.Size(296, 24);
            this.txt_daa018.StyleController = this.layoutMx1;
            this.txt_daa018.TabIndex = 477;
            this.txt_daa018.Tag = "readonly";
            //
            // layoutControlItem29
            // 
            this.layoutControlItem29.Control = this.lbGuid;
@@ -1322,41 +1353,42 @@
            this.layoutControlItem19,
            this.layoutControlItem17,
            this.layoutControlItem28,
            this.layoutControlItem46});
            this.layoutControlItem46,
            this.layoutControlItem48});
            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;
            columnDefinition73.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition73.Width = 100D;
            columnDefinition74.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition74.Width = 100D;
            columnDefinition75.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition75.Width = 100D;
            columnDefinition76.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition76.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;
            columnDefinition73,
            columnDefinition74,
            columnDefinition75,
            columnDefinition76});
            rowDefinition34.Height = 100D;
            rowDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition35.Height = 100D;
            rowDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition36.Height = 100D;
            rowDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition37.Height = 100D;
            rowDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition38.Height = 100D;
            rowDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition39.Height = 100D;
            rowDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            rowDefinition34,
            rowDefinition35,
            rowDefinition36,
            rowDefinition37,
            rowDefinition38,
            rowDefinition39});
            this.Root.Size = new System.Drawing.Size(1629, 188);
            this.Root.TextVisible = false;
            // 
@@ -1583,6 +1615,17 @@
            this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem46.TextVisible = false;
            // 
            // layoutControlItem48
            //
            this.layoutControlItem48.Control = this.txt_daa018;
            this.layoutControlItem48.Location = new System.Drawing.Point(804, 140);
            this.layoutControlItem48.Name = "layoutControlItem48";
            this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem48.Size = new System.Drawing.Size(402, 28);
            this.layoutControlItem48.Text = "工单状态";
            this.layoutControlItem48.TextSize = new System.Drawing.Size(90, 18);
            //
            // tabMx
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1593,6 +1636,7 @@
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
            this.xtraTabPage6,
            this.tabMxPage2,
            this.xtraTabPage3,
            this.xtraTabPage4,
@@ -1600,6 +1644,8 @@
            // 
            // tabMxPage1
            // 
            this.tabMxPage1.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
            this.tabMxPage1.Appearance.Header.Options.UseForeColor = true;
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1648, 481);
@@ -2013,11 +2059,11 @@
            // 
            this.layShuLiang.Controls.Add(this.txt_iCount_1);
            this.layShuLiang.Controls.Add(this.txt_yuliang_1);
            this.layShuLiang.Location = new System.Drawing.Point(654, 44);
            this.layShuLiang.Location = new System.Drawing.Point(662, 44);
            this.layShuLiang.Name = "layShuLiang";
            this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
            this.layShuLiang.Root = this.layoutControlGroup3;
            this.layShuLiang.Size = new System.Drawing.Size(317, 28);
            this.layShuLiang.Size = new System.Drawing.Size(321, 28);
            this.layShuLiang.TabIndex = 475;
            this.layShuLiang.Text = "dataLayoutControl1";
            // 
@@ -2026,16 +2072,16 @@
            this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
            this.txt_iCount_1.Name = "txt_iCount_1";
            this.txt_iCount_1.Properties.ReadOnly = true;
            this.txt_iCount_1.Size = new System.Drawing.Size(67, 24);
            this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
            this.txt_iCount_1.StyleController = this.layShuLiang;
            this.txt_iCount_1.TabIndex = 5;
            // 
            // txt_yuliang_1
            // 
            this.txt_yuliang_1.Location = new System.Drawing.Point(247, 2);
            this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
            this.txt_yuliang_1.Name = "txt_yuliang_1";
            this.txt_yuliang_1.Properties.ReadOnly = true;
            this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
            this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
            this.txt_yuliang_1.StyleController = this.layShuLiang;
            this.txt_yuliang_1.TabIndex = 6;
            // 
@@ -2048,19 +2094,19 @@
            this.layoutControlItem39});
            this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup3.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition77.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition77.Width = 100D;
            columnDefinition78.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition78.Width = 100D;
            this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6});
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition77,
            columnDefinition78});
            rowDefinition40.Height = 100D;
            rowDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition7});
            rowDefinition40});
            this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
            this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
            this.layoutControlGroup3.TextVisible = false;
            // 
            // layoutControlItem25
@@ -2068,7 +2114,7 @@
            this.layoutControlItem25.Control = this.txt_iCount_1;
            this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
            this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
            this.layoutControlItem25.Text = "打印整张数";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -2076,16 +2122,16 @@
            // 
            this.layoutControlItem39.Control = this.txt_yuliang_1;
            this.layoutControlItem39.CustomizationFormText = "打印余数";
            this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
            this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
            this.layoutControlItem39.Name = "layoutControlItem39";
            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
            this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
            this.layoutControlItem39.Text = "打印余数";
            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
            // 
            // radOut
            // 
            this.radOut.Location = new System.Drawing.Point(973, 10);
            this.radOut.Location = new System.Drawing.Point(985, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2094,7 +2140,7 @@
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),
            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});
            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
            this.radOut.Size = new System.Drawing.Size(321, 32);
            this.radOut.Size = new System.Drawing.Size(325, 32);
            this.radOut.StyleController = this.layoutMx99;
            this.radOut.TabIndex = 473;
            // 
@@ -2102,29 +2148,29 @@
            // 
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
            this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(321, 32);
            this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
            this.ucBtnPrint1.TabIndex = 464;
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
            this.txt_psnQty_1.Location = new System.Drawing.Point(749, 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(230, 24);
            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 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(420, 44);
            this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
            this.txt_printRemark.Name = "txt_printRemark";
            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
            this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
            this.txt_printRemark.StyleController = this.layoutMx99;
            this.txt_printRemark.TabIndex = 334;
            this.txt_printRemark.Tag = "readOnly-1";
@@ -2132,11 +2178,11 @@
            // txt_kQty
            // 
            this.txt_kQty.EditValue = "";
            this.txt_kQty.Location = new System.Drawing.Point(420, 12);
            this.txt_kQty.Location = new System.Drawing.Point(424, 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(230, 24);
            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
            this.txt_kQty.StyleController = this.layoutMx99;
            this.txt_kQty.TabIndex = 472;
            this.txt_kQty.Tag = "readonly";
@@ -2147,7 +2193,7 @@
            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(230, 24);
            this.txt_yQty.Size = new System.Drawing.Size(234, 24);
            this.txt_yQty.StyleController = this.layoutMx99;
            this.txt_yQty.TabIndex = 470;
            this.txt_yQty.Tag = "readonly";
@@ -2157,7 +2203,7 @@
            this.txt_zQty.Location = new System.Drawing.Point(99, 12);
            this.txt_zQty.Name = "txt_zQty";
            this.txt_zQty.Properties.ReadOnly = true;
            this.txt_zQty.Size = new System.Drawing.Size(230, 24);
            this.txt_zQty.Size = new System.Drawing.Size(234, 24);
            this.txt_zQty.StyleController = this.layoutMx99;
            this.txt_zQty.TabIndex = 474;
            // 
@@ -2176,30 +2222,30 @@
            this.layoutControlItem36});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition9.Width = 100D;
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition11.Width = 323D;
            columnDefinition79.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition79.Width = 100D;
            columnDefinition80.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition80.Width = 100D;
            columnDefinition81.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition81.Width = 100D;
            columnDefinition82.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition82.Width = 100D;
            columnDefinition83.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition83.Width = 328D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition7,
            columnDefinition8,
            columnDefinition9,
            columnDefinition10,
            columnDefinition11});
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition79,
            columnDefinition80,
            columnDefinition81,
            columnDefinition82,
            columnDefinition83});
            rowDefinition41.Height = 100D;
            rowDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition42.Height = 100D;
            rowDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition8,
            rowDefinition9});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
            rowDefinition41,
            rowDefinition42});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
            this.layoutControlGroup1.TextVisible = false;
            // 
            // layoutControlItem23
@@ -2207,21 +2253,21 @@
            this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
            this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem23.Control = this.txt_kQty;
            this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
            this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem23.Text = "可打印数量";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem35
            // 
            this.layoutControlItem35.Control = this.radOut;
            this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
            this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem35.Text = "自动计算";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem35.TextVisible = false;
@@ -2231,12 +2277,12 @@
            this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
            this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem26.Control = this.ucBtnPrint1;
            this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
            this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem26.Text = "托板打印";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
@@ -2249,18 +2295,18 @@
            this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem22.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem22.Text = "已打印数量";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem21
            // 
            this.layoutControlItem21.Control = this.txt_printRemark;
            this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
            this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem21.Text = "打印备注";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -2270,21 +2316,21 @@
            this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            this.layoutControlItem24.Control = this.txt_psnQty_1;
            this.layoutControlItem24.CustomizationFormText = "内包装数量";
            this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
            this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem24.Text = "内包装数量";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
            // 
            // layoutControlItem38
            // 
            this.layoutControlItem38.Control = this.layShuLiang;
            this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
            this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
            this.layoutControlItem38.Name = "layoutControlItem38";
            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem38.Text = "打印数量";
            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem38.TextVisible = false;
@@ -2294,7 +2340,7 @@
            this.layoutControlItem36.Control = this.txt_zQty;
            this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem36.Name = "layoutControlItem36";
            this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem36.Text = "工单总量";
            this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -2593,29 +2639,29 @@
            this.layoutControlItem37});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "Root";
            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12.Width = 100D;
            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition13.Width = 100D;
            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition14.Width = 100D;
            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition15.Width = 100D;
            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition16.Width = 100D;
            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition17.Width = 100D;
            columnDefinition84.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition84.Width = 100D;
            columnDefinition85.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition85.Width = 100D;
            columnDefinition86.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition86.Width = 100D;
            columnDefinition87.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition87.Width = 100D;
            columnDefinition88.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition88.Width = 100D;
            columnDefinition89.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition89.Width = 100D;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition12,
            columnDefinition13,
            columnDefinition14,
            columnDefinition15,
            columnDefinition16,
            columnDefinition17});
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition84,
            columnDefinition85,
            columnDefinition86,
            columnDefinition87,
            columnDefinition88,
            columnDefinition89});
            rowDefinition43.Height = 100D;
            rowDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition10});
            rowDefinition43});
            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
            this.layoutControlGroup2.TextVisible = false;
            // 
@@ -2863,55 +2909,56 @@
            // 
            this.ucBtnPrint100.allClickKey = null;
            this.ucBtnPrint100.guidKey = null;
            this.ucBtnPrint100.Location = new System.Drawing.Point(1112, 10);
            this.ucBtnPrint100.Location = new System.Drawing.Point(1096, 10);
            this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint100.Name = "ucBtnPrint100";
            this.ucBtnPrint100.rptParameter = null;
            this.ucBtnPrint100.Size = new System.Drawing.Size(276, 32);
            this.ucBtnPrint100.Size = new System.Drawing.Size(272, 32);
            this.ucBtnPrint100.TabIndex = 0;
            // 
            // btnIn
            // 
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
            this.btnIn.Location = new System.Drawing.Point(1390, 12);
            this.btnIn.Location = new System.Drawing.Point(1370, 12);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(96, 27);
            this.btnIn.Size = new System.Drawing.Size(116, 27);
            this.btnIn.StyleController = this.layMx100;
            this.btnIn.TabIndex = 1;
            this.btnIn.Text = "导入条码";
            this.btnIn.Text = "导入后盖码";
            // 
            // txt_zQty100
            // 
            this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
            this.txt_zQty100.Name = "txt_zQty100";
            this.txt_zQty100.Properties.ReadOnly = true;
            this.txt_zQty100.Size = new System.Drawing.Size(168, 24);
            this.txt_zQty100.Size = new System.Drawing.Size(164, 24);
            this.txt_zQty100.StyleController = this.layMx100;
            this.txt_zQty100.TabIndex = 4;
            // 
            // txt_yQty100
            // 
            this.txt_yQty100.Location = new System.Drawing.Point(388, 12);
            this.txt_yQty100.Location = new System.Drawing.Point(384, 12);
            this.txt_yQty100.Name = "txt_yQty100";
            this.txt_yQty100.Properties.ReadOnly = true;
            this.txt_yQty100.Size = new System.Drawing.Size(170, 24);
            this.txt_yQty100.Size = new System.Drawing.Size(166, 24);
            this.txt_yQty100.StyleController = this.layMx100;
            this.txt_yQty100.TabIndex = 5;
            // 
            // txt_kQty100
            // 
            this.txt_kQty100.Location = new System.Drawing.Point(664, 12);
            this.txt_kQty100.Location = new System.Drawing.Point(656, 12);
            this.txt_kQty100.Name = "txt_kQty100";
            this.txt_kQty100.Properties.ReadOnly = true;
            this.txt_kQty100.Size = new System.Drawing.Size(170, 24);
            this.txt_kQty100.Size = new System.Drawing.Size(166, 24);
            this.txt_kQty100.StyleController = this.layMx100;
            this.txt_kQty100.TabIndex = 6;
            // 
            // txt_iCount_100
            // 
            this.txt_iCount_100.Location = new System.Drawing.Point(940, 12);
            this.txt_iCount_100.Location = new System.Drawing.Point(928, 12);
            this.txt_iCount_100.Name = "txt_iCount_100";
            this.txt_iCount_100.Size = new System.Drawing.Size(170, 24);
            this.txt_iCount_100.Size = new System.Drawing.Size(166, 24);
            this.txt_iCount_100.StyleController = this.layMx100;
            this.txt_iCount_100.TabIndex = 7;
            // 
            // btnDesign
@@ -2938,32 +2985,32 @@
            this.layoutControlItem47});
            this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup4.Name = "Root";
            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition18.Width = 100D;
            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition19.Width = 100D;
            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.Absolute;
            columnDefinition23.Width = 100D;
            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute;
            columnDefinition24.Width = 150D;
            columnDefinition90.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition90.Width = 100D;
            columnDefinition91.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition91.Width = 100D;
            columnDefinition92.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition92.Width = 100D;
            columnDefinition93.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition93.Width = 100D;
            columnDefinition94.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition94.Width = 100D;
            columnDefinition95.SizeType = System.Windows.Forms.SizeType.Absolute;
            columnDefinition95.Width = 120D;
            columnDefinition96.SizeType = System.Windows.Forms.SizeType.Absolute;
            columnDefinition96.Width = 150D;
            this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition18,
            columnDefinition19,
            columnDefinition20,
            columnDefinition21,
            columnDefinition22,
            columnDefinition23,
            columnDefinition24});
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition90,
            columnDefinition91,
            columnDefinition92,
            columnDefinition93,
            columnDefinition94,
            columnDefinition95,
            columnDefinition96});
            rowDefinition44.Height = 100D;
            rowDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition11});
            rowDefinition44});
            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
            this.layoutControlGroup4.TextVisible = false;
            // 
@@ -2972,17 +3019,17 @@
            this.layoutControlItem42.Control = this.txt_zQty100;
            this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem42.Name = "layoutControlItem42";
            this.layoutControlItem42.Size = new System.Drawing.Size(274, 32);
            this.layoutControlItem42.Size = new System.Drawing.Size(270, 32);
            this.layoutControlItem42.Text = "工单总量";
            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem43
            // 
            this.layoutControlItem43.Control = this.txt_yQty100;
            this.layoutControlItem43.Location = new System.Drawing.Point(274, 0);
            this.layoutControlItem43.Location = new System.Drawing.Point(270, 0);
            this.layoutControlItem43.Name = "layoutControlItem43";
            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem43.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem43.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem43.Text = "已打印数";
            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -2990,20 +3037,20 @@
            // 
            this.layoutControlItem44.Control = this.txt_kQty100;
            this.layoutControlItem44.CustomizationFormText = "可打印数";
            this.layoutControlItem44.Location = new System.Drawing.Point(550, 0);
            this.layoutControlItem44.Location = new System.Drawing.Point(542, 0);
            this.layoutControlItem44.Name = "layoutControlItem44";
            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem44.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem44.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem44.Text = "可打印数字";
            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.btnIn;
            this.layoutControlItem2.Location = new System.Drawing.Point(1378, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(1358, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem2.Size = new System.Drawing.Size(100, 32);
            this.layoutControlItem2.Size = new System.Drawing.Size(120, 32);
            this.layoutControlItem2.Text = "导入按钮";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem2.TextVisible = false;
@@ -3011,11 +3058,11 @@
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.ucBtnPrint100;
            this.layoutControlItem10.Location = new System.Drawing.Point(1102, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(1086, 0);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem10.Text = "打印按钮";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
@@ -3023,10 +3070,10 @@
            // layoutControlItem45
            // 
            this.layoutControlItem45.Control = this.txt_iCount_100;
            this.layoutControlItem45.Location = new System.Drawing.Point(826, 0);
            this.layoutControlItem45.Location = new System.Drawing.Point(814, 0);
            this.layoutControlItem45.Name = "layoutControlItem45";
            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem45.Size = new System.Drawing.Size(276, 32);
            this.layoutControlItem45.Size = new System.Drawing.Size(272, 32);
            this.layoutControlItem45.Text = "本次打印张数";
            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
            // 
@@ -3192,6 +3239,165 @@
            this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
            this.ucBtnPrint101.TabIndex = 0;
            // 
            // xtraTabPage6
            //
            this.xtraTabPage6.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
            this.xtraTabPage6.Appearance.Header.Options.UseForeColor = true;
            this.xtraTabPage6.Controls.Add(this.gcMx6);
            this.xtraTabPage6.Name = "xtraTabPage6";
            this.xtraTabPage6.Size = new System.Drawing.Size(1648, 481);
            this.xtraTabPage6.Text = "备料明细";
            //
            // gcMx6
            //
            this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx6.Location = new System.Drawing.Point(0, 0);
            this.gcMx6.MainView = this.gvMx6;
            this.gcMx6.Name = "gcMx6";
            this.gcMx6.Size = new System.Drawing.Size(1648, 481);
            this.gcMx6.TabIndex = 1;
            this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx6});
            //
            // gvMx6
            //
            this.gvMx6.Appearance.HeaderPanel.Options.UseTextOptions = true;
            this.gvMx6.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
            this.gvMx6.ColumnPanelRowHeight = 50;
            this.gvMx6.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn2,
            this.gridColumn9,
            this.gridColumn11,
            this.gridColumn20,
            this.gridColumn26,
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn49,
            this.gridColumn8,
            this.gridColumn50,
            this.gridColumn51});
            this.gvMx6.GridControl = this.gcMx6;
            this.gvMx6.Name = "gvMx6";
            this.gvMx6.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx6.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx6.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "gvMx1Guid";
            this.gridColumn2.FieldName = "guid";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Width = 94;
            //
            // gridColumn9
            //
            this.gridColumn9.AppearanceCell.Options.UseFont = true;
            this.gridColumn9.Caption = "工单单号";
            this.gridColumn9.FieldName = "daa001";
            this.gridColumn9.MinWidth = 50;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Tag = "query_a.dab001";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 0;
            this.gridColumn9.Width = 94;
            //
            // gridColumn11
            //
            this.gridColumn11.AppearanceCell.Options.UseFont = true;
            this.gridColumn11.Caption = "材料编码";
            this.gridColumn11.FieldName = "itemNo";
            this.gridColumn11.MinWidth = 50;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Tag = "query_a.dab003";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 1;
            this.gridColumn11.Width = 94;
            //
            // gridColumn20
            //
            this.gridColumn20.AppearanceCell.Options.UseFont = true;
            this.gridColumn20.Caption = "材料名称";
            this.gridColumn20.FieldName = "itemName";
            this.gridColumn20.MinWidth = 50;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Tag = "query_a.dab004";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 2;
            this.gridColumn20.Width = 94;
            //
            // gridColumn26
            //
            this.gridColumn26.AppearanceCell.Options.UseFont = true;
            this.gridColumn26.Caption = "材料规格";
            this.gridColumn26.FieldName = "itemModel";
            this.gridColumn26.MinWidth = 50;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Tag = "query_a.dab005";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 3;
            this.gridColumn26.Width = 94;
            //
            // gridColumn28
            //
            this.gridColumn28.Caption = "物料条码";
            this.gridColumn28.FieldName = "itemBarcode";
            this.gridColumn28.MinWidth = 25;
            this.gridColumn28.Name = "gridColumn28";
            this.gridColumn28.Visible = true;
            this.gridColumn28.VisibleIndex = 4;
            this.gridColumn28.Width = 94;
            //
            // gridColumn29
            //
            this.gridColumn29.Caption = "条码数量";
            this.gridColumn29.FieldName = "quantity";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 5;
            this.gridColumn29.Width = 94;
            //
            // gridColumn49
            //
            this.gridColumn49.Caption = "备料详情";
            this.gridColumn49.FieldName = "blDetail";
            this.gridColumn49.MinWidth = 25;
            this.gridColumn49.Name = "gridColumn49";
            this.gridColumn49.Visible = true;
            this.gridColumn49.VisibleIndex = 6;
            this.gridColumn49.Width = 94;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "收料详情";
            this.gridColumn8.FieldName = "slDetail";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 7;
            this.gridColumn8.Width = 94;
            //
            // gridColumn50
            //
            this.gridColumn50.Caption = "投料详情";
            this.gridColumn50.FieldName = "tlDetail";
            this.gridColumn50.MinWidth = 25;
            this.gridColumn50.Name = "gridColumn50";
            this.gridColumn50.Visible = true;
            this.gridColumn50.VisibleIndex = 8;
            this.gridColumn50.Width = 94;
            //
            // gridColumn51
            //
            this.gridColumn51.Caption = "退料详情";
            this.gridColumn51.FieldName = "tuiDetail";
            this.gridColumn51.MinWidth = 25;
            this.gridColumn51.Name = "gridColumn51";
            this.gridColumn51.Visible = true;
            this.gridColumn51.VisibleIndex = 9;
            this.gridColumn51.Width = 94;
            //
            // Frm_Womdaa
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -3243,6 +3449,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
@@ -3268,6 +3475,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -3353,6 +3561,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
            this.xtraTabPage5.ResumeLayout(false);
            this.xtraTabPage6.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).EndInit();
            this.ResumeLayout(false);
        }
@@ -3578,5 +3789,21 @@
        private DevExpress.XtraEditors.SplitContainerControl splitMx100;
        private DevExpress.XtraEditors.SimpleButton btnDesign;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
        private DevExpress.XtraEditors.TextEdit txt_daa018;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem48;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage6;
        private DevExpress.XtraGrid.GridControl gcMx6;
        private DevExpress.XtraGrid.Views.Grid.GridView gvMx6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -218,7 +218,10 @@
                              "XlsInOut/" + strService,
                              JsonConvert.SerializeObject(_obj));
                        var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                        MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        if (_rtn.rtnCode > 0)
                            MsgHelper.ShowInformation("提示:" + _rtn.rtnMsg);
                        else
                            MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
                    }
                    catch (Exception ex)
                    {
@@ -336,7 +339,7 @@
                lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定重新生成首检吗?"))
@@ -352,25 +355,16 @@
                    _webServiceName + "EditModelSubmitShouJian",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    //if (xtraTabControl1.SelectedTabPageIndex == 1)
                    //{
                    //    getModel(lbGuid.Text.Trim());
                    //}
                    //else
                    //{
                    //    //注意,这里和其它页面有点不一样
                    //    getPageList(this.pageBar1.CurrentPage);
                    //    int rowHandle = gridView1.LocateByValue("guid", rowGuid);
                    //    gridView1.FocusedRowHandle = rowHandle;
                    //}
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -702,14 +696,34 @@
                        }
                    }
                    //2025-7-20加上产线确认
                    JArray array6 = new JArray();
                    foreach (var a in _job["rtnData"]["list6"])
                    {
                        array6.Add(a);
                    }
                    DataTable dt6 = JsonConvert.DeserializeObject<DataTable>(array6.ToString());
                    if (dt6.Rows.Count > 0)
                    {
                        gcMx6.BindingContext = new BindingContext();
                        gcMx6.DataSource = dt6;
                        gcMx6.ForceInitialize();
                        gvMx6.BestFitColumns();
                        Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx6);
                    }
                    else
                    {
                        Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx6, gvMx6);
                    }
                    txt_psnQty_1.Text = txt_printRemark.Text = txt_iCount_1.Text = txt_printRemark98.Text = txt_iCount_98.Text = txt_yuliang_1.Text = "";
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
                    ToolBox.MsgHelper.ShowError("提示:" + _rtn.rtnMsg);
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.Warning("提示:" + ex.Message);
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
@@ -757,7 +771,7 @@
                lbGuid, txt_daa001, gridView1, "daa001");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                MsgHelper.ShowError("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
@@ -774,9 +788,10 @@
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim());
@@ -789,10 +804,12 @@
                        gridView1.FocusedRowHandle = rowHandle;
                    }
                }
                else
                    MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -1016,7 +1016,7 @@
            // 
            this.layoutControl1.Controls.Add(this.txt_iCount_1);
            this.layoutControl1.Controls.Add(this.txt_yuliang_1);
            this.layoutControl1.Location = new System.Drawing.Point(415, 76);
            this.layoutControl1.Location = new System.Drawing.Point(692, 76);
            this.layoutControl1.Name = "layoutControl1";
            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1081, 196, 812, 500);
            this.layoutControl1.Root = this.layoutControlGroup2;
@@ -1040,7 +1040,6 @@
            this.txt_yuliang_1.Name = "txt_yuliang_1";
            this.txt_yuliang_1.Properties.ReadOnly = true;
            this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
            this.txt_yuliang_1.StyleController = this.layoutControl1;
            this.txt_yuliang_1.TabIndex = 229;
            // 
            // layoutControlGroup2
@@ -1088,8 +1087,9 @@
            // 
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(754, 42);
            this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
@@ -1098,7 +1098,7 @@
            // 
            // radOut
            // 
            this.radOut.Location = new System.Drawing.Point(756, 10);
            this.radOut.Location = new System.Drawing.Point(1033, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1122,7 +1122,7 @@
            // 
            // txtWlid
            // 
            this.txtWlid.Location = new System.Drawing.Point(-163, 12);
            this.txtWlid.Location = new System.Drawing.Point(114, 12);
            this.txtWlid.Name = "txtWlid";
            this.txtWlid.Properties.Appearance.Options.UseFont = true;
            this.txtWlid.Properties.ReadOnly = true;
@@ -1132,7 +1132,7 @@
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(517, 44);
            this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
            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(234, 24);
@@ -1141,7 +1141,7 @@
            // 
            // txtWlmc
            // 
            this.txtWlmc.Location = new System.Drawing.Point(-163, 44);
            this.txtWlmc.Location = new System.Drawing.Point(114, 44);
            this.txtWlmc.Name = "txtWlmc";
            this.txtWlmc.Properties.Appearance.Options.UseFont = true;
            this.txtWlmc.Properties.ReadOnly = true;
@@ -1151,7 +1151,7 @@
            // 
            // txtWlgg
            // 
            this.txtWlgg.Location = new System.Drawing.Point(-163, 76);
            this.txtWlgg.Location = new System.Drawing.Point(114, 76);
            this.txtWlgg.Name = "txtWlgg";
            this.txtWlgg.Properties.Appearance.Options.UseFont = true;
            this.txtWlgg.Properties.ReadOnly = true;
@@ -1161,7 +1161,7 @@
            // 
            // txt_kQty
            // 
            this.txt_kQty.Location = new System.Drawing.Point(517, 12);
            this.txt_kQty.Location = new System.Drawing.Point(794, 12);
            this.txt_kQty.Name = "txt_kQty";
            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
            this.txt_kQty.Properties.Appearance.Options.UseFont = true;
@@ -1173,7 +1173,7 @@
            // 
            // txtQuantity
            // 
            this.txtQuantity.Location = new System.Drawing.Point(177, 12);
            this.txtQuantity.Location = new System.Drawing.Point(454, 12);
            this.txtQuantity.Name = "txtQuantity";
            this.txtQuantity.Properties.Appearance.Options.UseFont = true;
            this.txtQuantity.Properties.ReadOnly = true;
@@ -1183,7 +1183,7 @@
            // 
            // txt_yQty
            // 
            this.txt_yQty.Location = new System.Drawing.Point(177, 44);
            this.txt_yQty.Location = new System.Drawing.Point(454, 44);
            this.txt_yQty.Name = "txt_yQty";
            this.txt_yQty.Properties.Appearance.Options.UseFont = true;
            this.txt_yQty.Properties.ReadOnly = true;