巡检修改

cnf

2 天以前 0334863f023a5fe98698992dbd37ab84d3c7b413

巡检修改

 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJianDetect01.cs

@@ -229,9 +229,10 @@
        {
            gcMain1.DataSource = null; 
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
            _sbSqlWhere.Append(" and bm.FSubsidiary in");
            _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            _sbSqlWhere.Append("");
            //_sbSqlWhere.Append(" and bm.FSubsidiary in");
            //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
            //_sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs

@@ -286,6 +286,7 @@
            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
            this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -524,6 +525,7 @@
            this.gridColumn5,
            this.gridColumn7,
            this.gridColumn10,
            this.gridColumn8,
            this.gridColumn12,
            this.gridColumn6,
            this.gridColumn27,
@@ -589,7 +591,7 @@
            // gridColumn10
            // 
            this.gridColumn10.Caption = "首检合格";
            this.gridColumn10.FieldName = "isSj";
            this.gridColumn10.FieldName = "sjhgbs";
            this.gridColumn10.MaxWidth = 44;
            this.gridColumn10.MinWidth = 44;
            this.gridColumn10.Name = "gridColumn10";
@@ -601,13 +603,13 @@
            // gridColumn12
            // 
            this.gridColumn12.Caption = "FQC合格";
            this.gridColumn12.FieldName = "fqcHg";
            this.gridColumn12.FieldName = "fqchgbs";
            this.gridColumn12.MaxWidth = 44;
            this.gridColumn12.MinWidth = 44;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.Tag = "query_a.jabs";
            this.gridColumn12.Visible = true;
            this.gridColumn12.VisibleIndex = 3;
            this.gridColumn12.VisibleIndex = 4;
            this.gridColumn12.Width = 44;
            // 
            // gridColumn6
@@ -619,7 +621,7 @@
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Tag = "query_a.jabs";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 4;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 44;
            // 
            // gridColumn27
@@ -629,7 +631,7 @@
            this.gridColumn27.MinWidth = 22;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 6;
            this.gridColumn27.VisibleIndex = 7;
            this.gridColumn27.Width = 82;
            // 
            // gv_daa018
@@ -642,7 +644,7 @@
            this.gv_daa018.OptionsColumn.AllowEdit = false;
            this.gv_daa018.Tag = "query_a.daa018";
            this.gv_daa018.Visible = true;
            this.gv_daa018.VisibleIndex = 5;
            this.gv_daa018.VisibleIndex = 6;
            this.gv_daa018.Width = 79;
            // 
            // gridColoun100
@@ -653,7 +655,7 @@
            this.gridColoun100.Name = "gridColoun100";
            this.gridColoun100.Tag = "org.fnamber";
            this.gridColoun100.Visible = true;
            this.gridColoun100.VisibleIndex = 28;
            this.gridColoun100.VisibleIndex = 29;
            this.gridColoun100.Width = 219;
            // 
            // gv_daa001
@@ -666,7 +668,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 = 8;
            this.gv_daa001.Width = 105;
            // 
            // gv_daa021
@@ -679,7 +681,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 = 9;
            this.gv_daa021.Width = 87;
            // 
            // gridColumn3
@@ -689,7 +691,7 @@
            this.gridColumn3.MinWidth = 44;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 9;
            this.gridColumn3.VisibleIndex = 10;
            this.gridColumn3.Width = 82;
            // 
            // gv_daa003
@@ -702,7 +704,7 @@
            this.gv_daa003.OptionsColumn.AllowEdit = false;
            this.gv_daa003.Tag = "query_a.daa003";
            this.gv_daa003.Visible = true;
            this.gv_daa003.VisibleIndex = 10;
            this.gv_daa003.VisibleIndex = 11;
            this.gv_daa003.Width = 131;
            // 
            // gv_daa004
@@ -715,7 +717,7 @@
            this.gv_daa004.OptionsColumn.AllowEdit = false;
            this.gv_daa004.Tag = "query_a.daa004";
            this.gv_daa004.Visible = true;
            this.gv_daa004.VisibleIndex = 11;
            this.gv_daa004.VisibleIndex = 12;
            this.gv_daa004.Width = 131;
            // 
            // gv_daa008
@@ -729,7 +731,7 @@
            this.gv_daa008.OptionsColumn.AllowEdit = false;
            this.gv_daa008.Tag = "query_a.daa008";
            this.gv_daa008.Visible = true;
            this.gv_daa008.VisibleIndex = 12;
            this.gv_daa008.VisibleIndex = 13;
            this.gv_daa008.Width = 44;
            // 
            // gv_daa011
@@ -743,7 +745,7 @@
            this.gv_daa011.OptionsColumn.AllowEdit = false;
            this.gv_daa011.Tag = "query_a.daa011";
            this.gv_daa011.Visible = true;
            this.gv_daa011.VisibleIndex = 13;
            this.gv_daa011.VisibleIndex = 14;
            this.gv_daa011.Width = 44;
            // 
            // gridColumn4
@@ -758,7 +760,7 @@
            this.gridColumn4.MinWidth = 44;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 14;
            this.gridColumn4.VisibleIndex = 15;
            this.gridColumn4.Width = 44;
            // 
            // gv_daa010
@@ -772,7 +774,7 @@
            this.gv_daa010.OptionsColumn.AllowEdit = false;
            this.gv_daa010.Tag = "query_a.daa010";
            this.gv_daa010.Visible = true;
            this.gv_daa010.VisibleIndex = 16;
            this.gv_daa010.VisibleIndex = 17;
            this.gv_daa010.Width = 44;
            // 
            // gv_daa005
@@ -786,7 +788,7 @@
            this.gv_daa005.OptionsColumn.AllowEdit = false;
            this.gv_daa005.Tag = "query_a.daa005";
            this.gv_daa005.Visible = true;
            this.gv_daa005.VisibleIndex = 17;
            this.gv_daa005.VisibleIndex = 18;
            this.gv_daa005.Width = 44;
            // 
            // gv_cust
@@ -807,7 +809,7 @@
            this.gridColumn1.MinWidth = 44;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 18;
            this.gridColumn1.VisibleIndex = 19;
            this.gridColumn1.Width = 82;
            // 
            // gv_daa015
@@ -820,7 +822,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 = 20;
            this.gv_daa015.Width = 82;
            // 
            // gv_daa009
@@ -833,7 +835,7 @@
            this.gv_daa009.OptionsColumn.AllowEdit = false;
            this.gv_daa009.Tag = "query_a.daa009";
            this.gv_daa009.Visible = true;
            this.gv_daa009.VisibleIndex = 15;
            this.gv_daa009.VisibleIndex = 16;
            this.gv_daa009.Width = 82;
            // 
            // gv_prepareTime
@@ -868,7 +870,7 @@
            this.gv_daa016.OptionsColumn.AllowEdit = false;
            this.gv_daa016.Tag = "query_a.daa016";
            this.gv_daa016.Visible = true;
            this.gv_daa016.VisibleIndex = 20;
            this.gv_daa016.VisibleIndex = 21;
            this.gv_daa016.Width = 157;
            // 
            // gv_daa017
@@ -881,7 +883,7 @@
            this.gv_daa017.OptionsColumn.AllowEdit = false;
            this.gv_daa017.Tag = "query_a.daa017";
            this.gv_daa017.Visible = true;
            this.gv_daa017.VisibleIndex = 21;
            this.gv_daa017.VisibleIndex = 22;
            this.gv_daa017.Width = 157;
            // 
            // gv_mesStartProd
@@ -894,7 +896,7 @@
            this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
            this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
            this.gv_mesStartProd.Visible = true;
            this.gv_mesStartProd.VisibleIndex = 22;
            this.gv_mesStartProd.VisibleIndex = 23;
            this.gv_mesStartProd.Width = 157;
            // 
            // gv_mesEndProd
@@ -907,7 +909,7 @@
            this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
            this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
            this.gv_mesEndProd.Visible = true;
            this.gv_mesEndProd.VisibleIndex = 23;
            this.gv_mesEndProd.VisibleIndex = 24;
            this.gv_mesEndProd.Width = 157;
            // 
            // gridColumn21
@@ -917,7 +919,7 @@
            this.gridColumn21.MinWidth = 22;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 24;
            this.gridColumn21.VisibleIndex = 25;
            this.gridColumn21.Width = 82;
            // 
            // gridColumn22
@@ -927,7 +929,7 @@
            this.gridColumn22.MinWidth = 22;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 25;
            this.gridColumn22.VisibleIndex = 26;
            this.gridColumn22.Width = 82;
            // 
            // gridColumn23
@@ -945,7 +947,7 @@
            this.gridColumn24.MinWidth = 22;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 26;
            this.gridColumn24.VisibleIndex = 27;
            this.gridColumn24.Width = 82;
            // 
            // gridColumn25
@@ -955,7 +957,7 @@
            this.gridColumn25.MinWidth = 22;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 27;
            this.gridColumn25.VisibleIndex = 28;
            this.gridColumn25.Width = 82;
            // 
            // pageBar1
@@ -2055,12 +2057,12 @@
            // 
            this.layShuLiang.Controls.Add(this.txt_iCount_1);
            this.layShuLiang.Controls.Add(this.txt_yuliang_1);
            this.layShuLiang.Location = new System.Drawing.Point(574, 40);
            this.layShuLiang.Location = new System.Drawing.Point(580, 40);
            this.layShuLiang.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            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(277, 24);
            this.layShuLiang.Size = new System.Drawing.Size(280, 24);
            this.layShuLiang.TabIndex = 475;
            this.layShuLiang.Text = "dataLayoutControl1";
            // 
@@ -2070,17 +2072,17 @@
            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(62, 20);
            this.txt_iCount_1.Size = new System.Drawing.Size(64, 20);
            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(212, 2);
            this.txt_yuliang_1.Location = new System.Drawing.Point(214, 2);
            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(63, 20);
            this.txt_yuliang_1.Size = new System.Drawing.Size(64, 20);
            this.txt_yuliang_1.StyleController = this.layShuLiang;
            this.txt_yuliang_1.TabIndex = 6;
            // 
@@ -2105,7 +2107,7 @@
            this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition7});
            this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlGroup3.Size = new System.Drawing.Size(277, 24);
            this.layoutControlGroup3.Size = new System.Drawing.Size(280, 24);
            this.layoutControlGroup3.TextVisible = false;
            // 
            // layoutControlItem25
