产品合格数和每窑的 9 10月份的修正

wwwroot/mes/rpt/rpt008/rpt.ashx

@@ -123,13 +123,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                          ELSE
                                           0
                                        END OK_B
-                                      ,CASE
-                                         WHEN pdd.PROCEDUREID = 35 AND 
-                                              RPD.Productiondataid IS NULL   and pdd.goodsleveltypeid IN (4, 5)  THEN
-                                          1
-                                         ELSE
-                                          0
-                                       END OK_R
+                                      ,0 OK_R
                                       ,0 OK_H
                                       ,0 OK_RH
                                       ,1 OK_ALL
@@ -140,6 +134,50 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                          ELSE
                                           0
                                        END  END_B
+                                      ,0 END_R
+                                      ,0 END_H
+                                      ,0 END_RH
+                                      ,0 END_ALL
+                                      ,0 hgp
+                                      ,0 bzgp
+                                  FROM (SELECT MAX(tp.productiondataid) productiondataid
+                                              ,TP.GROUTINGDAILYDETAILID 
+                                          FROM TP_PM_PRODUCTIONDATA TP  LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                       
+                                         WHERE   TP.PROCEDUREID IN (13) AND semicheck.productiondataid IS NULL
+                                           AND TP.checktime >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + @"'
+                                           AND TP.checktime <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + @"'
+                                       {strFactoryInspectionCheckTime}  
+                                         GROUP BY TP.GROUTINGDAILYDETAILID 
+                                            ) P  inner JOIN tp_pm_productiondata pdd ON pdd.productiondataid = p.productiondataid
+
+--   去除复检的质量登记
+  LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.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 pdd.checkflag = 3
+                                           AND rpd.valueflag = '1' AND semicheck.productiondataid IS NULL
+                                              /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
+                                           AND rpd.procedureid IN (20, 22, 23, 37, 41)
+                                  
+                                UNION ALL
+SELECT 2 FLAG
+                                      ,P.GROUTINGDAILYDETAILID,null  mpdid
+                                      ,0 OUT_K_B
+                                      ,0 OUT_K_R
+                                      ,0 OUT_K_ALL
+                                      ,0 OK_B
+                                      ,CASE
+                                         WHEN pdd.PROCEDUREID = 35 AND 
+                                              RPD.Productiondataid IS NULL   and pdd.goodsleveltypeid IN (4, 5)  THEN
+                                          1
+                                         ELSE
+                                          0
+                                       END OK_R
+                                      ,0 OK_H
+                                      ,0 OK_RH
+                                      ,1 OK_ALL
+                                      ,0  END_B
                                       ,CASE
                                          WHEN pdd.PROCEDUREID = 35 AND 
                                               RPD.Productiondataid IS NULL   and pdd.goodsleveltypeid IN (4, 5)  THEN
@@ -154,8 +192,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       ,0 bzgp
                                   FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
-                                          FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (13, 35)
+                                          FROM TP_PM_PRODUCTIONDATA TP  LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                       
+                                         WHERE   TP.PROCEDUREID IN ( 35) AND semicheck.productiondataid IS NULL
                                            AND TP.checktime >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + @"'
                                            AND TP.checktime <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + @"'
                                        {strFactoryInspectionCheckTime}  
@@ -173,6 +211,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                            AND rpd.procedureid IN (20, 22, 23, 37, 41)
                                   
                                 UNION ALL
+--   合格数_本烧 合格数_重烧 分开算 因为 20203166777  一个月 既有本烧又有 重烧 
                                     SELECT 2 FLAG
                                       ,P.GROUTINGDAILYDETAILID,MAX(rpd.productiondataid) mpdid
                                       ,0 OUT_K_B

wwwroot/mes/rpt/rpt008/rptnew_detail.ashx

@@ -103,8 +103,8 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                         sqlDetail = @" SELECT  DISTINCT '" + gs + @"' 产品编码,  pdd.Barcode  产品条码 
                                 FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
-                                          FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (13) 
+                                          FROM TP_PM_PRODUCTIONDATA TP  LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                             
+                                         WHERE   TP.PROCEDUREID IN (13) AND semicheck.productiondataid IS NULL
                                                 AND TP.checktime >= @DATEBEGIN@
                                                 AND TP.checktime < @DATEEND@ 
                                          GROUP BY TP.GROUTINGDAILYDETAILID 
