每窑，除了出窑数所有的列（包括去AA和后面的缺陷）都会随着后期改判（包括复检）的变化而增加或减少，去AA和后面的缺陷是不会随着回收合格而减少 变更前的

wwwroot/Web.config

@@ -13,6 +13,8 @@
   </connectionStrings>
   <appSettings>
     <add key="ProductCheckServer" value="http://10.0.8.2:1234"/>
+	  <!--验厂标识 true:  false： -->
+	<add key="FactoryInspectionFlag" value="false"/> 
   </appSettings>
   <system.web>
     <customErrors mode="Off"/>

wwwroot/mes/rpt/rpt008/rpt.ashx

@@ -137,25 +137,30 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                   FROM (SELECT TP.PRODUCTIONDATAID
                                               ,TP.GROUTINGDAILYDETAILID
                                               ,TP.PROCEDUREID
-                                              ,MAX(PMAX.PRODUCTIONDATAID) AS MAXPRODUCTIONDATAID
+                                              --,MAX(PMAX.PRODUCTIONDATAID) AS MAXPRODUCTIONDATAID
                                           FROM TP_PM_PRODUCTIONDATA TP
-                                          LEFT JOIN TP_PM_PRODUCTIONDATA PMAX
-                                            ON PMAX.GROUTINGDAILYDETAILID = TP.GROUTINGDAILYDETAILID
-                                           AND PMAX.PRODUCTIONDATAID < TP.PRODUCTIONDATAID
-                                           AND PMAX.VALUEFLAG = '1'
+                                         -- LEFT JOIN TP_PM_PRODUCTIONDATA PMAX
+                                         --   ON PMAX.GROUTINGDAILYDETAILID = TP.GROUTINGDAILYDETAILID
+                                        --   AND PMAX.PRODUCTIONDATAID < TP.PRODUCTIONDATAID
+                                         --  AND PMAX.VALUEFLAG = '1'
                                          WHERE TP.CHECKBATCHNO = 1
                                            AND TP.GOODSLEVELTYPEID IN (4, 5)
                                            AND TP.PROCEDUREID IN (13, 35)
                                            AND TP.CREATETIME >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd")+@"'
                                            AND TP.CREATETIME <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd")+@"'
                                        
-                                         GROUP BY TP.PRODUCTIONDATAID
-                                                 ,TP.GROUTINGDAILYDETAILID
-                                                 ,TP.PROCEDUREID) P
-                                  LEFT JOIN TP_PM_PRODUCTIONDATA RPD
-                                    ON RPD.PRODUCTIONDATAID = P.MAXPRODUCTIONDATAID
-                                   AND RPD.Procedureid IN (20, 22, 23, 37, 41)
-                                   inner JOIN tp_pm_productiondata pdd ON pdd.productiondataid = p.productiondataid
+                                        -- GROUP BY TP.PRODUCTIONDATAID
+                                         ---        ,TP.GROUTINGDAILYDETAILID
+                                         --        ,TP.PROCEDUREID
+                                            ) P  inner JOIN tp_pm_productiondata pdd ON pdd.productiondataid = p.productiondataid
+                                   LEFT JOIN tp_pm_productiondata rpd
+                                            ON rpd.groutingdailydetailid = p.groutingdailydetailid
+                                           AND rpd.productiondataid < p.productiondataid
+                                           and rpd.kilncarbatchno = pdd.kilncarbatchno
+                                           AND rpd.valueflag = '1' 
+                                              /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
+                                           AND rpd.procedureid IN (20, 22, 23, 37, 41)
+                                  
                                 UNION ALL
                                 SELECT 3 FLAG
                                       ,TP_PM_ProductionData.groutingdailydetailid

wwwroot/mes/rpt/rpt014/rpt.ashx

@@ -9,6 +9,7 @@ using System.Collections;
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
+using System.Configuration;
 using Curtain.DataAccess;
 using DK.XuWei.WebMes;
 
@@ -24,8 +25,19 @@ public class rpt : IHttpHandler, IReadOnlySessionState
     string sqlStr = "";
     //楼号
     string buding = null;