@@ -2113,7 +2115,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(138, 24);
            this.layoutControlItem25.Size = new System.Drawing.Size(140, 24);
            this.layoutControlItem25.Text = "打印整张数";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 14);
            // 
@@ -2121,16 +2123,16 @@
            // 
            this.layoutControlItem39.Control = this.txt_yuliang_1;
            this.layoutControlItem39.CustomizationFormText = "打印余数";
            this.layoutControlItem39.Location = new System.Drawing.Point(138, 0);
            this.layoutControlItem39.Location = new System.Drawing.Point(140, 0);
            this.layoutControlItem39.Name = "layoutControlItem39";
            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem39.Size = new System.Drawing.Size(139, 24);
            this.layoutControlItem39.Size = new System.Drawing.Size(140, 24);
            this.layoutControlItem39.Text = "打印余数";
            this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 14);
            // 
            // radOut
            // 
            this.radOut.Location = new System.Drawing.Point(853, 10);
            this.radOut.Location = new System.Drawing.Point(862, 10);
            this.radOut.Margin = new System.Windows.Forms.Padding(0);
            this.radOut.Name = "radOut";
            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2139,7 +2141,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(281, 28);
            this.radOut.Size = new System.Drawing.Size(284, 28);
            this.radOut.StyleController = this.layoutMx99;
            this.radOut.TabIndex = 473;
            // 
