质量报表增加冷修

DK.Client/ReportModule/R04/M01/F_RPT_040105.Designer.cs

@@ -97,7 +97,7 @@
             this.dropKilnCode.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.dropKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dropKilnCode.FormattingEnabled = true;
-            this.dropKilnCode.Location = new System.Drawing.Point(575, 18);
+            this.dropKilnCode.Location = new System.Drawing.Point(603, 18);
             this.dropKilnCode.Name = "dropKilnCode";
             this.dropKilnCode.Size = new System.Drawing.Size(133, 20);
             this.dropKilnCode.TabIndex = 6;
@@ -108,7 +108,7 @@
             this.lblKilnCode.BackColor = System.Drawing.SystemColors.Control;
             this.lblKilnCode.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblKilnCode.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblKilnCode.Location = new System.Drawing.Point(517, 22);
+            this.lblKilnCode.Location = new System.Drawing.Point(545, 22);
             this.lblKilnCode.Name = "lblKilnCode";
             this.lblKilnCode.Size = new System.Drawing.Size(53, 12);
             this.lblKilnCode.TabIndex = 5;
@@ -122,7 +122,7 @@
             this.dropRptProcedure.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dropRptProcedure.FormattingEnabled = true;
             this.dropRptProcedure.IsMustInput = true;
-            this.dropRptProcedure.Location = new System.Drawing.Point(179, 18);
+            this.dropRptProcedure.Location = new System.Drawing.Point(207, 18);
             this.dropRptProcedure.Name = "dropRptProcedure";
             this.dropRptProcedure.Size = new System.Drawing.Size(133, 20);
             this.dropRptProcedure.TabIndex = 2;
@@ -133,7 +133,7 @@
             this.lblRptProcedureName.BackColor = System.Drawing.SystemColors.Control;
             this.lblRptProcedureName.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblRptProcedureName.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(155)))), ((int)(((byte)(39)))), ((int)(((byte)(39)))));
-            this.lblRptProcedureName.Location = new System.Drawing.Point(96, 21);
+            this.lblRptProcedureName.Location = new System.Drawing.Point(124, 21);
             this.lblRptProcedureName.Name = "lblRptProcedureName";
             this.lblRptProcedureName.Size = new System.Drawing.Size(77, 12);
             this.lblRptProcedureName.TabIndex = 1;
@@ -185,7 +185,7 @@
             this.dkproductionLineSearchBox.IsEnablePurview = false;
             this.dkproductionLineSearchBox.IsMustInput = false;
             this.dkproductionLineSearchBox.Ispurview = true;
-            this.dkproductionLineSearchBox.Location = new System.Drawing.Point(318, 18);
+            this.dkproductionLineSearchBox.Location = new System.Drawing.Point(346, 18);
             this.dkproductionLineSearchBox.Name = "dkproductionLineSearchBox";
             this.dkproductionLineSearchBox.ProductionLineCode = "";
             this.dkproductionLineSearchBox.ProductionLineID = null;
@@ -204,7 +204,7 @@
             this.lblAccountDateStart.BackColor = System.Drawing.Color.Transparent;
             this.lblAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblAccountDateStart.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateStart.Location = new System.Drawing.Point(119, 49);
+            this.lblAccountDateStart.Location = new System.Drawing.Point(147, 49);
             this.lblAccountDateStart.Name = "lblAccountDateStart";
             this.lblAccountDateStart.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
             this.lblAccountDateStart.Size = new System.Drawing.Size(53, 12);
@@ -217,7 +217,7 @@
             this.lblAccountDateEnd.BackColor = System.Drawing.Color.Transparent;
             this.lblAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblAccountDateEnd.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblAccountDateEnd.Location = new System.Drawing.Point(318, 49);
+            this.lblAccountDateEnd.Location = new System.Drawing.Point(346, 49);
             this.lblAccountDateEnd.Name = "lblAccountDateEnd";
             this.lblAccountDateEnd.Size = new System.Drawing.Size(53, 12);
             this.lblAccountDateEnd.TabIndex = 9;
@@ -228,7 +228,7 @@
             this.dtpAccountDateEnd.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpAccountDateEnd.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpAccountDateEnd.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateEnd.Location = new System.Drawing.Point(376, 44);
