bug
lu
2025-09-18 3b902419f3609fa324f7c91f0f57dfff3f1dc39c
bug
已修改5个文件
已添加2个文件
792 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs 137 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs 24 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs 43 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs 387 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.cs 160 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs 30 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/Ck/UcBlcl.Designer.cs
@@ -610,7 +610,7 @@
            // 
            this.xtraTabPage2.Controls.Add(this.splitMx1);
            this.xtraTabPage2.Name = "xtraTabPage2";
            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
            this.xtraTabPage2.Size = new System.Drawing.Size(1263, 570);
            this.xtraTabPage2.Text = "数据详细";
            // 
            // splitMx1
@@ -630,7 +630,7 @@
            this.splitMx1.Panel2.Controls.Add(this.tabMx);
            this.splitMx1.Panel2.Text = "Panel2";
            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
            this.splitMx1.Size = new System.Drawing.Size(1126, 570);
            this.splitMx1.Size = new System.Drawing.Size(1263, 570);
            this.splitMx1.SplitterPosition = 187;
            this.splitMx1.TabIndex = 0;
            // 
@@ -662,7 +662,7 @@
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(438, 394, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1126, 187);
            this.layoutMx1.Size = new System.Drawing.Size(1263, 187);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
@@ -691,7 +691,7 @@
            this.txt_aboutGuid.IsReadly = false;
            this.txt_aboutGuid.Location = new System.Drawing.Point(89, 111);
            this.txt_aboutGuid.Name = "txt_aboutGuid";
            this.txt_aboutGuid.Size = new System.Drawing.Size(195, 24);
            this.txt_aboutGuid.Size = new System.Drawing.Size(229, 24);
            this.txt_aboutGuid.TabIndex = 283;
            // 
            // txt_orgId
@@ -699,7 +699,7 @@
            this.txt_orgId.IsReadly = false;
            this.txt_orgId.Location = new System.Drawing.Point(89, 78);
            this.txt_orgId.Name = "txt_orgId";
            this.txt_orgId.Size = new System.Drawing.Size(195, 24);
            this.txt_orgId.Size = new System.Drawing.Size(229, 24);
            this.txt_orgId.TabIndex = 289;
            // 
            // txt_bl017
@@ -708,26 +708,26 @@
            this.txt_bl017.Location = new System.Drawing.Point(89, 45);
            this.txt_bl017.Name = "txt_bl017";
            this.txt_bl017.Properties.Appearance.Options.UseFont = true;
            this.txt_bl017.Size = new System.Drawing.Size(195, 24);
            this.txt_bl017.Size = new System.Drawing.Size(229, 24);
            this.txt_bl017.StyleController = this.layoutMx1;
            this.txt_bl017.TabIndex = 287;
            this.txt_bl017.Tag = "readonly";
            // 
            // txt_bl007
            // 
            this.txt_bl007.Location = new System.Drawing.Point(365, 111);
            this.txt_bl007.Location = new System.Drawing.Point(399, 111);
            this.txt_bl007.Name = "txt_bl007";
            this.txt_bl007.Properties.Appearance.Options.UseFont = true;
            this.txt_bl007.Size = new System.Drawing.Size(195, 24);
            this.txt_bl007.Size = new System.Drawing.Size(230, 24);
            this.txt_bl007.StyleController = this.layoutMx1;
            this.txt_bl007.TabIndex = 228;
            // 
            // txt_bl013
            // 
            this.txt_bl013.Location = new System.Drawing.Point(641, 12);
            this.txt_bl013.Location = new System.Drawing.Point(710, 12);
            this.txt_bl013.Name = "txt_bl013";
            this.txt_bl013.Properties.Appearance.Options.UseFont = true;
            this.txt_bl013.Size = new System.Drawing.Size(195, 24);
            this.txt_bl013.Size = new System.Drawing.Size(230, 24);
            this.txt_bl013.StyleController = this.layoutMx1;
            this.txt_bl013.TabIndex = 252;
            this.txt_bl013.Tag = "readonly";
