穿透的aa级 调整

成检大帐查询黑屏

wwwroot/mes/rpt/rpt008/rpt.ashx

@@ -166,10 +166,9 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                       ,0 OUT_K_ALL
                                       ,0 OK_B
                                       ,0 OK_R
-                                      ,CASE WHEN SUM(rpd.productiondataid) > 0 and pdd.PROCEDUREID = 13 and   pdd.goodsleveltypeid IN (4, 5)   THEN 1  ELSE 0
-                                       END OK_H
-                                      ,CASE WHEN SUM(rpd.productiondataid) > 0 and pdd.PROCEDUREID = 35 and   pdd.goodsleveltypeid IN (4, 5)   THEN 1  ELSE 0
-                                       END OK_RH
+                                     -- ,CASE WHEN SUM(rpd.productiondataid) > 0 and pdd.PROCEDUREID = 13 and   pdd.goodsleveltypeid IN (4, 5)   -- THEN 1  ELSE 0 END OK_H
+                                    ,COUNT(DISTINCT  CASE WHEN rpd.productiondataid is not null and pdd.PROCEDUREID = 13 and   pdd.goodsleveltypeid IN (4, 5)   THEN pdd.barcode  ELSE  NULL  END ) OK_H    
+                                      ,0 OK_RH
                                       ,1 OK_ALL
                                       ,0 END_B
                                       ,0 END_R
@@ -180,22 +179,66 @@ 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)   AND tp.valueflag = 1
+                                          FROM TP_PM_PRODUCTIONDATA TP                                        
+                                         WHERE   TP.PROCEDUREID IN (13) 
+                                    --  AND tp.valueflag = 1
                                            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") + @"'
                                        {strFactoryInspection}
                                          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 = pdd.productiondataid
                                    LEFT JOIN tp_pm_productiondata rpd
                                             ON rpd.groutingdailydetailid = p.groutingdailydetailid
                                            AND rpd.productiondataid < p.productiondataid
-                                           and rpd.kilncarbatchno = pdd.kilncarbatchno
+                                              AND rpd.kilncarbatchno = pdd.kilncarbatchno
                                            AND rpd.valueflag = '1' 
+                                             AND  semicheck.productiondataid is null 
                                               /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
-                                           AND rpd.procedureid IN (20, 22, 23, 37, 41)
-                                   GROUP BY p.groutingdailydetailid,pdd.goodsleveltypeid ,pdd.PROCEDUREID 
+                                           AND rpd.procedureid IN (20, 22, 23, 37, 41  )
+                                   GROUP BY p.groutingdailydetailid,pdd.goodsleveltypeid ,pdd.PROCEDUREID  ,pdd.barcode 
+  UNION ALL
+                                    SELECT 2 FLAG
+                                      ,P.GROUTINGDAILYDETAILID,MAX(rpd.productiondataid) mpdid
+                                      ,0 OUT_K_B
+                                      ,0 OUT_K_R
+                                      ,0 OUT_K_ALL
+                                      ,0 OK_B
+                                      ,0 OK_R
+                                     ,0 OK_H    
+                                      ,COUNT(DISTINCT  CASE WHEN rpd.productiondataid is not null and pdd.PROCEDUREID = 35 and   pdd.goodsleveltypeid IN (4, 5)   THEN pdd.barcode  ELSE  NULL
+                                       END ) OK_RH
+                                      ,1 OK_ALL
+                                      ,0 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                                        
+                                         WHERE   TP.PROCEDUREID IN (35) 
+                                    --  AND tp.valueflag = 1
+                                           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") + @"'
+                                       {strFactoryInspection}
+                                         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 = pdd.productiondataid
+                                   LEFT JOIN tp_pm_productiondata rpd
+                                            ON rpd.groutingdailydetailid = p.groutingdailydetailid
+                                           AND rpd.productiondataid < p.productiondataid
+                                            AND (( rpd.procedureid IN (20, 22, 23, 37, 41 ) and rpd.kilncarbatchno = pdd.kilncarbatchno  )OR  (  rpd.procedureid=35 and  rpd.procedureid = pdd.procedureid))
+                                           AND rpd.valueflag = '1' 
+                                             AND  semicheck.productiondataid is null 
+                                              /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
+                                           AND rpd.procedureid IN (20, 22, 23, 37, 41 ,35)
+                                   GROUP BY p.groutingdailydetailid,pdd.goodsleveltypeid ,pdd.PROCEDUREID  ,pdd.barcode 
+                              
                                 UNION ALL
                                 SELECT 3 FLAG
                                       ,tp.groutingdailydetailid,null  mpdid
