lu
2025-05-29 aafffe61d42c6f0b731af002012979a6a0ead974
过站
已修改6个文件
526 ■■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 372 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs 34 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs 51 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs 50 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs 6 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,45 +30,45 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition70 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition71 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition72 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition73 = 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 columnDefinition74 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition75 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition40 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition76 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition77 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition78 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition79 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition80 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition41 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition42 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition81 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition82 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition83 = new DevExpress.XtraLayout.ColumnDefinition();
            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.RowDefinition rowDefinition43 = new DevExpress.XtraLayout.RowDefinition();
            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.ColumnDefinition columnDefinition90 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition91 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition92 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition44 = new DevExpress.XtraLayout.RowDefinition();
            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.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 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.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -1319,38 +1319,38 @@
            this.layoutControlItem46});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition70.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition70.Width = 100D;
            columnDefinition71.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition71.Width = 100D;
            columnDefinition72.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition72.Width = 100D;
            columnDefinition73.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition73.Width = 100D;
            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;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition70,
            columnDefinition71,
            columnDefinition72,
            columnDefinition73});
            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;
            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;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition34,
            rowDefinition35,
            rowDefinition36,
            rowDefinition37,
            rowDefinition38,
            rowDefinition39});
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6});
            this.Root.Size = new System.Drawing.Size(1629, 188);
            this.Root.TextVisible = false;
            // 
@@ -1829,21 +1829,25 @@
            // gvMx1zyBl
            // 
            this.gvMx1zyBl.AppearanceCell.Options.UseFont = true;
            this.gvMx1zyBl.Caption = "作业不良";
            this.gvMx1zyBl.Caption = "作业不良退料";
            this.gvMx1zyBl.FieldName = "zyBl";
            this.gvMx1zyBl.MinWidth = 50;
            this.gvMx1zyBl.Name = "gvMx1zyBl";
            this.gvMx1zyBl.Tag = "query_a.zy_bl";
            this.gvMx1zyBl.Visible = true;
            this.gvMx1zyBl.VisibleIndex = 17;
            this.gvMx1zyBl.Width = 94;
            // 
            // gvMx1llBl
            // 
            this.gvMx1llBl.AppearanceCell.Options.UseFont = true;
            this.gvMx1llBl.Caption = "来料不良";
            this.gvMx1llBl.Caption = "来料不良退料";
            this.gvMx1llBl.FieldName = "llBl";
            this.gvMx1llBl.MinWidth = 50;
            this.gvMx1llBl.Name = "gvMx1llBl";
            this.gvMx1llBl.Tag = "query_a.ll_bl";
            this.gvMx1llBl.Visible = true;
            this.gvMx1llBl.VisibleIndex = 15;
            this.gvMx1llBl.Width = 94;
            // 
            // gvMx1lpTl
@@ -1854,6 +1858,8 @@
            this.gvMx1lpTl.MinWidth = 50;
            this.gvMx1lpTl.Name = "gvMx1lpTl";
            this.gvMx1lpTl.Tag = "query_a.lp_tl";
            this.gvMx1lpTl.Visible = true;
            this.gvMx1lpTl.VisibleIndex = 16;
            this.gvMx1lpTl.Width = 94;
            // 
            // gvMx1dab021
@@ -1931,8 +1937,8 @@
            // gvMx1dab022
            // 
            this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
            this.gvMx1dab022.Caption = "退料数量";
            this.gvMx1dab022.FieldName = "dab022";
            this.gvMx1dab022.Caption = "退料总数";
            this.gvMx1dab022.FieldName = "ztsl";
            this.gvMx1dab022.MinWidth = 50;
            this.gvMx1dab022.Name = "gvMx1dab022";
            this.gvMx1dab022.Tag = "query_a.dab022";