@@ -737,105 +737,105 @@
            this.txt_blNo.Location = new System.Drawing.Point(89, 12);
            this.txt_blNo.Name = "txt_blNo";
            this.txt_blNo.Properties.Appearance.Options.UseFont = true;
            this.txt_blNo.Size = new System.Drawing.Size(195, 24);
            this.txt_blNo.Size = new System.Drawing.Size(229, 24);
            this.txt_blNo.StyleController = this.layoutMx1;
            this.txt_blNo.TabIndex = 211;
            this.txt_blNo.Tag = "readonly";
            // 
            // txt_lineName
            // 
            this.txt_lineName.Location = new System.Drawing.Point(365, 78);
            this.txt_lineName.Location = new System.Drawing.Point(399, 78);
            this.txt_lineName.Name = "txt_lineName";
            this.txt_lineName.Properties.Appearance.Options.UseFont = true;
            this.txt_lineName.Size = new System.Drawing.Size(195, 24);
            this.txt_lineName.Size = new System.Drawing.Size(230, 24);
            this.txt_lineName.StyleController = this.layoutMx1;
            this.txt_lineName.TabIndex = 247;
            this.txt_lineName.Tag = "readonly";
            // 
            // txt_bl006
            // 
            this.txt_bl006.Location = new System.Drawing.Point(917, 111);
            this.txt_bl006.Location = new System.Drawing.Point(1021, 111);
            this.txt_bl006.Name = "txt_bl006";
            this.txt_bl006.Properties.Appearance.Options.UseFont = true;
            this.txt_bl006.Size = new System.Drawing.Size(197, 24);
            this.txt_bl006.Size = new System.Drawing.Size(230, 24);
            this.txt_bl006.StyleController = this.layoutMx1;
            this.txt_bl006.TabIndex = 226;
            this.txt_bl006.Tag = "readonly";
            // 
            // txt_bl015
            // 
            this.txt_bl015.Location = new System.Drawing.Point(641, 111);
            this.txt_bl015.Location = new System.Drawing.Point(710, 111);
            this.txt_bl015.Name = "txt_bl015";
            this.txt_bl015.Properties.Appearance.Options.UseFont = true;
            this.txt_bl015.Size = new System.Drawing.Size(195, 24);
            this.txt_bl015.Size = new System.Drawing.Size(230, 24);
            this.txt_bl015.StyleController = this.layoutMx1;
            this.txt_bl015.TabIndex = 262;
            this.txt_bl015.Tag = "readonly";
            // 
            // txt_dptName
            // 
            this.txt_dptName.Location = new System.Drawing.Point(365, 45);
            this.txt_dptName.Location = new System.Drawing.Point(399, 45);
            this.txt_dptName.Name = "txt_dptName";
            this.txt_dptName.Properties.Appearance.Options.UseFont = true;
            this.txt_dptName.Size = new System.Drawing.Size(195, 24);
            this.txt_dptName.Size = new System.Drawing.Size(230, 24);
            this.txt_dptName.StyleController = this.layoutMx1;
            this.txt_dptName.TabIndex = 243;
            this.txt_dptName.Tag = "readonly";
            // 
            // txt_bl016
            // 
            this.txt_bl016.Location = new System.Drawing.Point(917, 78);
            this.txt_bl016.Location = new System.Drawing.Point(1021, 78);
            this.txt_bl016.Name = "txt_bl016";
            this.txt_bl016.Properties.Appearance.Options.UseFont = true;
            this.txt_bl016.Size = new System.Drawing.Size(197, 24);
            this.txt_bl016.Size = new System.Drawing.Size(230, 24);
            this.txt_bl016.StyleController = this.layoutMx1;
            this.txt_bl016.TabIndex = 267;
            this.txt_bl016.Tag = "readonly";
            // 
            // txt_bl002
            // 
            this.txt_bl002.Location = new System.Drawing.Point(641, 45);
            this.txt_bl002.Location = new System.Drawing.Point(710, 45);
            this.txt_bl002.Name = "txt_bl002";
            this.txt_bl002.Properties.Appearance.Options.UseFont = true;
            this.txt_bl002.Size = new System.Drawing.Size(195, 24);
            this.txt_bl002.Size = new System.Drawing.Size(230, 24);
            this.txt_bl002.StyleController = this.layoutMx1;
            this.txt_bl002.TabIndex = 216;
            this.txt_bl002.Tag = "readonly";
            // 
            // txt_bl014
            // 
            this.txt_bl014.Location = new System.Drawing.Point(641, 78);
            this.txt_bl014.Location = new System.Drawing.Point(710, 78);
            this.txt_bl014.Name = "txt_bl014";
            this.txt_bl014.Properties.Appearance.Options.UseFont = true;
            this.txt_bl014.Size = new System.Drawing.Size(195, 24);
            this.txt_bl014.Size = new System.Drawing.Size(230, 24);
            this.txt_bl014.StyleController = this.layoutMx1;
            this.txt_bl014.TabIndex = 258;
            this.txt_bl014.Tag = "readonly";
            // 
            // txt_bl018
            // 
            this.txt_bl018.Location = new System.Drawing.Point(840, 144);
            this.txt_bl018.Location = new System.Drawing.Point(944, 144);
            this.txt_bl018.Name = "txt_bl018";
            this.txt_bl018.Properties.Caption = "审核标识";
            this.txt_bl018.Size = new System.Drawing.Size(274, 24);
            this.txt_bl018.Size = new System.Drawing.Size(307, 24);
            this.txt_bl018.StyleController = this.layoutMx1;
            this.txt_bl018.TabIndex = 290;
            this.txt_bl018.Tag = "readonly";
            // 
            // txt_tldh
            // 
            this.txt_tldh.Location = new System.Drawing.Point(365, 12);
            this.txt_tldh.Location = new System.Drawing.Point(399, 12);
            this.txt_tldh.Name = "txt_tldh";
            this.txt_tldh.Size = new System.Drawing.Size(195, 24);
            this.txt_tldh.Size = new System.Drawing.Size(230, 24);
            this.txt_tldh.StyleController = this.layoutMx1;
            this.txt_tldh.TabIndex = 291;
            this.txt_tldh.Tag = "readonly";
            // 
            // txt_bl004
            // 
            this.txt_bl004.Location = new System.Drawing.Point(917, 12);
            this.txt_bl004.Location = new System.Drawing.Point(1021, 12);
            this.txt_bl004.Name = "txt_bl004";
            this.txt_bl004.Size = new System.Drawing.Size(197, 24);
            this.txt_bl004.Size = new System.Drawing.Size(230, 24);
            this.txt_bl004.StyleController = this.layoutMx1;
            this.txt_bl004.TabIndex = 292;
            this.txt_bl004.Tag = "readonly";
@@ -843,9 +843,9 @@
            // txt_bl005
            // 
            this.txt_bl005.EditValue = "";
            this.txt_bl005.Location = new System.Drawing.Point(917, 45);
            this.txt_bl005.Location = new System.Drawing.Point(1021, 45);
            this.txt_bl005.Name = "txt_bl005";
            this.txt_bl005.Size = new System.Drawing.Size(197, 24);
            this.txt_bl005.Size = new System.Drawing.Size(230, 24);
            this.txt_bl005.StyleController = this.layoutMx1;
            this.txt_bl005.TabIndex = 293;
            this.txt_bl005.Tag = "readonly";
