质量看板=>TK1小件本烧,大件重烧=>本烧与重烧取数逻辑更改(改判)

wwwroot/main/Procedure/test6/QualityBulletinBoardDataInfo.ashx

@@ -1259,7 +1259,9 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 										AND PD.VALUEFLAG = 1 --有效
 										AND GDT.ISLEAFNODE = 1
 										AND PD.KILNID = 3 --TK1
-										AND PD.ISREFIRE = 0 --本烧
+										AND (  PD.ISREFIRE = 0 or not exists(
+										SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)) --本烧
 										AND (PD.GOODSLEVELID IN(12,13) OR PD.GOODSLEVELTYPEID IN (6,7)) --筛选出 重烧 次品 数据
 										AND SUBSTR( DEFECT.DEFECTCODE, 0, 1 ) <> 0 
 										AND GDT.GOODSTYPECODE = '001001004' --隐藏式水箱座便器
@@ -1298,7 +1300,9 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 										AND PD.VALUEFLAG = 1 --有效
 										AND GDT.ISLEAFNODE = 1
 										AND PD.KILNID = 3 --TK1
-										AND PD.ISREFIRE = 0 --本烧
+										AND (  PD.ISREFIRE = 0 or not exists(
+										SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1))--本烧
 										AND (PD.GOODSLEVELID IN(12,13) OR PD.GOODSLEVELTYPEID IN (6,7)) --筛选出 重烧 次品 数据
 										AND SUBSTR( DEFECT.DEFECTCODE, 0, 1 ) <> 0 
 										AND GDT.GOODSTYPECODE = '001002008' --柜盆
@@ -1318,6 +1322,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 										AND GDT.ISLEAFNODE = 1
 										AND PD.KILNID = 3 --TK1
 										AND PD.ISREFIRE = 6 --重烧
+										AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+										WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 										AND SUBSTR( DEFECT.DEFECTCODE, 0, 1 ) <> 0 
 										AND GDT.GOODSTYPECODE = '001002015' --小便斗
 										AND SUBSTR( GDT.GOODSTYPECODE, 0, 6 ) = '001002')  小便斗重烧,
@@ -1335,6 +1341,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 										AND GDT.ISLEAFNODE = 1
 										AND PD.KILNID = 3 --TK1
 										AND PD.ISREFIRE = 6 --重烧
+										AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+										WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 										AND SUBSTR( DEFECT.DEFECTCODE, 0, 1 ) <> 0 
 										AND GDT.GOODSTYPECODE = '001002008' --柜盆
 										AND SUBSTR( GDT.GOODSTYPECODE, 0, 6 ) = '001002' ) 柜盆重烧,
@@ -1355,6 +1363,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 										AND PD.KILNID = 3 --TK1
 										AND SUBSTR(DEFECT.DEFECTCODE, 0, 1) <> 0 
 										AND PD.ISREFIRE = 6
+										AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+										WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 										AND GDT.GOODSTYPECODE = '001001001') 连体,
 								(
 									SELECT
@@ -1372,6 +1382,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 										AND PD.KILNID = 3 --TK1
 										AND SUBSTR( DEFECT.DEFECTCODE, 0, 1 ) <> 0 
 										AND PD.ISREFIRE = 6 
+										AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+										WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 										AND GDT.GOODSTYPECODE = '001001003' 
 								) 智能
 							FROM
@@ -1455,7 +1467,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 												AND PD.VALUEFLAG = 1 --有效
 												AND GDT.ISLEAFNODE = 1
 												AND PD.KILNID = 3 --TK1
-												AND PD.ISREFIRE = 0 --本烧
+												AND (  PD.ISREFIRE = 0 or not exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)) --本烧
 												
 											)  
 										
@@ -1504,8 +1517,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 												AND PD.VALUEFLAG = 1 --有效
 												AND GDT.ISLEAFNODE = 1
 												AND PD.KILNID = 3 --TK1
-												
-												AND PD.ISREFIRE = 0 --本烧
+												AND (  PD.ISREFIRE = 0 or not exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1))--本烧
 											)  
 										
 											GROUP BY
@@ -1553,7 +1566,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 												AND PD.VALUEFLAG = 1 --有效
 												AND GDT.ISLEAFNODE = 1
 												AND PD.KILNID = 3 --TK1
-												AND PD.ISREFIRE = 0 --本烧
+												AND (  PD.ISREFIRE = 0 or not exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)) --本烧
 											)  
 											GROUP BY
 												DEFECTNAME
@@ -1601,6 +1615,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 												AND GDT.ISLEAFNODE = 1
 												AND PD.KILNID = 3 --TK1
 												AND PD.ISREFIRE = 6 --重烧
+												AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 											)  
 										
 											GROUP BY
@@ -1649,6 +1665,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 												AND GDT.ISLEAFNODE = 1
 												AND PD.KILNID = 3 --TK1
 												AND PD.ISREFIRE = 6 --重烧
+												AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 											)  
 										
 											GROUP BY
@@ -1698,6 +1716,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 												AND GDT.ISLEAFNODE = 1
 												AND PD.KILNID = 3 --TK1
 												AND PD.ISREFIRE = 6 --重烧
+												AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 											)  
 										
 											GROUP BY
@@ -1747,6 +1767,8 @@ public class Get_HG5010_CHECK_DEFECT : IHttpHandler, IRequiresSessionState
 												AND GDT.ISLEAFNODE = 1
 												AND PD.KILNID = 3 --TK1
 												AND PD.ISREFIRE = 6 --重烧
+												AND exists( SELECT pdd.barcode FROM TP_PM_PRODUCTIONDATA pdd 
+												WHERE  pdd.barcode = pd.barcode and pdd.procedureid = 59 and valueflag = 1)
 											)  
 										
 											GROUP BY