+            this.dtpAccountDateEnd.Location = new System.Drawing.Point(404, 44);
             this.dtpAccountDateEnd.Name = "dtpAccountDateEnd";
             this.dtpAccountDateEnd.ShowUpDown = true;
             this.dtpAccountDateEnd.Size = new System.Drawing.Size(133, 21);
@@ -239,7 +239,7 @@
             this.dtpAccountDateStart.CustomFormat = "yyyy-MM-dd HH:mm";
             this.dtpAccountDateStart.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.dtpAccountDateStart.Format = System.Windows.Forms.DateTimePickerFormat.Custom;
-            this.dtpAccountDateStart.Location = new System.Drawing.Point(179, 45);
+            this.dtpAccountDateStart.Location = new System.Drawing.Point(207, 45);
             this.dtpAccountDateStart.Name = "dtpAccountDateStart";
             this.dtpAccountDateStart.ShowUpDown = true;
             this.dtpAccountDateStart.Size = new System.Drawing.Size(133, 21);
@@ -283,7 +283,7 @@
             this.lblGoodsType.BackColor = System.Drawing.SystemColors.Control;
             this.lblGoodsType.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.lblGoodsType.ForeColor = System.Drawing.SystemColors.ControlText;
-            this.lblGoodsType.Location = new System.Drawing.Point(714, 22);
+            this.lblGoodsType.Location = new System.Drawing.Point(742, 22);
             this.lblGoodsType.Name = "lblGoodsType";
             this.lblGoodsType.Size = new System.Drawing.Size(53, 12);
             this.lblGoodsType.TabIndex = 48;
@@ -293,7 +293,7 @@
             // 
             this.scbGoodsType.CheckedData = null;
             this.scbGoodsType.IsOnlyDisplayEnd = false;
-            this.scbGoodsType.Location = new System.Drawing.Point(773, 18);
+            this.scbGoodsType.Location = new System.Drawing.Point(801, 18);
             this.scbGoodsType.Name = "scbGoodsType";
             this.scbGoodsType.Size = new System.Drawing.Size(120, 21);
             this.scbGoodsType.TabIndex = 47;
@@ -303,7 +303,7 @@
             this.chkTestMouldFlag.BackColor = System.Drawing.SystemColors.Control;
             this.chkTestMouldFlag.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("chkTestMouldFlag.BackgroundImage")));
             this.chkTestMouldFlag.FalseText = "否";
-            this.chkTestMouldFlag.Location = new System.Drawing.Point(515, 48);
+            this.chkTestMouldFlag.Location = new System.Drawing.Point(543, 48);
             this.chkTestMouldFlag.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
             this.chkTestMouldFlag.Name = "chkTestMouldFlag";
             this.chkTestMouldFlag.Size = new System.Drawing.Size(130, 16);
@@ -318,9 +318,9 @@
             this.chkAll.Font = new System.Drawing.Font("宋体", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134)));
             this.chkAll.Location = new System.Drawing.Point(12, 20);
             this.chkAll.Name = "chkAll";
-            this.chkAll.Size = new System.Drawing.Size(78, 16);
+            this.chkAll.Size = new System.Drawing.Size(108, 16);
             this.chkAll.TabIndex = 0;
-            this.chkAll.Text = "本烧+重烧";
+            this.chkAll.Text = "本烧+重烧+冷修";
             this.chkAll.UseVisualStyleBackColor = true;
             this.chkAll.CheckedChanged += new System.EventHandler(this.chkAll_CheckedChanged);
             // 

DK.Client/ReportModule/R04/M01/F_RPT_040105.cs