@@ -2001,11 +2007,11 @@
            // 
            this.layShuLiang.Controls.Add(this.txt_iCount_1);
            this.layShuLiang.Controls.Add(this.txt_yuliang_1);
            this.layShuLiang.Location = new System.Drawing.Point(662, 44);
            this.layShuLiang.Location = new System.Drawing.Point(654, 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(321, 28);
            this.layShuLiang.Size = new System.Drawing.Size(317, 28);
            this.layShuLiang.TabIndex = 475;
            this.layShuLiang.Text = "dataLayoutControl1";
            // 
@@ -2014,16 +2020,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(69, 24);
            this.txt_iCount_1.Size = new System.Drawing.Size(67, 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(249, 2);
            this.txt_yuliang_1.Location = new System.Drawing.Point(247, 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(70, 24);
            this.txt_yuliang_1.Size = new System.Drawing.Size(68, 24);
            this.txt_yuliang_1.StyleController = this.layShuLiang;
            this.txt_yuliang_1.TabIndex = 6;
            // 
@@ -2036,19 +2042,19 @@
            this.layoutControlItem39});
            this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup3.Name = "Root";
            columnDefinition74.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition74.Width = 100D;
            columnDefinition75.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition75.Width = 100D;
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition74,
            columnDefinition75});
            rowDefinition40.Height = 100D;
            rowDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5,
            columnDefinition6});
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition40});
            rowDefinition7});
            this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
            this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
            this.layoutControlGroup3.TextVisible = false;
            // 
            // layoutControlItem25
@@ -2056,7 +2062,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(160, 28);
            this.layoutControlItem25.Size = new System.Drawing.Size(158, 28);
            this.layoutControlItem25.Text = "打印整张数";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -2064,16 +2070,16 @@
            // 
            this.layoutControlItem39.Control = this.txt_yuliang_1;
            this.layoutControlItem39.CustomizationFormText = "打印余数";
            this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
            this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
            this.layoutControlItem39.Name = "layoutControlItem39";
            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
            this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
            this.layoutControlItem39.Text = "打印余数";
            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
            // 
            // radOut
            // 
            this.radOut.Location = new System.Drawing.Point(988, 10);
            this.radOut.Location = new System.Drawing.Point(976, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2088,29 +2094,29 @@
            // ucBtnPrint1
            // 
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(986, 42);
            this.ucBtnPrint1.Location = new System.Drawing.Point(974, 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(323, 32);
            this.ucBtnPrint1.Size = new System.Drawing.Size(319, 32);
            this.ucBtnPrint1.TabIndex = 464;
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
            this.txt_psnQty_1.Location = new System.Drawing.Point(741, 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(234, 24);
            this.txt_psnQty_1.Size = new System.Drawing.Size(230, 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(424, 44);
            this.txt_printRemark.Location = new System.Drawing.Point(420, 44);
            this.txt_printRemark.Name = "txt_printRemark";
            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
            this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
            this.txt_printRemark.StyleController = this.layoutMx99;
            this.txt_printRemark.TabIndex = 334;
            this.txt_printRemark.Tag = "readOnly-1";
@@ -2118,11 +2124,11 @@
            // txt_kQty
            // 
            this.txt_kQty.EditValue = "";
            this.txt_kQty.Location = new System.Drawing.Point(424, 12);
            this.txt_kQty.Location = new System.Drawing.Point(420, 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(234, 24);
            this.txt_kQty.Size = new System.Drawing.Size(230, 24);
            this.txt_kQty.StyleController = this.layoutMx99;
            this.txt_kQty.TabIndex = 472;
            this.txt_kQty.Tag = "readonly";
@@ -2133,7 +2139,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(234, 24);
            this.txt_yQty.Size = new System.Drawing.Size(230, 24);
            this.txt_yQty.StyleController = this.layoutMx99;
            this.txt_yQty.TabIndex = 470;
            this.txt_yQty.Tag = "readonly";
@@ -2143,7 +2149,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(234, 24);
            this.txt_zQty.Size = new System.Drawing.Size(230, 24);
            this.txt_zQty.StyleController = this.layoutMx99;
            this.txt_zQty.TabIndex = 474;
            // 
@@ -2162,30 +2168,30 @@
            this.layoutControlItem36});
            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup1.Name = "Root";
            columnDefinition76.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition76.Width = 100D;
            columnDefinition77.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition77.Width = 100D;
            columnDefinition78.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition78.Width = 100D;
            columnDefinition79.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition79.Width = 100D;
            columnDefinition80.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition80.Width = 328D;
            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;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition76,
            columnDefinition77,
            columnDefinition78,
            columnDefinition79,
            columnDefinition80});
            rowDefinition41.Height = 100D;
            rowDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition42.Height = 100D;
            rowDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
            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;
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition41,
            rowDefinition42});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
            rowDefinition8,
            rowDefinition9});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
            this.layoutControlGroup1.TextVisible = false;
            // 
            // layoutControlItem23