@@ -916,49 +916,49 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1126, 187);
            this.Root.Size = new System.Drawing.Size(1263, 187);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_bl013;
            this.layoutControlItem12.Location = new System.Drawing.Point(552, 0);
            this.layoutControlItem12.Location = new System.Drawing.Point(621, 0);
            this.layoutControlItem12.Name = "layoutControlItem12";
            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem12.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem12.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem12.Text = "任务单号";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem6
            // 
            this.layoutControlItem6.Control = this.txt_bl002;
            this.layoutControlItem6.Location = new System.Drawing.Point(552, 33);
            this.layoutControlItem6.Location = new System.Drawing.Point(621, 33);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem6.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem6.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem6.Text = "产品编号";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_bl014;
            this.layoutControlItem7.Location = new System.Drawing.Point(552, 66);
            this.layoutControlItem7.Location = new System.Drawing.Point(621, 66);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem7.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem7.Text = "产品名称 ";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem8
            // 
            this.layoutControlItem8.Control = this.txt_bl015;
            this.layoutControlItem8.Location = new System.Drawing.Point(552, 99);
            this.layoutControlItem8.Location = new System.Drawing.Point(621, 99);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem8.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem8.Text = "产品型号";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -966,43 +966,43 @@
            // 
            this.layoutControlItem18.Control = this.txt_bl004;
            this.layoutControlItem18.CustomizationFormText = "申请人员";
            this.layoutControlItem18.Location = new System.Drawing.Point(828, 0);
            this.layoutControlItem18.Location = new System.Drawing.Point(932, 0);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem18.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem18.Text = "申请人员";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_bl006;
            this.layoutControlItem3.Location = new System.Drawing.Point(828, 99);
            this.layoutControlItem3.Location = new System.Drawing.Point(932, 99);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem3.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem3.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem3.Text = "审核日期";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_bl005;
            this.layoutControlItem19.Location = new System.Drawing.Point(828, 33);
            this.layoutControlItem19.Location = new System.Drawing.Point(932, 33);
            this.layoutControlItem19.Name = "layoutControlItem19";
            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem19.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem19.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem19.Text = "申请时间";
            this.layoutControlItem19.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_bl018;
            this.layoutControlItem15.Location = new System.Drawing.Point(828, 132);
            this.layoutControlItem15.Location = new System.Drawing.Point(932, 132);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem15.Size = new System.Drawing.Size(278, 35);
            this.layoutControlItem15.Size = new System.Drawing.Size(311, 35);
            this.layoutControlItem15.Text = "审核标识";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
@@ -1010,11 +1010,11 @@
            // layoutControlItem4
            // 
            this.layoutControlItem4.Control = this.txt_bl016;
            this.layoutControlItem4.Location = new System.Drawing.Point(828, 66);
            this.layoutControlItem4.Location = new System.Drawing.Point(932, 66);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem4.Size = new System.Drawing.Size(278, 33);
            this.layoutControlItem4.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem4.Text = "审核人员";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -1023,7 +1023,7 @@
            this.layoutControlItem1.Control = this.txt_blNo;
            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
            this.layoutControlItem1.Name = "layoutControlItem1";
            this.layoutControlItem1.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem1.Size = new System.Drawing.Size(310, 33);
            this.layoutControlItem1.Text = "单据编号";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -1035,7 +1035,7 @@
            this.layoutControlItem13.MinSize = new System.Drawing.Size(95, 31);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem13.Size = new System.Drawing.Size(276, 35);
            this.layoutControlItem13.Size = new System.Drawing.Size(310, 35);
            this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem13.Text = "选择物料";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
@@ -1047,7 +1047,7 @@
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 99);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem9.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem9.Size = new System.Drawing.Size(310, 33);
            this.layoutControlItem9.Text = "生产工单";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -1057,7 +1057,7 @@
            this.layoutControlItem5.Location = new System.Drawing.Point(0, 66);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem5.Size = new System.Drawing.Size(310, 33);
            this.layoutControlItem5.Text = "生产组织";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -1067,50 +1067,50 @@
            this.layoutControlItem2.Location = new System.Drawing.Point(0, 33);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem2.Size = new System.Drawing.Size(310, 33);
            this.layoutControlItem2.Text = "单据类型";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_tldh;
            this.layoutControlItem17.Location = new System.Drawing.Point(276, 0);
            this.layoutControlItem17.Location = new System.Drawing.Point(310, 0);
            this.layoutControlItem17.Name = "layoutControlItem17";
            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem17.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem17.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem17.Text = "投料单号";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_dptName;
            this.layoutControlItem10.Location = new System.Drawing.Point(276, 33);
            this.layoutControlItem10.Location = new System.Drawing.Point(310, 33);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem10.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem10.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem10.Text = "补料车间";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem11
            // 
            this.layoutControlItem11.Control = this.txt_lineName;
            this.layoutControlItem11.Location = new System.Drawing.Point(276, 66);
            this.layoutControlItem11.Location = new System.Drawing.Point(310, 66);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem11.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem11.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem11.Text = "补料产线";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(65, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_bl007;
            this.layoutControlItem14.Location = new System.Drawing.Point(276, 99);
            this.layoutControlItem14.Location = new System.Drawing.Point(310, 99);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(276, 33);
            this.layoutControlItem14.Size = new System.Drawing.Size(311, 33);
            this.layoutControlItem14.Text = "申请原因";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(65, 18);
            // 
@@ -1120,7 +1120,7 @@
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.Size = new System.Drawing.Size(1126, 371);
            this.tabMx.Size = new System.Drawing.Size(1263, 371);
            this.tabMx.TabIndex = 3;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1});