@@ -339,10 +382,14 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                                             --当前包装入库的质量登记
                                              INNER JOIN tp_pm_productiondata tp
                                                 ON tp.productiondataid = maxp.maxproductiondataid
+                    --   去除复检的质量登记
+                    LEFT JOIN tp_pm_productiondata_semicheck semicheck ON semicheck.productiondataid = tp.productiondataid
                                             
                                         LEFT JOIN TP_PM_PRODUCTIONDATA RPD
                                     ON RPD.BARCODE = tp.BARCODE
                                     AND rpd.valueflag = '1'
+                                AND  semicheck.productiondataid is null
+                                    AND rpd.productiondataid < tp.productiondataid
                                     and rpd.kilncarbatchno = tp.kilncarbatchno
                                    AND RPD.Procedureid IN (20, 22, 23, 37, 41) 
                             

wwwroot/mes/rpt/rpt008/rptnew_detail.ashx

@@ -182,13 +182,15 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                                 AND TP.createtime < @DATEEND@ 
                                          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 rpd.valueflag = '1' 
+                                           AND rpd.productiondataid < p.productiondataid 
+  AND (( rpd.procedureid IN (20, 22, 23, 37, 41 ) and rpd.kilncarbatchno = pdd.kilncarbatchno  )OR  (  rpd.procedureid=35 and  rpd.procedureid = pdd.procedureid))
+                                           AND rpd.valueflag = '1'    AND  semicheck.productiondataid is null 
                                               /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
-                                           AND rpd.procedureid IN (20, 22, 23, 37, 41) 
+                                           AND rpd.procedureid IN (20, 22, 23, 37, 41,35) 
                                   LEFT JOIN TP_PM_GROUTINGDAILYDETAIL G
 									ON pdd.GROUTINGDAILYDETAILID = G.GROUTINGDAILYDETAILID
 								  LEFT JOIN TP_PC_GROUTINGLINE L
@@ -215,16 +217,18 @@ public class rptnew_detail : IHttpHandler, IReadOnlySessionState
                                 FROM (SELECT MAX(tp.productiondataid) productiondataid
                                               ,TP.GROUTINGDAILYDETAILID 
                                           FROM TP_PM_PRODUCTIONDATA TP                                        
-                                         WHERE   TP.PROCEDUREID IN (13)  AND tp.valueflag = 1
+                                         WHERE   TP.PROCEDUREID IN (13)   
                                                 AND TP.createtime >= @DATEBEGIN@
                                                 AND TP.createtime < @DATEEND@                                        
                                          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 rpd.valueflag = '1' 
+                                           AND rpd.valueflag = '1'    AND  semicheck.productiondataid is null
                                               /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
                                            AND rpd.procedureid IN (20, 22, 23, 37, 41) 
                                   LEFT JOIN TP_PM_GROUTINGDAILYDETAIL G

wwwroot/mes/rpt/rpt014/rptnew.ashx

@@ -388,7 +388,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                            AND GL.BUILDINGNO {BUILDINGNO}
 							 GROUP BY PD.GOODSID,PD.BARCODE ,PD.GROUTINGDAILYDETAILID ,pd.KILNCARBATCHNO   
 							) PD  INNER JOIN TP_PM_PRODUCTIONDATA PDD ON PDD.PRODUCTIONDATAID = PD.PRODUCTIONDATAID 