@@ -145,8 +145,8 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                         sqlDetail = @" SELECT  DISTINCT '" + gs + @"' 产品编码,  pdd.Barcode  产品条码 
                                 FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
-                                          FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (35) 
+                                          FROM TP_PM_PRODUCTIONDATA TP    LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid                                           
+                                         WHERE   TP.PROCEDUREID IN (35)  AND semicheck.productiondataid IS NULL
                                                 AND TP.checktime >= @DATEBEGIN@
                                                 AND TP.checktime < @DATEEND@                                       
                                          GROUP BY TP.GROUTINGDAILYDETAILID 

wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -223,10 +223,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			             FROM
 				            ( SELECT MAX(PD.PRODUCTIONDATAID) PRODUCTIONDATAID										 
 										  ,PD.GROUTINGDAILYDETAILID  
-							 FROM TP_PM_PRODUCTIONDATA PD 
+							 FROM TP_PM_PRODUCTIONDATA PD LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = PD.productiondataid  
 							  INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
 								WHERE
-                           PD.PROCEDUREID = " + proc + @" 
+                           PD.PROCEDUREID = " + proc + @"   AND semicheck.productiondataid IS NULL
 						    AND PD.CHECKTIME >= date'" + Convert.ToDateTime(context.Request["datebeginMaster"]).ToString("yyyy-MM-dd") + @"'
                             AND PD.CHECKTIME <= date'" + Convert.ToDateTime(context.Request["dateendMaster"]).AddSeconds(1).ToString("yyyy-MM-dd") + @"' {strFactoryInspectionCheckTime}
                            AND (PD.KILNID = " + (string.IsNullOrEmpty(context.Request["kilnidMaster"] + "") ? "''" : context.Request["kilnidMaster"]) + @" OR " + (string.IsNullOrEmpty(context.Request["kilnidMaster"] + "") ? "''" : context.Request["kilnidMaster"]) + @" IS NULL) 
@@ -283,7 +283,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 			            G.GOODSNAME, 
 			            SUM( T.OUT_K ) OUT_K,
 			            SUM( CASE WHEN T.H_FLAG = 0 AND T.AA_FLAG = 0 AND T.GOODSLEVELTYPEID = 4 THEN 1 ELSE 0 END ) COUNT_U4, -- 直接正品
-			            SUM( CASE WHEN T.H_FLAG = 0 AND T.AA_FLAG = 0 AND T.GOODSLEVELTYPEID = 5 THEN 1 ELSE 0 END ) COUNT_U5, -- 直接副品
+			            SUM( CASE WHEN T.H_FLAG = 0 AND T.AA_FLAG = 0 AND T.GOODSLEVELTYPEID = 5 THEN 1 ELSE 0 END ) COUNT_U5, -- 直接副品			            
 			            COUNT( DISTINCT CASE WHEN T.AA_FLAG = 0 AND (T.GOODSLEVELTYPEID = 7 or T.H_FLAG = 1) THEN  t.BARCODE ELSE NULL END ) COUNT_U7, -- 当前的等级是次品或经过了研磨、堵漏气、刷洗不良、直接冷补、研磨冷补工序
 			            SUM( CASE WHEN T.AA_FLAG = 0 and t.h_flag=0 AND T.GOODSLEVELTYPEID = 6 AND T.REWORKPROCEDUREID = 19 THEN 1 ELSE 0 END ) AS COUNT_R,   
 			            COUNT(DISTINCT   CASE WHEN T.AA_FLAG = 1 AND T.GOODSLEVELTYPEID IN ( 4, 5 ) AND RPD.PROCEDUREID IN ( 22, 23, 37, 20, 41 ) THEN  t.BARCODE ELSE NULL END ) COUNT_AA, -- 研磨、堵漏气、刷洗不良、直接冷补、研磨冷补合格数
@@ -331,10 +331,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 				            ( SELECT MAX(PD.PRODUCTIONDATAID) PRODUCTIONDATAID
 										  ,PD.GOODSID,PD.BARCODE
 										  ,PD.GROUTINGDAILYDETAILID 
-							 FROM TP_PM_PRODUCTIONDATA PD 
+							 FROM TP_PM_PRODUCTIONDATA PD  LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = PD.productiondataid  
 							  INNER JOIN TP_PC_GROUTINGLINE GL ON GL.GROUTINGLINEID = PD.GROUTINGLINEID
 								WHERE
-                           PD.PROCEDUREID = @PROCEDUREID@
+                           PD.PROCEDUREID = @PROCEDUREID@ AND semicheck.productiondataid IS NULL
                             -- AND PD.VALUEFLAG = '1'
                             --AND PD.CHECKBATCHNO = 1  
                           -- AND PD.CREATETIME >= @DATEBEGIN@
@@ -347,8 +347,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                            AND GL.BUILDINGNO {BUILDINGNO} 
 							 GROUP BY PD.GOODSID,PD.BARCODE ,PD.GROUTINGDAILYDETAILID 
 							) PD  INNER JOIN TP_PM_PRODUCTIONDATA PDD ON PDD.PRODUCTIONDATAID = PD.PRODUCTIONDATAID 
+ --   去除复检的质量登记
+                  LEFT JOIN tp_pm_productiondata_semicheck semicheck  ON semicheck.productiondataid = PD.productiondataid
 			                LEFT JOIN TP_PM_PRODUCTIONDATA PMAX ON PMAX.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID 
-							 and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO	  and pdd.checkflag = 3
+							 and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO	  and pdd.checkflag = 3  AND semicheck.productiondataid IS NULL
 			                AND PMAX.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND PMAX.PROCEDUREMODEL = '1'
 				            /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
 				            AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41)		            