@@ -2147,31 +2149,31 @@
            // 
            this.ucBtnPrint1.allClickKey = null;
            this.ucBtnPrint1.guidKey = null;
            this.ucBtnPrint1.Location = new System.Drawing.Point(853, 38);
            this.ucBtnPrint1.Location = new System.Drawing.Point(862, 38);
            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint1.Name = "ucBtnPrint1";
            this.ucBtnPrint1.rptParameter = null;
            this.ucBtnPrint1.Size = new System.Drawing.Size(281, 28);
            this.ucBtnPrint1.Size = new System.Drawing.Size(284, 28);
            this.ucBtnPrint1.TabIndex = 464;
            // 
            // txt_psnQty_1
            // 
            this.txt_psnQty_1.Location = new System.Drawing.Point(646, 12);
            this.txt_psnQty_1.Location = new System.Drawing.Point(652, 12);
            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            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(205, 20);
            this.txt_psnQty_1.Size = new System.Drawing.Size(208, 20);
            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(365, 40);
            this.txt_printRemark.Location = new System.Drawing.Point(368, 40);
            this.txt_printRemark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_printRemark.Name = "txt_printRemark";
            this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
            this.txt_printRemark.Size = new System.Drawing.Size(205, 20);
            this.txt_printRemark.Size = new System.Drawing.Size(208, 20);
            this.txt_printRemark.StyleController = this.layoutMx99;
            this.txt_printRemark.TabIndex = 334;
            this.txt_printRemark.Tag = "readOnly-1";