@@ -2193,23 +2199,23 @@
            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(325, 0);
            this.layoutControlItem23.Location = new System.Drawing.Point(321, 0);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem23.Size = new System.Drawing.Size(321, 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(975, 0);
            this.layoutControlItem35.Location = new System.Drawing.Point(963, 0);
            this.layoutControlItem35.MaxSize = new System.Drawing.Size(240, 28);
            this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
            this.layoutControlItem35.Name = "layoutControlItem35";
            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
            this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem35.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem35.Text = "自动计算";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
@@ -2220,12 +2226,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(975, 32);
            this.layoutControlItem26.Location = new System.Drawing.Point(963, 32);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
            this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem26.Text = "报工打印";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
@@ -2238,18 +2244,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(325, 32);
            this.layoutControlItem22.Size = new System.Drawing.Size(321, 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(325, 32);
            this.layoutControlItem21.Location = new System.Drawing.Point(321, 32);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem21.Text = "打印备注";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -2259,21 +2265,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(650, 0);
            this.layoutControlItem24.Location = new System.Drawing.Point(642, 0);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem24.Size = new System.Drawing.Size(321, 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(650, 32);
            this.layoutControlItem38.Location = new System.Drawing.Point(642, 32);
            this.layoutControlItem38.Name = "layoutControlItem38";
            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
            this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem38.Text = "打印数量";
            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem38.TextVisible = false;
@@ -2283,7 +2289,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(325, 32);
            this.layoutControlItem36.Size = new System.Drawing.Size(321, 32);
            this.layoutControlItem36.Text = "工单总量";
            this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
            // 
@@ -2486,10 +2492,10 @@
            // rptChongDa
            // 
            this.rptChongDa.AutoHeight = false;
            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "重打", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
            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)});
            this.rptChongDa.Name = "rptChongDa";
            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -2719,29 +2725,29 @@
            this.layoutControlItem37});
            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup2.Name = "Root";
            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.Percent;
            columnDefinition83.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;
            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;
            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition81,
            columnDefinition82,
            columnDefinition83,
            columnDefinition84,
            columnDefinition85,
            columnDefinition86});
            rowDefinition43.Height = 100D;
            rowDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition12,
            columnDefinition13,
            columnDefinition14,
            columnDefinition15,
            columnDefinition16,
            columnDefinition17});
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition43});
            rowDefinition10});
            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 54);
            this.layoutControlGroup2.TextVisible = false;
            // 