wwwroot/mes/rpt/rpt017/rpt.ashx

@@ -175,8 +175,8 @@ union all
 
                                         (SELECT MAX(tp.productiondataid) productiondataid
                                           ,tp.groutingdailydetailid
-                                              FROM tp_pm_productiondata tp
-                                             WHERE tp.procedureid IN (13, 35) 
+                                              FROM tp_pm_productiondata tp LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid     
+                                             WHERE tp.procedureid IN (13, 35)   AND semicheck.productiondataid IS NULL  
                                                AND tp.checktime >=  @DATEBEGIN@
                                                AND tp.checktime <= @DATEEND@
                                              GROUP BY tp.groutingdailydetailid) maxp
@@ -472,7 +472,8 @@ union all
                             GROUPING SETS ( ( U.USERCODE,PP.GOODSCODE,PP.GOODSNAME,CDU.STAFFNAME, U.USERNAME, PP.GOODSMODEL,J.JOBSNAME,PP.釉料,PP.商标 ,G.GOODSSPECIFICATION), ( U.USERCODE ),())
                           HAVING SUM(pp.checknum1) <> 0 OR SUM(pp.checknum2) <> 0 OR SUM(pp.checknum3) <> 0 OR SUM(pp.checknum4) <> 0 
                     --  检验数_本烧  检验数_重烧 首检数_本烧  首检数_重烧 250924 和石磊沟通后暂时把 这四个为0的数据过滤  先不管后面的列的数据情况
-                    -- OR SUM(pp.ok_b) <> 0 OR SUM(pp.ok_r) <> 0 OR SUM(pp.ok_l) <> 0 OR SUM(pp.ok_all) <> 0 OR SUM(pp.ok_p) <> 0 OR SUM(pp.dnum1) <> 0 OR SUM(pp.dnum2) <> 0 OR SUM(pp.dnum3) <> 0 OR SUM(pp.dnum4) <> 0
+                    OR SUM(pp.ok_b) <> 0 OR SUM(pp.ok_r) <> 0 OR SUM(pp.ok_l) <> 0 OR SUM(pp.ok_all) <> 0 OR SUM(pp.ok_p) <> 0 
+--  OR SUM(pp.dnum1) <> 0 OR SUM(pp.dnum2) <> 0 OR SUM(pp.dnum3) <> 0 OR SUM(pp.dnum4) <> 0
 
                         ORDER BY
                           U.USERCODE,