+
     public void ProcessRequest(HttpContext context)
     {
+        // 验厂标识 true:  false：
+        string strFactoryInspectionFlag = ConfigurationManager.AppSettings["FactoryInspectionFlag"] + "";
+        string strFactoryInspection = "";
+        string strFactoryInspectionCheckTime = "";
+        if ("true".Equals(strFactoryInspectionFlag))
+        {
+            strFactoryInspection = " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where pd.createtime >= thc.DAY_YMD_START and pd.createtime < thc.DAY_YMD_END ) ";
+            strFactoryInspectionCheckTime = " and not exists (select 1 from TP_HOLIDAY_CONFIG thc where p.CHECKTIME >= thc.DAY_YMD_START and p.CHECKTIME < thc.DAY_YMD_END ) ";
+        }
+
         context.Response.ContentType = "text/plain";
         proc = context.Request["procedureidMaster"].ToString();
         //主表
@@ -192,7 +204,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                            PD.PROCEDUREID = @PROCEDUREID@
                            AND PD.CHECKFLAG = 1
                            AND PD.CREATETIME >= @DATEBEGIN@
-                           AND PD.CREATETIME < @DATEEND@
+                           AND PD.CREATETIME < @DATEEND@   
+							{strFactoryInspection}				
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL)
                            -- AND (PD.GOODSCODE = @GOODSCODE@ OR @GOODSCODE@ IS NULL)
                            --AND (INSTR((@GOODSCODE@),PD.GOODSCODE)>0 OR @GOODSCODE@ IS NULL)
@@ -221,7 +234,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             -- AND PD.VALUEFLAG = '1'
                            -- AND PD.CHECKBATCHNO = 1  
                            AND PD.CREATETIME >= @DATEBEGIN@
-                           AND PD.CREATETIME < @DATEEND@
+                           AND PD.CREATETIME < @DATEEND@ 
+								{strFactoryInspection}			
 						 --  AND PD.CHECKTIME >= @DATEBEGIN@
                          --  AND PD.CHECKTIME < @DATEEND@
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL) 
@@ -266,7 +280,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                            AND PD.CHECKFLAG = 1
                            AND PD.CHECKBATCHNO = 1
                            AND PD.CREATETIME >= @DATEBEGIN@
-                           AND PD.CREATETIME < @DATEEND@
+                           AND PD.CREATETIME < @DATEEND@   
+							{strFactoryInspection}			
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL)
                            -- AND (PD.GOODSCODE = @GOODSCODE@ OR @GOODSCODE@ IS NULL)
                            --AND (INSTR((@GOODSCODE@),PD.GOODSCODE)>0 OR @GOODSCODE@ IS NULL)
@@ -345,7 +360,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                             AND P.CHECKBATCHNO = 1
 							--xuwei fix 2020-10-09 begin
                             AND P.CHECKTIME >= @DATEBEGIN@
-                            AND P.CHECKTIME < @DATEEND@
+                            AND P.CHECKTIME < @DATEEND@ 
+							{strFactoryInspectionCheckTime}  
                             --AND P.CREATETIME >= @DATEBEGIN@
                             --AND P.CREATETIME < @DATEEND@
 							--xuwei fix 2020-10-09 end 
@@ -454,6 +470,7 @@ DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
                            AND PD.CHECKFLAG = 1
                            AND PD.CREATETIME >= @DATEBEGIN@
                            AND PD.CREATETIME < @DATEEND@
+							{strFactoryInspection}  	
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL)
                            -- AND (PD.GOODSCODE = @GOODSCODE@ OR @GOODSCODE@ IS NULL)
                            --AND (INSTR((@GOODSCODE@),PD.GOODSCODE)>0 OR @GOODSCODE@ IS NULL)
@@ -486,7 +503,8 @@ DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
                            AND PD.PROCEDUREID = @PROCEDUREID@
                            AND PD.CHECKBATCHNO = 1
                            AND PD.CREATETIME >= @DATEBEGIN@
-                           AND PD.CREATETIME < @DATEEND@
+                           AND PD.CREATETIME < @DATEEND@  
+							{strFactoryInspection} 
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL)
                            -- AND (PD.GOODSCODE = @GOODSCODE@ OR @GOODSCODE@ IS NULL)
                            --AND (INSTR((@GOODSCODE@),PD.GOODSCODE)>0 OR @GOODSCODE@ IS NULL)
@@ -520,7 +538,8 @@ DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
                            AND PD.CHECKFLAG = 1
                            AND PD.CHECKBATCHNO = 1
                            AND PD.CREATETIME >= @DATEBEGIN@