@@ -2179,12 +2181,12 @@
            // txt_kQty
            // 
            this.txt_kQty.EditValue = "";
            this.txt_kQty.Location = new System.Drawing.Point(365, 12);
            this.txt_kQty.Location = new System.Drawing.Point(368, 12);
            this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            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(205, 20);
            this.txt_kQty.Size = new System.Drawing.Size(208, 20);
            this.txt_kQty.StyleController = this.layoutMx99;
            this.txt_kQty.TabIndex = 472;
            this.txt_kQty.Tag = "readonly";
@@ -2196,7 +2198,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(205, 20);
            this.txt_yQty.Size = new System.Drawing.Size(208, 20);
            this.txt_yQty.StyleController = this.layoutMx99;
            this.txt_yQty.TabIndex = 470;
            this.txt_yQty.Tag = "readonly";
@@ -2207,7 +2209,7 @@
            this.txt_zQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_zQty.Name = "txt_zQty";
            this.txt_zQty.Properties.ReadOnly = true;
            this.txt_zQty.Size = new System.Drawing.Size(205, 20);
            this.txt_zQty.Size = new System.Drawing.Size(208, 20);
            this.txt_zQty.StyleController = this.layoutMx99;
            this.txt_zQty.TabIndex = 474;
            // 
@@ -2235,7 +2237,7 @@
            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition10.Width = 100D;
            columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
            columnDefinition11.Width = 281D;
            columnDefinition11.Width = 286D;
            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition7,
            columnDefinition8,
@@ -2249,7 +2251,7 @@
            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition8,
            rowDefinition9});
            this.layoutControlGroup1.Size = new System.Drawing.Size(1425, 76);
            this.layoutControlGroup1.Size = new System.Drawing.Size(1442, 76);
            this.layoutControlGroup1.TextVisible = false;
            // 
            // layoutControlItem23
