附件记录表和重烧aa修正

wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -804,8 +804,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 								COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  AND t.goodsleveltypeid IN (4, 5) and rpd.procedureid = 23 THEN rpd.barcode ELSE null  END ) AS  count_ymlb_ok, --研磨后冷补, 
 								COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  AND t.goodsleveltypeid IN (4, 5) and rpd.procedureid = 37 THEN rpd.barcode ELSE null  END ) AS   count_dlq_ok ,--堵漏气, 
 								COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  AND t.goodsleveltypeid IN (4, 5) and rpd.procedureid = 41 THEN rpd.barcode ELSE null  END ) AS  count_sxbl_ok, --刷洗不良,
-								COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  AND ((rpd.procedureid IN (22, 23, 37, 20, 41) AND t.goodsleveltypeid != 6 AND t.goodsleveltypeid != 7) OR
-                              (rpd.procedureid IN (35) AND t.goodsleveltypeid !=7 )  ) THEN  T.barcode ELSE null   END)  count_l  ,
+								-- COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  AND ((rpd.procedureid IN (22, 23, 37, 20, 41) AND t.goodsleveltypeid != 6 AND t.goodsleveltypeid != 7) OR
+                              -- (rpd.procedureid IN (35) AND t.goodsleveltypeid !=7 )  ) THEN  T.barcode ELSE null   END)  count_l  ,
+								COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  AND  (rpd.procedureid IN (20, 22, 23, 37, 41, 35) OR
+													(rpd.procedureid IS NULL AND rpd.goodsleveltypeid != 6))  THEN  T.barcode ELSE null   END)  count_l  ,
 								COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  and T.GOODSLEVELTYPEID IN ( 4, 5 ) AND (rpd.procedureid IN (22, 23, 37, 20, 41,35) or (rpd.procedureid IS NULL AND rpd.goodsleveltypeid != 6)) THEN T.barcode ELSE null  END ) COUNT_AA, -- 研磨、堵漏气、刷洗不良、直接冷补、研磨冷补合格数
 								COUNT(DISTINCT  CASE WHEN  T.flagaa = 0  and T.GOODSLEVELTYPEID IN ( 4, 5 ) AND (rpd.procedureid IN (35) OR
                               (rpd.procedureid IS NULL AND rpd.goodsleveltypeid != 6)) THEN T.barcode ELSE null  END ) count_csr_ok, 

wwwroot/mes/rpt/rpt041/rpt.ashx

@@ -58,7 +58,7 @@ CASE
 			INNER JOIN tp_pm_productiondata pd ON sec.productiondataid = pd.productiondataid 
 			AND sec.rn = 1
 			LEFT JOIN tp_pm_productiondata pfirst ON pfirst.groutingdailydetailid = pd.groutingdailydetailid 
-			AND pfirst.checkflag = '1' 
+			AND pfirst.checkflag = '1'  and pfirst.kilncarbatchno = pd.kilncarbatchno
 			AND pfirst.procedureid IN ( 13, 35 )
 			LEFT JOIN TP_MST_GOODS goods ON goods.GOODSCODE = pd.GOODSCODE
 			LEFT JOIN TP_MST_LOGO logo ON logo.LOGOID = pd.LOGOID