-                           AND PD.CREATETIME < @DATEEND@
+                           AND PD.CREATETIME < @DATEEND@  
+							{strFactoryInspection} 
                            AND (PD.KILNID = @KILNID@ OR @KILNID@ IS NULL)
                            -- AND (PD.GOODSCODE = @GOODSCODE@ OR @GOODSCODE@ IS NULL)
                            --AND (INSTR((@GOODSCODE@),PD.GOODSCODE)>0 OR @GOODSCODE@ IS NULL)
@@ -595,7 +614,8 @@ DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
                             AND P.CHECKBATCHNO = 1
 							--xuwei fix 2020-10-09 begin
                             AND P.CHECKTIME >= @DATEBEGIN@
-                            AND P.CHECKTIME < @DATEEND@
+                            AND P.CHECKTIME < @DATEEND@ 
+							{strFactoryInspectionCheckTime}  
                             --AND P.CREATETIME >= @DATEBEGIN@
                             --AND P.CREATETIME < @DATEEND@
 							--xuwei fix 2020-10-09 end 
@@ -631,7 +651,16 @@ DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
 		            OR ( TA.GID = 3 ) 
 	            )
 				ORDER BY TA.GOODSTYPENAME,TA.GOODSCODE
-                ".Replace("{DEFECT}", defectStr).Replace("{BUILDINGNO}", buding).Replace("{goodsCodes}", goodssql);
+                ".Replace("{DEFECT}", defectStr).Replace("{BUILDINGNO}", buding)
+                .Replace("{goodsCodes}", goodssql);
+                }
+                if (sqlStr.Contains("{strFactoryInspection}"))
+                {
+                  sqlStr =   sqlStr.Replace("{strFactoryInspection}", strFactoryInspection);
+                }
+				if (sqlStr.Contains("{strFactoryInspectionCheckTime}"))
+                {
+                  sqlStr =   sqlStr.Replace("{strFactoryInspectionCheckTime}", strFactoryInspectionCheckTime);
                 }
 
                 //获取查询条件
@@ -681,7 +710,7 @@ DECODE( TA.GID, 3, '合计', TA.GOODSTYPENAME ) AS 产品类别,
                 //=========================================================
                 //sqlStr = sqlStr.Replace("@DATEBEGIN@", "DATE'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + "'");
                 //sqlStr = sqlStr.Replace("@DATEEND@", "DATE'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + "'");
-                sqlStr = sqlStr.Replace("@DATEBEGIN@", "to_date('" + Convert.ToDateTime(context.Request["datebeginMaster"])  + "','yyyy-mm-dd hh24:mi:ss')");
+                sqlStr = sqlStr.Replace("@DATEBEGIN@", "to_date('" + Convert.ToDateTime(context.Request["datebeginMaster"]) + "','yyyy-mm-dd hh24:mi:ss')");
                 sqlStr = sqlStr.Replace("@DATEEND@", "to_date('" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1) + "','yyyy-mm-dd hh24:mi:ss')");
                 sqlStr = sqlStr.Replace("@KILNID@", context.Request["kilnidMaster"].ToString() != "" ? context.Request["kilnidMaster"].ToString() : " NULL ");
                 sqlStr = sqlStr.Replace("@PROCEDUREID@", context.Request["procedureidMaster"].ToString() != "" ? context.Request["procedureidMaster"].ToString() : " NULL ");

wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -322,7 +322,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								WHERE
                            PD.PROCEDUREID = @PROCEDUREID@
                             -- AND PD.VALUEFLAG = '1'
-                           -- AND PD.CHECKBATCHNO = 1  
+                            --AND PD.CHECKBATCHNO = 1  
                            AND PD.CREATETIME >= @DATEBEGIN@
                            AND PD.CREATETIME < @DATEEND@
 						   AND PD.CHECKTIME >= @DATEBEGIN@

wwwroot/mes/rpt/rpt014/rptnew_detail_change.ashx

@@ -96,6 +96,7 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                           LEFT JOIN tp_pm_productiondata pmax
                             ON pmax.groutingdailydetailid = pd.groutingdailydetailid
                            AND pmax.productiondataid < pd.productiondataid 
+                            AND (pmax.procedureid = 13 OR pmax.procedureid = 35)
                          INNER JOIN tp_pc_groutingline gl
                             ON gl.groutinglineid = pd.groutinglineid
                          WHERE pd.procedureid in ( {PROCEDUREID} )