@@ -2257,21 +2259,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(281, 0);
            this.layoutControlItem23.Location = new System.Drawing.Point(284, 0);
            this.layoutControlItem23.Name = "layoutControlItem23";
            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem23.Size = new System.Drawing.Size(281, 28);
            this.layoutControlItem23.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem23.Text = "可打印数量";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 14);
            // 
            // layoutControlItem35
            // 
            this.layoutControlItem35.Control = this.radOut;
            this.layoutControlItem35.Location = new System.Drawing.Point(843, 0);
            this.layoutControlItem35.Location = new System.Drawing.Point(852, 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(281, 28);
            this.layoutControlItem35.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem35.Text = "自动计算";
            this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem35.TextVisible = false;
@@ -2281,12 +2283,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(843, 28);
            this.layoutControlItem26.Location = new System.Drawing.Point(852, 28);
            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(281, 28);
            this.layoutControlItem26.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem26.Text = "托板打印";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem26.TextVisible = false;
@@ -2299,18 +2301,18 @@
            this.layoutControlItem22.Location = new System.Drawing.Point(0, 28);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem22.Size = new System.Drawing.Size(281, 28);
            this.layoutControlItem22.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem22.Text = "已打印数量";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 14);
            // 
            // layoutControlItem21
            // 
            this.layoutControlItem21.Control = this.txt_printRemark;
            this.layoutControlItem21.Location = new System.Drawing.Point(281, 28);
            this.layoutControlItem21.Location = new System.Drawing.Point(284, 28);
            this.layoutControlItem21.Name = "layoutControlItem21";
            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem21.Size = new System.Drawing.Size(281, 28);
            this.layoutControlItem21.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem21.Text = "打印备注";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 14);
            // 
@@ -2320,21 +2322,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(562, 0);
            this.layoutControlItem24.Location = new System.Drawing.Point(568, 0);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem24.Size = new System.Drawing.Size(281, 28);
            this.layoutControlItem24.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem24.Text = "内包装数量";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 14);
            // 
            // layoutControlItem38
            // 
            this.layoutControlItem38.Control = this.layShuLiang;
            this.layoutControlItem38.Location = new System.Drawing.Point(562, 28);
            this.layoutControlItem38.Location = new System.Drawing.Point(568, 28);
            this.layoutControlItem38.Name = "layoutControlItem38";
            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem38.Size = new System.Drawing.Size(281, 28);
            this.layoutControlItem38.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem38.Text = "打印数量";
            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem38.TextVisible = false;
@@ -2344,7 +2346,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(281, 28);
            this.layoutControlItem36.Size = new System.Drawing.Size(284, 28);
            this.layoutControlItem36.Text = "工单总量";
            this.layoutControlItem36.TextSize = new System.Drawing.Size(60, 14);
            // 
@@ -2632,48 +2634,48 @@
            // 
            this.ucBtnPrint98.allClickKey = null;
            this.ucBtnPrint98.guidKey = null;
            this.ucBtnPrint98.Location = new System.Drawing.Point(1180, 10);
            this.ucBtnPrint98.Location = new System.Drawing.Point(1195, 10);
            this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
            this.ucBtnPrint98.Name = "ucBtnPrint98";
            this.ucBtnPrint98.rptParameter = null;
            this.ucBtnPrint98.Size = new System.Drawing.Size(235, 24);
            this.ucBtnPrint98.Size = new System.Drawing.Size(237, 24);
            this.ucBtnPrint98.TabIndex = 8;
            // 
            // txt_yQty98
            // 
            this.txt_yQty98.Location = new System.Drawing.Point(330, 12);
            this.txt_yQty98.Location = new System.Drawing.Point(333, 12);
            this.txt_yQty98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_yQty98.Name = "txt_yQty98";
            this.txt_yQty98.Properties.ReadOnly = true;
            this.txt_yQty98.Size = new System.Drawing.Size(146, 20);
            this.txt_yQty98.Size = new System.Drawing.Size(149, 20);
            this.txt_yQty98.StyleController = this.layoutMx98;
            this.txt_yQty98.TabIndex = 4;
            // 
            // txt_kQty98
            // 
            this.txt_kQty98.Location = new System.Drawing.Point(564, 12);
            this.txt_kQty98.Location = new System.Drawing.Point(570, 12);
            this.txt_kQty98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_kQty98.Name = "txt_kQty98";
            this.txt_kQty98.Properties.ReadOnly = true;
            this.txt_kQty98.Size = new System.Drawing.Size(146, 20);
            this.txt_kQty98.Size = new System.Drawing.Size(149, 20);
            this.txt_kQty98.StyleController = this.layoutMx98;
            this.txt_kQty98.TabIndex = 5;
            // 
            // txt_printRemark98
            // 
            this.txt_printRemark98.Location = new System.Drawing.Point(798, 12);
            this.txt_printRemark98.Location = new System.Drawing.Point(807, 12);
            this.txt_printRemark98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_printRemark98.Name = "txt_printRemark98";
            this.txt_printRemark98.Size = new System.Drawing.Size(146, 20);
            this.txt_printRemark98.Size = new System.Drawing.Size(149, 20);
            this.txt_printRemark98.StyleController = this.layoutMx98;
            this.txt_printRemark98.TabIndex = 6;
            // 
            // txt_iCount_98
            // 
            this.txt_iCount_98.Location = new System.Drawing.Point(1032, 12);
            this.txt_iCount_98.Location = new System.Drawing.Point(1044, 12);
            this.txt_iCount_98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_iCount_98.Name = "txt_iCount_98";
            this.txt_iCount_98.Size = new System.Drawing.Size(146, 20);
            this.txt_iCount_98.Size = new System.Drawing.Size(149, 20);
            this.txt_iCount_98.StyleController = this.layoutMx98;
            this.txt_iCount_98.TabIndex = 7;
            // 