@@ -189,7 +189,6 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
         {
             try
             {
-
                 RPT040105_SE se = new RPT040105_SE();
                 if (this.chkAll.Checked)
                 {
@@ -208,18 +207,29 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                         this.dropRptProcedure.Focus();
                         return null;
                     }
+                    // 增加冷修工序 260320
                     se.RptProcedureID = Convert.ToInt32(this.dropRptProcedure.SelectedValue);
-                    //获取数据来源工序Id
-                    ServiceResultEntity sre0 = this.DoAsync<ServiceResultEntity>(() =>
+                    if (Convert.ToInt32(this.dropRptProcedure.SelectedValue) == 3)
                     {
-                        return ReportModuleProxy.Service.GetRptSourceProcedureModule(se.RptProcedureID);
+                        se.RptSProcedureID = 42;
+                        se.Procedureid = "42";
                     }
-                    );
-                    if (sre0.Data != null && sre0.Data.Tables.Count > 0)
+                    else
                     {
-                        se.RptSProcedureID = int.Parse(sre0.Data.Tables[0].Rows[Constant.INT_IS_ZERO]["Procedureid"].ToString());
-                        se.Procedureid = int.Parse(sre0.Data.Tables[0].Rows[Constant.INT_IS_ZERO]["Procedureid"].ToString()).ToString();
+                        
+                        //获取数据来源工序Id
+                        ServiceResultEntity sre0 = this.DoAsync<ServiceResultEntity>(() =>
+                        {
+                            return ReportModuleProxy.Service.GetRptSourceProcedureModule(se.RptProcedureID);
+                        }
+                        );
+                        if (sre0.Data != null && sre0.Data.Tables.Count > 0)
+                        {
+                            se.RptSProcedureID = int.Parse(sre0.Data.Tables[0].Rows[Constant.INT_IS_ZERO]["Procedureid"].ToString());
+                            se.Procedureid = int.Parse(sre0.Data.Tables[0].Rows[Constant.INT_IS_ZERO]["Procedureid"].ToString()).ToString();
+                        }
                     }
+
                 }
 
                 //获取数据来源工序Id  
@@ -288,8 +298,13 @@ namespace Dongke.IBOSS.PRD.Client.ReportModule
                 return ReportModuleProxy.Service.GetRptProcedureModule();
             }
             );
-
-            this.dropRptProcedure.DataSource = sre1.Data.Tables[Constant.INT_IS_ZERO];
+            // 增加冷修 260320
+            DataTable dtSource  = sre1.Data.Tables[Constant.INT_IS_ZERO];
+            DataRow newRowDt= dtSource.NewRow();
+            newRowDt["Rptprocedureid"] = 3;
+            newRowDt["Rptprocedurename"] = "冷修";
+            dtSource.Rows.Add(newRowDt);
+            this.dropRptProcedure.DataSource = dtSource;
             this.dropRptProcedure.ValueMember = "Rptprocedureid";
             this.dropRptProcedure.DisplayMember = "Rptprocedurename";
 

DK.Service/ReportModuleLogic/ReportModuleLogic.cs

@@ -4570,22 +4570,31 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
             string functionalTesting = "   ";//功能检测 
             if (string.IsNullOrEmpty(se.OutProcedureIDS))
             {
+                // 本烧
                 if (se.RptSProcedureID == 16)
                 {
                     procedureid = " 55, 13  ";
                     functionalTesting = " 60 ";
                     kilproc = " 16 ";
                 }
-                else
+                // 重烧
+                else if (se.RptSProcedureID == 28)
                 {
                     procedureid = "  24 ";
                     functionalTesting = " 61 ";
                     kilproc = " 28 ";
                 }
+                // 冷修
+                else
+                {
+                    procedureid = "  42 ";
+                    functionalTesting = " 61 ";
+                    kilproc = " 28 ";
+                }
             }
             else
             {
-                procedureid = " 55, 13, 24 ";
+                procedureid = " 55, 13, 24, 42  ";
                 functionalTesting = " 61,60 ";
                 kilproc = " 16,28 ";
             } 
@@ -4807,7 +4816,7 @@ namespace Dongke.IBOSS.PRD.Service.ReportModuleLogic
                 selSql.Append("    AND pd28.KilnID = :KilnID\n");
                 parameters.Add(new OracleParameter(":KilnID", OracleDbType.Int32, se.KilnID, ParameterDirection.Input));
             }
-            sqlString = @"  AND pd24.procedureid IN (  " + procedureid + @"  ,42 ) --  重烧质量登记里包含 重烧修补24 / 冷补42 
+            sqlString = @"  AND pd24.procedureid IN (  " + (se.RptSProcedureID == 42?"24":procedureid) + @"  ,42 ) --  重烧质量登记里包含 重烧修补24 / 冷补42 
                           AND pd24.productiondataid < pd28.productiondataid) t
                          WHERE rownums = 1
                            AND t.procedureid IN ( " + procedureid + @"  )) pd