-			                LEFT JOIN TP_PM_PRODUCTIONDATA PMAX ON PMAX.GROUTINGDAILYDETAILID = PD.GROUTINGDAILYDETAILID  and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO
+				  --   去除复检的质量登记
+                  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  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)				            
@@ -544,8 +547,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 										 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.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND PMAX.PROCEDUREMODEL = '1'  and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO	
+										AND PMAX.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND PMAX.PROCEDUREMODEL = '1'  and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO	AND  semicheck.productiondataid is null 
 										/*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
 										AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41)									  
 			             
@@ -581,8 +586,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.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND PMAX.PROCEDUREMODEL = '1' and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO	
+										AND PMAX.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND PMAX.PROCEDUREMODEL = '1' and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO		AND  semicheck.productiondataid is null 
 										/*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
 										AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41) 
 			             
@@ -842,9 +849,11 @@ 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 	
+										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.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND (pmax.kilncarbatchno = PDD.kilncarbatchno OR pmax.procedureid = PDD.procedureid)
+										AND PMAX.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND (pmax.kilncarbatchno = PDD.kilncarbatchno OR pmax.procedureid = PDD.procedureid) AND  semicheck.productiondataid is null 
 										/* 20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良 */
 										AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41, 35)
 										 		             
@@ -881,8 +890,10 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 										 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.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND PMAX.PROCEDUREMODEL = '1' and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO
+										AND PMAX.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' AND PMAX.PROCEDUREMODEL = '1' and pmax.KILNCARBATCHNO= PDD.KILNCARBATCHNO  AND  semicheck.productiondataid is null 
 										/*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/
 										AND PMAX.PROCEDUREID IN (20, 22, 23, 37, 41)			             
 									GROUP BY

wwwroot/mes/rpt/rpt014/rptnew_detail.ashx

@@ -194,8 +194,10 @@ public class rptnew_detail : 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.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1' 
+			                AND PMAX.PRODUCTIONDATAID < PD.PRODUCTIONDATAID AND PMAX.VALUEFLAG = '1'   AND semicheck.productiondataid is null
                             " + (proc == "999" ? "AND (pmax.kilncarbatchno = PDD.kilncarbatchno OR pmax.procedureid = PDD.procedureid)"
                                             : "AND (pmax.kilncarbatchno = PDD.kilncarbatchno )")
                            /*20  研磨 22  直接冷补 23  研磨后冷补（非回收） 37  堵漏气 41  刷洗不良*/

wwwroot/mes/rpt/rpt035/rpt.ashx

@@ -426,7 +426,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();
                 context.Response.Write(jsonStr);
             }
-            else
+             else if (context.Request["m"].ToString() == "jiezhauang" && context.Request["groupname"].ToString() == "卸窑缺陷")
             {
                 string sqlStr = @"SELECT
 	                    GOODSNAME_FRONT AS 产品,
@@ -452,8 +452,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
                 sqlPara.Add(new CDAParameter("DATEEND", Convert.ToDateTime(context.Request["dateendMaster"]), DataType.DateTime));
                 sqlPara.Add(new CDAParameter("PROCEDUREID", context.Request["procedureidMaster"]));
                 sqlPara.Add(new CDAParameter("USERCODE", context.Request["usercodeMaster"]));
-                sqlPara.Add(new CDAParameter("BEGINMONTH", context.Request["datebeginMaster"].Substring(0, context.Request["datebeginMaster"].IndexOf("-")) + context.Request["datebeginMaster"].Substring(context.Request["datebeginMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
-                sqlPara.Add(new CDAParameter("ENDMONTH", context.Request["dateendMaster"].Substring(0, context.Request["dateendMaster"].IndexOf("-")) + context.Request["dateendMaster"].Substring(context.Request["dateendMaster"].IndexOf("-") + 1).PadLeft(2, '0')));
+                sqlPara.Add(new CDAParameter("BEGINMONTH", (context.Request["datebeginMaster"].Substring(0, context.Request["datebeginMaster"].IndexOf("-")) + context.Request["datebeginMaster"].Substring(context.Request["datebeginMaster"].IndexOf("-") + 1).PadLeft(2, '0')).Substring(0,6)));
+                sqlPara.Add(new CDAParameter("ENDMONTH", context.Request["dateendMaster"].Substring(0, context.Request["dateendMaster"].IndexOf("-")) + context.Request["dateendMaster"].Substring(context.Request["dateendMaster"].IndexOf("-") + 1).PadLeft(2, '0').Substring(0,2)));
                 //直接获取不分页数据
                 DataTable dt = conn.ExecuteDatatable(sqlStr, sqlPara.ToArray());
                 string jsonStr = new JsonResult(dt) { total = dt.Rows.Count }.ToJson();