@@ -2683,7 +2685,7 @@
            this.txt_zQty98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_zQty98.Name = "txt_zQty98";
            this.txt_zQty98.Properties.ReadOnly = true;
            this.txt_zQty98.Size = new System.Drawing.Size(146, 20);
            this.txt_zQty98.Size = new System.Drawing.Size(149, 20);
            this.txt_zQty98.StyleController = this.layoutMx98;
            this.txt_zQty98.TabIndex = 9;
            // 
@@ -2723,17 +2725,17 @@
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition10});
            this.layoutControlGroup2.Size = new System.Drawing.Size(1425, 44);
            this.layoutControlGroup2.Size = new System.Drawing.Size(1442, 44);
            this.layoutControlGroup2.TextVisible = false;
            // 
            // layoutControlItem34
            // 
            this.layoutControlItem34.Control = this.ucBtnPrint98;
            this.layoutControlItem34.Location = new System.Drawing.Point(1170, 0);
            this.layoutControlItem34.Location = new System.Drawing.Point(1185, 0);
            this.layoutControlItem34.Name = "layoutControlItem34";
            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
            this.layoutControlItem34.Size = new System.Drawing.Size(235, 24);
            this.layoutControlItem34.Size = new System.Drawing.Size(237, 24);
            this.layoutControlItem34.Text = "打印按钮";
            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem34.TextVisible = false;
@@ -2741,40 +2743,40 @@
            // layoutControlItem33
            // 
            this.layoutControlItem33.Control = this.txt_iCount_98;
            this.layoutControlItem33.Location = new System.Drawing.Point(936, 0);
            this.layoutControlItem33.Location = new System.Drawing.Point(948, 0);
            this.layoutControlItem33.Name = "layoutControlItem33";
            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
            this.layoutControlItem33.Size = new System.Drawing.Size(234, 24);
            this.layoutControlItem33.Size = new System.Drawing.Size(237, 24);
            this.layoutControlItem33.Text = "本次打印张数";
            this.layoutControlItem33.TextSize = new System.Drawing.Size(72, 14);
            // 
            // layoutControlItem32
            // 
            this.layoutControlItem32.Control = this.txt_printRemark98;
            this.layoutControlItem32.Location = new System.Drawing.Point(702, 0);
            this.layoutControlItem32.Location = new System.Drawing.Point(711, 0);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem32.Size = new System.Drawing.Size(234, 24);
            this.layoutControlItem32.Size = new System.Drawing.Size(237, 24);
            this.layoutControlItem32.Text = "打印备注";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 14);
            // 
            // layoutControlItem31
            // 
            this.layoutControlItem31.Control = this.txt_kQty98;
            this.layoutControlItem31.Location = new System.Drawing.Point(468, 0);
            this.layoutControlItem31.Location = new System.Drawing.Point(474, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem31.Size = new System.Drawing.Size(234, 24);
            this.layoutControlItem31.Size = new System.Drawing.Size(237, 24);
            this.layoutControlItem31.Text = "可打印数量";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 14);
            // 
            // layoutControlItem30
            // 
            this.layoutControlItem30.Control = this.txt_yQty98;
            this.layoutControlItem30.Location = new System.Drawing.Point(234, 0);
            this.layoutControlItem30.Location = new System.Drawing.Point(237, 0);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem30.Size = new System.Drawing.Size(234, 24);
            this.layoutControlItem30.Size = new System.Drawing.Size(237, 24);
            this.layoutControlItem30.Text = "已打印数量";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(72, 14);
            // 
