修改半检一检 二检 看板扇形图后台算法及前台赋值逻辑

wwwroot/main/Procedure/test12/demo.ashx

@@ -284,20 +284,19 @@ public class demo : IHttpHandler {
 	                                    T.数量 
                                     FROM
 	                                    (
-	                                    SELECT
-		                                    TMD.S_NAME,
-		                                    count( DISTINCT BARCODE ) AS 数量 
-	                                    FROM
-		                                    TP_PM_DEFECT TPD
-		                                    LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID 
-	                                    WHERE
-		                                    TPD.CREATETIME >= TRUNC( SYSDATE )
-		                                    AND TMD.DEFECTTYPEID IN ( 15,16,18,4 ) 
-											AND TPD.DEFECTPROCEDUREID IN (117,94,97,119)
-	                                    GROUP BY
-		                                    TMD.S_NAME
+	                                   SELECT
+																		 DF.S_NAME as S_NAME,
+																		 COUNT(DISTINCT sed.BARCODE) as 数量
+																			FROM TP_PM_SEMICHECK  sed
+																			left JOIN TP_PM_SEMICHECKDEFECT se on se.SEMICHECKID=sed.SEMICHECKID
+																			LEFT JOIN TP_MST_DEFECT DF ON DF.DEFECTCODE=SE.DEFECTCODE
+																			WHERE
+																			  sed.CREATETIME >= TRUNC( SYSDATE ) AND SED.SEMICHECKTYPE=2
+																				AND sed.GROUTINGLINECODE LIKE 'C0%'
+																				 GROUP BY
+		                                     DF.S_NAME
 	                                    ORDER BY
-		                                    count( * ) DESC 
+		                                    COUNT(DISTINCT sed.BARCODE) DESC 
 	                                    ) T 
                                     WHERE
 	                                    ROWNUM < 4";

wwwroot/main/Procedure/test12/demo.html

@@ -356,14 +356,20 @@
             $.get("demo.ashx?m=defectb", function (data) {
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
+                    var defect2 = ""
+                    var defectname2 = 0
+                    var defect3 = ""
+                    var defectname3 = 0
                     var defect1 = parseFloat(json["rows"][0]["数量"]);
                     var defectname1 = json["rows"][0]["缺陷名称"];
-
-                    var defect2 = parseFloat(json["rows"][1]["数量"]);
-                    var defectname2 = json["rows"][1]["缺陷名称"];
-
-                    var defect3 = parseFloat(json["rows"][2]["数量"]);
-                    var defectname3 = json["rows"][2]["缺陷名称"];
+                    if (json["rows"].length > 1) {
+                        defect2 = parseFloat(json["rows"][1]["数量"]);
+                        defectname2 = json["rows"][1]["缺陷名称"];
+                    }
+                    if (json["rows"].length > 2) {
+                        defect3 = parseFloat(json["rows"][2]["数量"]);
+                        defectname3 = json["rows"][2]["缺陷名称"];
+                    }
 
                     window.DefectB.data.datasets[0].data = [defect1, defect2, defect3];
                     window.DefectB.data.labels = [defectname1, defectname2, defectname3]

wwwroot/main/Procedure/test7/demo.ashx

@@ -456,20 +456,19 @@ SELECT
 	                                    T.数量 
                                     FROM
 	                                    (
-	                                    SELECT
-		                                    TMD.S_NAME,
-		                                    count( DISTINCT BARCODE ) AS 数量 
-	                                    FROM
-		                                    TP_PM_DEFECT TPD
-		                                    LEFT JOIN TP_MST_DEFECT TMD ON TPD.DEFECTID = TMD.DEFECTID 
-	                                    WHERE
-		                                    TPD.CREATETIME >= TRUNC( SYSDATE )
-		                                    AND TMD.DEFECTTYPEID IN ( 15,16,18,4 ) 
-											AND TPD.DEFECTPROCEDUREID IN (118, 92, 88,91,93)
-	                                    GROUP BY
-		                                    TMD.S_NAME 
+	                                   SELECT
+																		 DF.S_NAME as S_NAME,
+																		 COUNT(DISTINCT sed.BARCODE) as 数量
+																			FROM TP_PM_SEMICHECK  sed
+																			left JOIN TP_PM_SEMICHECKDEFECT se on se.SEMICHECKID=sed.SEMICHECKID
+																			LEFT JOIN TP_MST_DEFECT DF ON DF.DEFECTCODE=SE.DEFECTCODE
+																			WHERE
+																			  sed.CREATETIME >= TRUNC( SYSDATE ) AND SED.SEMICHECKTYPE=2
+																				AND sed.GROUTINGLINECODE LIKE 'C0%'
+																				 GROUP BY
+		                                     DF.S_NAME
 	                                    ORDER BY
-		                                    count( * ) DESC 
+		                                    COUNT(DISTINCT sed.BARCODE) DESC 
 	                                    ) T 
                                     WHERE
 	                                    ROWNUM < 4";

wwwroot/main/Procedure/test7/demo.html

@@ -354,12 +354,20 @@
             $.get("demo.ashx?m=defectb", function (data) {
                 var json = JSON.parse(data);
                 if (json["success"] == true) {
+                    var defect2 = ""
+                    var defectname2 = 0
+                    var defect3 = ""
+                    var defectname3 = 0
                     var defect1 = parseFloat(json["rows"][0]["数量"]);
-                    var defect2 = parseFloat(json["rows"][1]["数量"]);
-                    var defect3 = parseFloat(json["rows"][2]["数量"]);
                     var defectname1 = json["rows"][0]["缺陷名称"];
-                    var defectname2 = json["rows"][1]["缺陷名称"];
-                    var defectname3 = json["rows"][2]["缺陷名称"];
+                    if (json["rows"].length > 1) {
+                        defect2 = parseFloat(json["rows"][1]["数量"]);
+                        defectname2 = json["rows"][1]["缺陷名称"];
+                    }
+                    if (json["rows"].length > 2) {
+                        defect3 = parseFloat(json["rows"][2]["数量"]);
+                        defectname3 = json["rows"][2]["缺陷名称"];
+                    }
                     window.DefectB.data.datasets[0].data = [defect1, defect2, defect3];
                     window.DefectB.data.labels = [defectname1, defectname2, defectname3]
                     window.DefectB.update();