@@ -3033,29 +3039,29 @@
            this.layoutControlItem45});
            this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.layoutControlGroup4.Name = "Root";
            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;
            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.Absolute;
            columnDefinition92.Width = 200D;
            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 = 200D;
            this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition87,
            columnDefinition88,
            columnDefinition89,
            columnDefinition90,
            columnDefinition91,
            columnDefinition92});
            rowDefinition44.Height = 100D;
            rowDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition18,
            columnDefinition19,
            columnDefinition20,
            columnDefinition21,
            columnDefinition22,
            columnDefinition23});
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition44});
            rowDefinition11});
            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 56);
            this.layoutControlGroup4.TextVisible = false;
            // 
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -27,7 +27,7 @@
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            this.toolBarMenu1.btnZhongTaiClick += ToolBarMenu1_btnZhongTaiClick;
            this.toolBarMenu1.btnTzblClick += ToolBarMenu1_btnTzblClick;
            // this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            this.toolBarMenu1.btnKgClick += ToolBarMenu1_btnKgClick;
            this.toolBarMenu1.btnWgClick += ToolBarMenu1_btnWgClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
@@ -124,8 +124,7 @@
                frm.ShowDialog();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
@@ -265,10 +264,10 @@
        {
            _toolCk(7);
        }
        //private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
        //{
        //    _toolCk(8);
        //}
        private void ToolBarMenu1_btnKgClick(object sender, EventArgs e)
        {
            _toolCk(8);
        }
        private void ToolBarMenu1_btnWgClick(object sender, EventArgs e)
        {
            _toolCk(9);
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -128,8 +128,10 @@
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
            this.txt_dianJianPath = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
            this.splitMx1.Panel1.SuspendLayout();
@@ -190,6 +192,8 @@
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            this.SuspendLayout();
            // 
            // splitMx1
@@ -262,6 +266,7 @@
            this.layoutMx1.Controls.Add(this.txt_sjDate);
            this.layoutMx1.Controls.Add(this.btnGood);
            this.layoutMx1.Controls.Add(this.btnBad);
            this.layoutMx1.Controls.Add(this.txt_dianJianPath);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
@@ -447,7 +452,8 @@
            this.layoutControlItem16,
            this.layoutControlItem17,
            this.layoutControlItem13,
            this.layoutControlItem11});
            this.layoutControlItem11,
            this.layoutControlItem18});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1226,6 +1232,26 @@
            this.gridColumn23.VisibleIndex = 12;
            this.gridColumn23.Width = 94;
            // 
            // txt_dianJianPath
            //
            this.txt_dianJianPath.Location = new System.Drawing.Point(286, 152);
            this.txt_dianJianPath.Name = "txt_dianJianPath";
            this.txt_dianJianPath.Properties.ReadOnly = true;
            this.txt_dianJianPath.Size = new System.Drawing.Size(126, 24);
            this.txt_dianJianPath.StyleController = this.layoutMx1;
            this.txt_dianJianPath.TabIndex = 21;
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_dianJianPath;
            this.layoutControlItem18.Location = new System.Drawing.Point(202, 140);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem18.Size = new System.Drawing.Size(202, 31);
            this.layoutControlItem18.Text = "电检路径";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // Frm_Work01
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1302,6 +1328,8 @@
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_dianJianPath.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1399,5 +1427,7 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
        private DevExpress.XtraEditors.TextEdit txt_dianJianPath;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
    }
}
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -29,16 +29,15 @@
        /// </summary>
        /// <param name="_fGx">工序</param>
        /// <param name="_fBc">班次</param>
        public Frm_Work01(string _fGx, string _fBc)
        /// <param name="_strinOther">目前为电检路径</param>
        public Frm_Work01(string _fGx, string _fBc, string _strinOther)
        {
            InitializeComponent();
            txt_gx.Text = _fGx;
            txt_bc.Text = _fBc;
            this.Text = "工序采集 - " + _fGx + " - " + _fBc;
            if (!getConfig())
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowError("读取配置文件失败,请联系管理员!");
            }
            txt_dianJianPath.Text = _strinOther;
            dianJianPath= _strinOther;
            this.Text = "工序采集【" + _fGx + " - " + _fBc + "】";
            addColumn();
            txt_barCode.KeyDown += (s, e) =>
            {
@@ -50,7 +49,7 @@
            };
            btnBad.Click += (s, e) =>
            {
                UcDictionarySelect frm = new UcDictionarySelect("缺陷描述", " s_type='工序采集不良项目'");
                UcDictionarySelect frm = new UcDictionarySelect("不良描述", " s_type='工序采集不良项目' and pid<>'00000000-0000-0000-0000-000000000000'");
                frm.UpdateParent += (ss, ee) =>
                {
                    System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();
@@ -75,39 +74,11 @@
        }
        /// <summary>
        /// 先读取配置
        /// 根据工序,构造不同类型的实体
        /// </summary>
        /// <returns></returns>
        private bool getConfig()
        {
            string _where = " and 1=1 and  defect_code='7001'";
            var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                if (dt != null && dt.Rows.Count > 0)
                {
                    dianJianPath = dt.Rows[0]["defectName"].ToString();
                    return true;
                }
                return false;
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                return false;
            }
        }
        /// <summary>
        /// 读取实体
        /// </summary>
        /// <param name="_barCode"></param>
        /// <param name="_checkResult"></param>
        /// <param name="_badReson"></param>
        /// <param name="_barCode">条码</param>
        /// <param name="_checkResult">结果</param>
        /// <param name="_badReson">原因</param>
        /// <returns></returns>
        private dynamic getObj(string _barCode, string _checkResult, string _badReson = "")
        {
@@ -193,7 +164,7 @@
                _obj.t009 = strSw4;
                _obj.t010 = strCsl5;
                _obj.t011 = strSw5;
               // _obj.t012 = SJJG;这个待确定
                // _obj.t012 = SJJG;这个待确定
                return _obj;
            }
            return null;
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkStart.cs
@@ -3,6 +3,7 @@
using Newtonsoft.Json;
using System;
using System.Data;
using System.IO;
namespace Gs.DevApp.DevFrm.Work
{
@@ -12,6 +13,8 @@
        /// pc只需要过站
        /// </summary>
        private string isPc = "投入,电检,水检,终检";
        //电检取值路径
        string dianJianPath = "";
        public Frm_WorkStart()
        {
            InitializeComponent();
@@ -35,10 +38,55 @@
            }
            string fGx = txt_gx.Text.Trim();
            string fBc = txt_bc.Text.Trim();
            Frm_Work01 frm = new Frm_Work01(fGx, fBc);
            //如果是电检
            if (fGx == "G002:电检")
            {
                if (!getConfigDianJian())
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowError("读取【G002:电检】置文件失败,请联系管理员!");
                    return;
                }
            }
            Frm_Work01 frm = new Frm_Work01(fGx, fBc,dianJianPath);
            frm.ShowDialog();
        }
        /// <summary>
        /// 先读取电检配置
        /// </summary>
        /// <returns></returns>
        private bool getConfigDianJian()
        {
            //这是电检数据的路径
            string _where = " and 1=1 and  defect_code='7001'";
            var pgq = new PageQueryModel(1, 999999, "a.defect_code", "asc", "", _where);
            var json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", "MesDefectCodeManager/GetListPage", json);
                var dd = UtilityHelper.ReturnToTablePage(strReturn);
                var dt = dd.rtnData.list;
                if (dt != null && dt.Rows.Count > 0)
                {
                    dianJianPath = dt.Rows[0]["defectName"].ToString();
                    if (File.Exists(dianJianPath))
                    {
                        return true;
                    }
                    else
                    {
                        return false;
                    }
                }
                return false;
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
                return false;
            }
        }
        /// <summary>
        /// 读取工序下拉
DevApp/Gs.DevApp/DevFrm/Work/Frm_WorkTechnique.cs
@@ -294,6 +294,12 @@
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请输入正确的重量下限!");
                txt_fMinWeight.Focus(); return;
            }
            //上限不能低于下限
            if (decimal.Parse(txt_fMaxWeight.Text.Trim()) < decimal.Parse(txt_fMinWeight.Text.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.ShowInformation("上限不能低于下限!");
                txt_fMaxWeight.Focus(); return;
            }
            var _obj = new
            {
                guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()), //主建