@@ -2783,7 +2785,7 @@
            this.layoutControlItem37.Control = this.txt_zQty98;
            this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem37.Name = "layoutControlItem37";
            this.layoutControlItem37.Size = new System.Drawing.Size(234, 24);
            this.layoutControlItem37.Size = new System.Drawing.Size(237, 24);
            this.layoutControlItem37.Text = "工单总量";
            this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 14);
            // 
@@ -2976,17 +2978,17 @@
            // 
            this.ucBtnPrint100.allClickKey = null;
            this.ucBtnPrint100.guidKey = null;
            this.ucBtnPrint100.Location = new System.Drawing.Point(1029, 10);
            this.ucBtnPrint100.Location = new System.Drawing.Point(1042, 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(255, 26);
            this.ucBtnPrint100.Size = new System.Drawing.Size(259, 26);
            this.ucBtnPrint100.TabIndex = 0;
            // 
            // btnIn
            // 
            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
            this.btnIn.Location = new System.Drawing.Point(1286, 12);
            this.btnIn.Location = new System.Drawing.Point(1303, 12);
            this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.btnIn.Name = "btnIn";
            this.btnIn.Size = new System.Drawing.Size(127, 22);
@@ -3000,36 +3002,36 @@
            this.txt_zQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_zQty100.Name = "txt_zQty100";
            this.txt_zQty100.Properties.ReadOnly = true;
            this.txt_zQty100.Size = new System.Drawing.Size(166, 20);
            this.txt_zQty100.Size = new System.Drawing.Size(170, 20);
            this.txt_zQty100.StyleController = this.layMx100;
            this.txt_zQty100.TabIndex = 4;
            // 
            // txt_yQty100
            // 
            this.txt_yQty100.Location = new System.Drawing.Point(350, 12);
            this.txt_yQty100.Location = new System.Drawing.Point(354, 12);
            this.txt_yQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_yQty100.Name = "txt_yQty100";
            this.txt_yQty100.Properties.ReadOnly = true;
            this.txt_yQty100.Size = new System.Drawing.Size(167, 20);
            this.txt_yQty100.Size = new System.Drawing.Size(170, 20);
            this.txt_yQty100.StyleController = this.layMx100;
            this.txt_yQty100.TabIndex = 5;
            // 
            // txt_kQty100
            // 
            this.txt_kQty100.Location = new System.Drawing.Point(605, 12);
            this.txt_kQty100.Location = new System.Drawing.Point(612, 12);
            this.txt_kQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_kQty100.Name = "txt_kQty100";
            this.txt_kQty100.Properties.ReadOnly = true;
            this.txt_kQty100.Size = new System.Drawing.Size(167, 20);
            this.txt_kQty100.Size = new System.Drawing.Size(170, 20);
            this.txt_kQty100.StyleController = this.layMx100;
            this.txt_kQty100.TabIndex = 6;
            // 
            // txt_iCount_100
            // 
            this.txt_iCount_100.Location = new System.Drawing.Point(860, 12);
            this.txt_iCount_100.Location = new System.Drawing.Point(870, 12);
            this.txt_iCount_100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.txt_iCount_100.Name = "txt_iCount_100";
            this.txt_iCount_100.Size = new System.Drawing.Size(167, 20);
            this.txt_iCount_100.Size = new System.Drawing.Size(170, 20);
            this.txt_iCount_100.StyleController = this.layMx100;
            this.txt_iCount_100.TabIndex = 7;
            // 
@@ -3069,7 +3071,7 @@
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition11});
            this.layoutControlGroup4.Size = new System.Drawing.Size(1425, 46);
            this.layoutControlGroup4.Size = new System.Drawing.Size(1442, 46);
            this.layoutControlGroup4.TextVisible = false;
            // 
            // layoutControlItem42