@@ -1129,7 +1129,7 @@
            // 
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1124, 339);
            this.tabMxPage1.Size = new System.Drawing.Size(1261, 339);
            this.tabMxPage1.Text = "申请明细";
            // 
            // gcMx1
@@ -1140,7 +1140,7 @@
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
            this.repositoryItemButtonEdit1});
            this.gcMx1.Size = new System.Drawing.Size(1124, 339);
            this.gcMx1.Size = new System.Drawing.Size(1261, 339);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
@@ -1168,7 +1168,6 @@
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            // 
            // gvMx1id
DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -66,6 +66,7 @@
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -121,7 +122,6 @@
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -442,7 +442,7 @@
            // gridColumn18
            // 
            this.gridColumn18.Caption = "OA处理状态";
            this.gridColumn18.FieldName = "oaCheckStatusTxt";
            this.gridColumn18.FieldName = "txtColor";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
@@ -458,6 +458,16 @@
            this.gridColumn19.Visible = true;
            this.gridColumn19.VisibleIndex = 9;
            this.gridColumn19.Width = 94;
            //
            // gridColumn20
            //
            this.gridColumn20.Caption = "收料组织";
            this.gridColumn20.FieldName = "fSubsidiary";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 15;
            this.gridColumn20.Width = 94;
            // 
            // pageBar1
            // 
@@ -1078,16 +1088,6 @@
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
            this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
            //
            // gridColumn20
            //
            this.gridColumn20.Caption = "收料组织";
            this.gridColumn20.FieldName = "fSubsidiary";
            this.gridColumn20.MinWidth = 25;
            this.gridColumn20.Name = "gridColumn20";
            this.gridColumn20.Visible = true;
            this.gridColumn20.VisibleIndex = 15;
            this.gridColumn20.Width = 94;
            // 
            // MesQcExceptional
            // 
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhd.Designer.cs
@@ -52,6 +52,7 @@
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
            this.SuspendLayout();
@@ -89,7 +90,8 @@
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10});
            this.gridColumn10,
            this.gridColumn11});
            this.gridView1Report.GridControl = this.gcMain1Report;
            this.gridView1Report.IndicatorWidth = 50;
            this.gridView1Report.Name = "gridView1Report";
@@ -127,7 +129,7 @@
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 7;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 74;
            // 
            // gridColumn2
@@ -137,7 +139,7 @@
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 74;
            // 
            // gridColumn4