@@ -3077,17 +3079,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(254, 26);
            this.layoutControlItem42.Size = new System.Drawing.Size(258, 26);
            this.layoutControlItem42.Text = "工单总量";
            this.layoutControlItem42.TextSize = new System.Drawing.Size(72, 14);
            // 
            // layoutControlItem43
            // 
            this.layoutControlItem43.Control = this.txt_yQty100;
            this.layoutControlItem43.Location = new System.Drawing.Point(254, 0);
            this.layoutControlItem43.Location = new System.Drawing.Point(258, 0);
            this.layoutControlItem43.Name = "layoutControlItem43";
            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem43.Size = new System.Drawing.Size(255, 26);
            this.layoutControlItem43.Size = new System.Drawing.Size(258, 26);
            this.layoutControlItem43.Text = "已打印数";
            this.layoutControlItem43.TextSize = new System.Drawing.Size(72, 14);
            // 
@@ -3095,17 +3097,17 @@
            // 
            this.layoutControlItem44.Control = this.txt_kQty100;
            this.layoutControlItem44.CustomizationFormText = "可打印数";
            this.layoutControlItem44.Location = new System.Drawing.Point(509, 0);
            this.layoutControlItem44.Location = new System.Drawing.Point(516, 0);
            this.layoutControlItem44.Name = "layoutControlItem44";
            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem44.Size = new System.Drawing.Size(255, 26);
            this.layoutControlItem44.Size = new System.Drawing.Size(258, 26);
            this.layoutControlItem44.Text = "可打印数字";
            this.layoutControlItem44.TextSize = new System.Drawing.Size(72, 14);
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.btnIn;
            this.layoutControlItem2.Location = new System.Drawing.Point(1274, 0);
            this.layoutControlItem2.Location = new System.Drawing.Point(1291, 0);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
            this.layoutControlItem2.Size = new System.Drawing.Size(131, 26);
@@ -3116,11 +3118,11 @@
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.ucBtnPrint100;
            this.layoutControlItem10.Location = new System.Drawing.Point(1019, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(1032, 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(255, 26);
            this.layoutControlItem10.Size = new System.Drawing.Size(259, 26);
            this.layoutControlItem10.Text = "打印按钮";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextVisible = false;
@@ -3128,10 +3130,10 @@
            // layoutControlItem45
            // 
            this.layoutControlItem45.Control = this.txt_iCount_100;
            this.layoutControlItem45.Location = new System.Drawing.Point(764, 0);
            this.layoutControlItem45.Location = new System.Drawing.Point(774, 0);
            this.layoutControlItem45.Name = "layoutControlItem45";
            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem45.Size = new System.Drawing.Size(255, 26);
            this.layoutControlItem45.Size = new System.Drawing.Size(258, 26);
            this.layoutControlItem45.Text = "本次打印张数";
            this.layoutControlItem45.TextSize = new System.Drawing.Size(72, 14);
            // 
@@ -3290,6 +3292,14 @@
            this.ucBtnPrint101.rptParameter = null;
            this.ucBtnPrint101.Size = new System.Drawing.Size(203, 25);
            this.ucBtnPrint101.TabIndex = 0;
            // 
            // gridColumn8
            // 
            this.gridColumn8.Caption = "巡检合格";
            this.gridColumn8.FieldName = "xjhgbs";
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 3;
            // 
            // Frm_Womdaa
            // 
@@ -3679,5 +3689,6 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
        private DevExpress.XtraGrid.Columns.GridColumn colChkInt;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
    }
}