@@ -166,38 +168,30 @@
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计={0:0.##}")});
            this.gv_quantity.Tag = "query_a.QUANTITY";
            this.gv_quantity.Visible = true;
            this.gv_quantity.VisibleIndex = 3;
            this.gv_quantity.VisibleIndex = 2;
            this.gv_quantity.Width = 74;
            // 
            // gv_depotId
            // 
            this.gv_depotId.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.AppearanceCell.Options.UseForeColor = true;
            this.gv_depotId.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gv_depotId.AppearanceHeader.Options.UseForeColor = true;
            this.gv_depotId.Caption = "检验状态";
            this.gv_depotId.FieldName = "checkStates";
            this.gv_depotId.FieldName = "txtColor";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 5;
            this.gv_depotId.VisibleIndex = 4;
            this.gv_depotId.Width = 73;
            // 
            // gridColumn6
            // 
            this.gridColumn6.AppearanceCell.ForeColor = System.Drawing.Color.Red;
            this.gridColumn6.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn6.AppearanceHeader.ForeColor = System.Drawing.Color.Red;
            this.gridColumn6.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn6.Caption = "检验结果";
            this.gridColumn6.FieldName = "checkRes";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 6;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 74;
            // 
            // gridColumn1
@@ -233,7 +227,7 @@
            this.gv_ownerType.OptionsColumn.AllowEdit = false;
            this.gv_ownerType.Tag = "query_a.Owner_Type";
            this.gv_ownerType.Visible = true;
            this.gv_ownerType.VisibleIndex = 0;
            this.gv_ownerType.VisibleIndex = 17;
            this.gv_ownerType.Width = 74;
            // 
            // gv_ownerId
@@ -246,7 +240,7 @@
            this.gv_ownerId.OptionsColumn.AllowEdit = false;
            this.gv_ownerId.Tag = "query_a.Owner_Id";
            this.gv_ownerId.Visible = true;
            this.gv_ownerId.VisibleIndex = 1;
            this.gv_ownerId.VisibleIndex = 0;
            this.gv_ownerId.Width = 74;
            // 
            // gridColumn5
@@ -256,7 +250,7 @@
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 2;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 74;
            // 
            // gv_indepUserCode
@@ -296,7 +290,7 @@
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 4;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 77;
            // 
            // gridColumn8
@@ -341,6 +335,16 @@
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            // 
            // gridColumn11
            //
            this.gridColumn11.Caption = "供应商";
            this.gridColumn11.FieldName = "gysName";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 8;
            this.gridColumn11.Width = 94;
            //
            // UcRptCgdhd
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -378,5 +382,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.Designer.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,387 @@
namespace Gs.DevApp.DevFrm.Rpt
{
    partial class UcRptCgdhdPrint
    {
        /// <summary>
        /// Required designer variable.
        /// </summary>
        private System.ComponentModel.IContainer components = null;
        /// <summary>
        /// Clean up any resources being used.
        /// </summary>
        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
        protected override void Dispose(bool disposing)
        {
            if (disposing && (components != null))
            {
                components.Dispose();
            }
            base.Dispose(disposing);
        }
        #region Windows Form Designer generated code
        /// <summary>
        /// Required method for Designer support - do not modify
        /// the contents of this method with the code editor.
        /// </summary>
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            this.gcMain1Report = new DevExpress.XtraGrid.GridControl();
            this.gridView1Report = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gv_guid = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_itemId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_quantity = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_depotSectionsCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerType = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_ownerId = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_indepUserCode = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gv_indepDate = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).BeginInit();
            this.SuspendLayout();
            //
            // gcMain1Report
            //
            this.gcMain1Report.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMain1Report.Location = new System.Drawing.Point(0, 0);
            this.gcMain1Report.MainView = this.gridView1Report;
            this.gcMain1Report.Name = "gcMain1Report";
            this.gcMain1Report.Size = new System.Drawing.Size(1339, 644);
            this.gcMain1Report.TabIndex = 2;
            this.gcMain1Report.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gridView1Report});
            //
            // gridView1Report
            //
            this.gridView1Report.Appearance.Row.Options.UseFont = true;
            this.gridView1Report.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gv_guid,
            this.gv_itemId,
            this.gridColumn3,
            this.gridColumn2,
            this.gridColumn4,
            this.gv_quantity,
            this.gv_depotId,
            this.gridColumn6,
            this.gridColumn1,
            this.gv_depotSectionsCode,
            this.gv_ownerType,
            this.gv_ownerId,
            this.gridColumn5,
            this.gv_indepUserCode,
            this.gv_indepDate,
            this.gridColumn7,
            this.gridColumn8,
            this.gridColumn9,
            this.gridColumn10,
            this.gridColumn11});
            this.gridView1Report.GridControl = this.gcMain1Report;
            this.gridView1Report.IndicatorWidth = 50;
            this.gridView1Report.Name = "gridView1Report";
            this.gridView1Report.OptionsFind.ShowSearchNavButtons = false;
            this.gridView1Report.OptionsView.ShowAutoFilterRow = true;
            this.gridView1Report.OptionsView.ShowFooter = true;
            this.gridView1Report.OptionsView.ShowGroupPanel = false;
            //
            // gv_guid
            //
            this.gv_guid.AppearanceCell.Options.UseFont = true;
            this.gv_guid.Caption = "主键GUID";
            this.gv_guid.FieldName = "guid";
            this.gv_guid.MinWidth = 50;
            this.gv_guid.Name = "gv_guid";
            this.gv_guid.OptionsColumn.AllowEdit = false;
            this.gv_guid.Tag = "query_a.guid";
            this.gv_guid.Width = 94;
            //
            // gv_itemId
            //
            this.gv_itemId.AppearanceCell.Options.UseFont = true;
            this.gv_itemId.Caption = "物料ID ";
            this.gv_itemId.FieldName = "itemId";
            this.gv_itemId.MinWidth = 50;
            this.gv_itemId.Name = "gv_itemId";
            this.gv_itemId.OptionsColumn.AllowEdit = false;
            this.gv_itemId.Tag = "query_a.ITEM_ID";
            this.gv_itemId.Width = 73;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "物料编码";
            this.gridColumn3.FieldName = "itemNo";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 74;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "物料名称";
            this.gridColumn2.FieldName = "itemName";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 74;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "规格型号";
            this.gridColumn4.FieldName = "itemModel";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 9;
            this.gridColumn4.Width = 74;
            //
            // gv_quantity
            //
            this.gv_quantity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gv_quantity.AppearanceCell.Options.UseFont = true;
            this.gv_quantity.AppearanceCell.Options.UseForeColor = true;
            this.gv_quantity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gv_quantity.AppearanceHeader.Options.UseForeColor = true;
            this.gv_quantity.Caption = "收料数量 ";
            this.gv_quantity.FieldName = "quantity";
            this.gv_quantity.MinWidth = 50;
            this.gv_quantity.Name = "gv_quantity";
            this.gv_quantity.OptionsColumn.AllowEdit = false;
            this.gv_quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "合计={0:0.##}")});
            this.gv_quantity.Tag = "query_a.QUANTITY";
            this.gv_quantity.Visible = true;
            this.gv_quantity.VisibleIndex = 2;
            this.gv_quantity.Width = 74;
            //
            // gv_depotId
            //
            this.gv_depotId.AppearanceCell.Options.UseFont = true;
            this.gv_depotId.Caption = "检验状态";
            this.gv_depotId.FieldName = "txtColor";
            this.gv_depotId.MinWidth = 50;
            this.gv_depotId.Name = "gv_depotId";
            this.gv_depotId.OptionsColumn.AllowEdit = false;
            this.gv_depotId.Tag = "query_a.DEPOT_ID";
            this.gv_depotId.Visible = true;
            this.gv_depotId.VisibleIndex = 4;
            this.gv_depotId.Width = 73;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "检验结果";
            this.gridColumn6.FieldName = "checkRes";
            this.gridColumn6.MinWidth = 25;
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 74;
            //
            // gridColumn1
            //
            this.gridColumn1.Caption = "退货";
            this.gridColumn1.FieldName = "returnFlag";
            this.gridColumn1.MinWidth = 25;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 13;
            this.gridColumn1.Width = 74;
            //
            // gv_depotSectionsCode
            //
            this.gv_depotSectionsCode.AppearanceCell.Options.UseFont = true;
            this.gv_depotSectionsCode.Caption = "急料";
            this.gv_depotSectionsCode.FieldName = "urgentFlagTxt";
            this.gv_depotSectionsCode.MinWidth = 50;
            this.gv_depotSectionsCode.Name = "gv_depotSectionsCode";
            this.gv_depotSectionsCode.OptionsColumn.AllowEdit = false;
            this.gv_depotSectionsCode.Tag = "query_a.DEPOT_SECTIONS_CODE";
            this.gv_depotSectionsCode.Visible = true;
            this.gv_depotSectionsCode.VisibleIndex = 10;
            this.gv_depotSectionsCode.Width = 74;
            //
            // gv_ownerType
            //
            this.gv_ownerType.AppearanceCell.Options.UseFont = true;
            this.gv_ownerType.Caption = "收料组织";
            this.gv_ownerType.FieldName = "receivingOrg";
            this.gv_ownerType.MinWidth = 50;
            this.gv_ownerType.Name = "gv_ownerType";
            this.gv_ownerType.OptionsColumn.AllowEdit = false;
            this.gv_ownerType.Tag = "query_a.Owner_Type";
            this.gv_ownerType.Visible = true;
            this.gv_ownerType.VisibleIndex = 17;
            this.gv_ownerType.Width = 74;
            //
            // gv_ownerId
            //
            this.gv_ownerId.AppearanceCell.Options.UseFont = true;
            this.gv_ownerId.Caption = "采购单号";
            this.gv_ownerId.FieldName = "ebeln";
            this.gv_ownerId.MinWidth = 50;
            this.gv_ownerId.Name = "gv_ownerId";
            this.gv_ownerId.OptionsColumn.AllowEdit = false;
            this.gv_ownerId.Tag = "query_a.Owner_Id";
            this.gv_ownerId.Visible = true;
            this.gv_ownerId.VisibleIndex = 0;
            this.gv_ownerId.Width = 74;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "到货单号";
            this.gridColumn5.FieldName = "dhdNo";
            this.gridColumn5.MinWidth = 25;
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 1;
            this.gridColumn5.Width = 74;
            //
            // gv_indepUserCode
            //
            this.gv_indepUserCode.AppearanceCell.Options.UseFont = true;
            this.gv_indepUserCode.Caption = "收货人";
            this.gv_indepUserCode.FieldName = "dhdUser";
            this.gv_indepUserCode.MinWidth = 50;
            this.gv_indepUserCode.Name = "gv_indepUserCode";
            this.gv_indepUserCode.OptionsColumn.AllowEdit = false;
            this.gv_indepUserCode.Tag = "query_a.INDEP_USER_CODE";
            this.gv_indepUserCode.Visible = true;
            this.gv_indepUserCode.VisibleIndex = 11;
            this.gv_indepUserCode.Width = 74;
            //
            // gv_indepDate
            //
            this.gv_indepDate.AppearanceCell.Options.UseFont = true;
            this.gv_indepDate.Caption = "收货日期 ";
            this.gv_indepDate.FieldName = "dhdDate";
            this.gv_indepDate.MinWidth = 10;
            this.gv_indepDate.Name = "gv_indepDate";
            this.gv_indepDate.OptionsColumn.AllowEdit = false;
            this.gv_indepDate.Tag = "query_a.INDEP_DATE";
            this.gv_indepDate.Visible = true;
            this.gv_indepDate.VisibleIndex = 12;
            this.gv_indepDate.Width = 80;
            //
            // gridColumn7
            //
            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn7.Caption = "收料备注";
            this.gridColumn7.FieldName = "memo";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 3;
            this.gridColumn7.Width = 77;
            //
            // gridColumn8
            //
            this.gridColumn8.Caption = "OA处理意见";
            this.gridColumn8.FieldName = "clyj";
            this.gridColumn8.MinWidth = 25;
            this.gridColumn8.Name = "gridColumn8";
            this.gridColumn8.Visible = true;
            this.gridColumn8.VisibleIndex = 14;
            this.gridColumn8.Width = 77;
            //
            // gridColumn9
            //
            this.gridColumn9.Caption = "OA挑选数量";
            this.gridColumn9.FieldName = "txsl";
            this.gridColumn9.MinWidth = 25;
            this.gridColumn9.Name = "gridColumn9";
            this.gridColumn9.Visible = true;
            this.gridColumn9.VisibleIndex = 15;
            this.gridColumn9.Width = 77;
            //
            // gridColumn10
            //
            this.gridColumn10.Caption = "OA选别类别";
            this.gridColumn10.FieldName = "xblb";
            this.gridColumn10.MinWidth = 25;
            this.gridColumn10.Name = "gridColumn10";
            this.gridColumn10.Visible = true;
            this.gridColumn10.VisibleIndex = 16;
            this.gridColumn10.Width = 88;
            //
            // pageBar1
            //
            this.pageBar1.CurrentPage = 1;
            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
            this.pageBar1.Location = new System.Drawing.Point(0, 644);
            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
            this.pageBar1.Name = "pageBar1";
            this.pageBar1.RecordCount = 0;
            this.pageBar1.Size = new System.Drawing.Size(1339, 38);
            this.pageBar1.TabIndex = 4;
            this.pageBar1.TotalPages = 0;
            //
            // gridColumn11
            //
            this.gridColumn11.Caption = "供应商";
            this.gridColumn11.FieldName = "gysName";
            this.gridColumn11.MinWidth = 25;
            this.gridColumn11.Name = "gridColumn11";
            this.gridColumn11.Visible = true;
            this.gridColumn11.VisibleIndex = 8;
            this.gridColumn11.Width = 94;
            //
            // UcRptCgdhd
            //
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.Controls.Add(this.gcMain1Report);
            this.Controls.Add(this.pageBar1);
            this.Name = "UcRptCgdhd";
            this.Size = new System.Drawing.Size(1339, 682);
            ((System.ComponentModel.ISupportInitialize)(this.gcMain1Report)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView1Report)).EndInit();
            this.ResumeLayout(false);
        }
        #endregion
        private DevExpress.XtraGrid.GridControl gcMain1Report;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView1Report;
        private DevExpress.XtraGrid.Columns.GridColumn gv_guid;
        private DevExpress.XtraGrid.Columns.GridColumn gv_itemId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gv_quantity;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
        private DevExpress.XtraGrid.Columns.GridColumn gv_depotSectionsCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerType;
        private DevExpress.XtraGrid.Columns.GridColumn gv_ownerId;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepUserCode;
        private DevExpress.XtraGrid.Columns.GridColumn gv_indepDate;
        private UserControls.Data.UcPageBar pageBar1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
    }
}
DevApp/Gs.DevApp/DevFrm/Rpt/UcRptCgdhdPrint.cs
¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,160 @@
using DevExpress.Utils.DirectXPaint;
using DevExpress.XtraEditors;
using DevExpress.XtraGrid;
using DevExpress.XtraGrid.Views.Grid;
using DevExpress.XtraLayout;
using Gs.DevApp.Entity;
using Gs.DevApp.ToolBox;
using Gs.DevApp.UserControl;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm.Rpt
{
    public partial class UcRptCgdhdPrint : DevExpress.XtraEditors.XtraUserControl
    {
        string _webServiceName = "MesInvItemArnManager/";
        List<FilterEntity> _filterList = new List<FilterEntity>();
        public UcRptCgdhdPrint()
        {
            InitializeComponent();
        }
        public bool isInitialize = false;
        /// <summary>
        /// è¿™å’Œæ™®é€šé¡µä¸ä¸€æ ·
        /// </summary>
        public void Initialize()
        {
            if (isInitialize)
                return;
            string _formNamespace = this.GetType().FullName;
            List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<GridView>();
            gvList.Add(gridView1Report);
            GridControl gcMain = this.Controls.Find("gcMain1Report", true).OfType<GridControl>().FirstOrDefault();
            UtilityHelper.GetUcXmlConfig(_formNamespace, gvList, gcMain);
            Form parentForm = this.FindForm();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1Report, null, parentForm, "", "", (value) =>
            {
                //  Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
            //Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
            //{
            //    getModel(value);
            //}, (value) =>
            //{
            //    getPageList(this.pageBar1.CurrentPage);
            //}, lbGuid);
            getPageList(1);
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            this.isInitialize = true;
        }
        private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
        {
            _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1Report.Columns, gridView1Report);
            await Task.Delay(100);
            getPageList(1);
        }
        /// <summary>
        /// åˆ†é¡µäº‹ä»¶
        /// </summary>
        /// <param name="curPage"></param>
        /// <param name="pageSize"></param>
        private void PageBar1_PagerEvent(int curPage, int pageSize)
        {
            getPageList(curPage);
        }
        /// <summary>
        /// æŸ¥è¯¢äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        public void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
        {
            gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
            gridView1Report.ActiveFilter.Clear();
            gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
            var frm = new ShowFilter(gridView1Report.Columns, _filterList, this.GetType().FullName);
            frm.UpdateParent += Frm_UpdateParent;
            frm.ShowDialog();
        }
        /// <summary>
        /// æŸ¥è¯¢å›žè°ƒ
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
        {
            _filterList = e.FilterList;
            getPageList(1);
        }
        /// <summary>
        /// åˆ·æ–°äº‹ä»¶
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        public void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
        {
            getPageList(this.pageBar1.CurrentPage);
        }
        /// <summary>
        ///
        /// </summary>
        /// <param name="curPage">第几页</param>
        /// <param name="pageSize">每页几条</param>
        private void getPageList(int curPage)
        {
            gcMain1Report.DataSource = null; var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "a.INDEP_DATE", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
            {
                var strReturn = UtilityHelper.HttpPost("", _webServiceName + "GetListPageReport", json);
                ReturnModel<PageListModel> dd = UtilityHelper.ReturnToTablePage(strReturn);
                if (dd.rtnCode > 0)
                {
                    DataTable dt = dd.rtnData.list;
                    gcMain1Report.BindingContext = new BindingContext();
                    gridView1Report.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
                    if (dt.Rows.Count > 0)
                    {
                        gcMain1Report.DataSource = dt;
                        gcMain1Report.ForceInitialize();
                        gridView1Report.BestFitColumns(); Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gridView1Report);
                    }
                    else
                        UtilityHelper.SetDefaultTable(gcMain1Report, gridView1Report);
                    gridView1Report.ColumnFilterChanged += GridView1_ColumnFilterChanged;
                    pageBar1.TotalPages = dd.rtnData.pages;//总页
                    pageBar1.CurrentPage = curPage;//当前页
                    pageBar1.RecordCount = dd.rtnData.total;//总记录数
                }
                else
                {
                    ToolBox.MsgHelper.ShowError("提示:" + dd.rtnMsg);
                }
            }
            catch (Exception ex)
            {
                ToolBox.MsgHelper.ShowError("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -681,7 +681,7 @@
            this.gridColumn27.MinWidth = 25;
            this.gridColumn27.Name = "gridColumn27";
            this.gridColumn27.Visible = true;
            this.gridColumn27.VisibleIndex = 15;
            this.gridColumn27.VisibleIndex = 17;
            this.gridColumn27.Width = 94;
            // 
            // gv_daa018
@@ -705,7 +705,7 @@
            this.gridColoun100.Name = "gridColoun100";
            this.gridColoun100.Tag = "org.fnamber";
            this.gridColoun100.Visible = true;
            this.gridColoun100.VisibleIndex = 26;
            this.gridColoun100.VisibleIndex = 25;
            this.gridColoun100.Width = 250;
            // 
            // gv_daa001
@@ -731,7 +731,7 @@
            this.gv_daa021.OptionsColumn.AllowEdit = false;
            this.gv_daa021.Tag = "query_a.daa021";
            this.gv_daa021.Visible = true;
            this.gv_daa021.VisibleIndex = 17;
            this.gv_daa021.VisibleIndex = 19;
            this.gv_daa021.Width = 100;
            // 
            // gridColumn3
@@ -767,7 +767,7 @@
            this.gv_daa004.OptionsColumn.AllowEdit = false;
            this.gv_daa004.Tag = "query_a.daa004";
            this.gv_daa004.Visible = true;
            this.gv_daa004.VisibleIndex = 12;
            this.gv_daa004.VisibleIndex = 14;
            this.gv_daa004.Width = 150;
            // 
            // gv_daa008
@@ -824,7 +824,7 @@
            this.gv_daa005.OptionsColumn.AllowEdit = false;
            this.gv_daa005.Tag = "query_a.daa005";
            this.gv_daa005.Visible = true;
            this.gv_daa005.VisibleIndex = 14;
            this.gv_daa005.VisibleIndex = 16;
            this.gv_daa005.Width = 50;
            // 
            // gv_cust
@@ -845,7 +845,7 @@
            this.gridColumn1.MinWidth = 50;
            this.gridColumn1.Name = "gridColumn1";
            this.gridColumn1.Visible = true;
            this.gridColumn1.VisibleIndex = 16;
            this.gridColumn1.VisibleIndex = 18;
            this.gridColumn1.Width = 94;
            // 
            // gv_daa015
@@ -871,7 +871,7 @@
            this.gv_daa009.OptionsColumn.AllowEdit = false;
            this.gv_daa009.Tag = "query_a.daa009";
            this.gv_daa009.Visible = true;
            this.gv_daa009.VisibleIndex = 13;
            this.gv_daa009.VisibleIndex = 15;
            this.gv_daa009.Width = 94;
            // 
            // gv_daa016
@@ -884,7 +884,7 @@
            this.gv_daa016.OptionsColumn.AllowEdit = false;
            this.gv_daa016.Tag = "query_a.daa016";
            this.gv_daa016.Visible = true;
            this.gv_daa016.VisibleIndex = 19;
            this.gv_daa016.VisibleIndex = 21;
            this.gv_daa016.Width = 180;
            // 
            // gv_daa017
@@ -896,8 +896,6 @@
            this.gv_daa017.Name = "gv_daa017";
            this.gv_daa017.OptionsColumn.AllowEdit = false;
            this.gv_daa017.Tag = "query_a.daa017";
            this.gv_daa017.Visible = true;
            this.gv_daa017.VisibleIndex = 20;
            this.gv_daa017.Width = 180;
            // 
            // gv_mesStartProd
@@ -910,7 +908,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 = 21;
            this.gv_mesStartProd.VisibleIndex = 12;
            this.gv_mesStartProd.Width = 180;
            // 
            // gv_mesEndProd
@@ -923,7 +921,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 = 22;
            this.gv_mesEndProd.VisibleIndex = 13;
            this.gv_mesEndProd.Width = 180;
            // 
            // gridColumn21
@@ -933,7 +931,7 @@
            this.gridColumn21.MinWidth = 25;
            this.gridColumn21.Name = "gridColumn21";
            this.gridColumn21.Visible = true;
            this.gridColumn21.VisibleIndex = 23;
            this.gridColumn21.VisibleIndex = 22;
            this.gridColumn21.Width = 94;
            // 
            // gridColumn22
@@ -943,7 +941,7 @@
            this.gridColumn22.MinWidth = 25;
            this.gridColumn22.Name = "gridColumn22";
            this.gridColumn22.Visible = true;
            this.gridColumn22.VisibleIndex = 24;
            this.gridColumn22.VisibleIndex = 23;
            this.gridColumn22.Width = 94;
            // 
            // gridColumn23
@@ -961,7 +959,7 @@
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 25;
            this.gridColumn24.VisibleIndex = 24;
            this.gridColumn24.Width = 94;
            // 
            // gridColumn25
@@ -971,7 +969,7 @@
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 18;
            this.gridColumn25.VisibleIndex = 20;
            this.gridColumn25.Width = 94;
            // 
            // gridColumn52
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -134,7 +134,16 @@
                    return;
                }
                string _msg = "你准备将【" + _collCode + "】变更为不良";
                UcDictionarySelect frm = new UcDictionarySelect("工序不良描述", " a.s_type='工序不良描述' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
                string _type = "";
                if (txt_gx.Text.Trim() == fGxTouRu)
                    _type = "工序G001:投入不良描述";
                if (txt_gx.Text.Trim() == fGxDianJian)
                    _type = "工序G002:电检不良描述";
                if (txt_gx.Text.Trim() == fGxShouJian)
                    _type = "工序G003:水检不良描述";
                if (txt_gx.Text.Trim() == fGxZhongJian)
                    _type = "工序G004:终检不良描述";
                UcDictionarySelect frm = new UcDictionarySelect("工序不良描述", " a.s_type='"+ _type + "' and pid<>'00000000-0000-0000-0000-000000000000'", _msg);
                frm.UpdateParent += (ss, ee) =>
                {
                    System.Text.StringBuilder stringBuilder = new System.Text.StringBuilder();