驾驶舱大屏品管抽检数据展示更新

wwwroot/main/manage/JiaShiCang/demo.html

@@ -1510,7 +1510,7 @@
 						onedate4.push((json["rows"][i]["INSPECTIONQUANTITY"]));
 						onedate1.push((json["rows"][i]["WANCHENGLV"]));
 						onedate2.push((json["rows"][i]["HEGELV"]));
-						onedate3.push(json["rows"][i]["DICTIONARYVALUE"]);
+                        onedate3.push(json["rows"][i]["PLANDATE"]);
 					}
 					window.chart09.data.datasets[0].data = onedate1;
 					window.chart09.data.datasets[1].data = onedate2;

wwwroot/main/manage/JiaShiCang/rpt.ashx

@@ -1353,59 +1353,33 @@ ORDER BY DECODE(NVL(成检废品数.数量, 0),0,'0%',TO_CHAR(((NVL(成检废品
             }
             if (context.Request["m"].ToString() == "Load09")
             {
-                string sqlStr = @"SELECT 
-												SUBSTR(TT.DICTIONARYVALUE, 0, 4) AS DICTIONARYVALUE,
-												TT.INSPECTIONQUANTITY,
-												DECODE(NVL(TT.INSPECTIONQUANTITY, 0),0,0,TO_CHAR(((NVL(TT.INSPECTIONQUANTITY, 0)) /DECODE(NVL(TT.PLANINSPECTIONQUANTITY, 1),0,1,NVL(TT.PLANINSPECTIONQUANTITY, 1))) * 100,'fm99990.0')) AS WANCHENGLV,
-												100 - DECODE(NVL(TT.BUHEGESHU, 0) ,0 ,0,TO_CHAR(((NVL(TT.BUHEGESHU, 0)) / DECODE(NVL(TT.INSPECTIONQUANTITY, 1), 0, 1, NVL(TT.INSPECTIONQUANTITY, 1))) * 100,'fm99990.0')) AS HEGELV
-											FROM (
-												SELECT 
-													T.INSPECTTYPE,
-													T.DICTIONARYVALUE,
-													SUM(T.PLANINSPECTIONQUANTITY) PLANINSPECTIONQUANTITY,
-													SUM(T.INSPECTIONQUANTITY) INSPECTIONQUANTITY,
-													SUM(T.BUHEGESHU) BUHEGESHU
-												FROM (
-													SELECT 
-														TP_PM_FQCITEMSPLAN.INSPECTTYPE,
-												   TP_MST_DATADICTIONARY.DICTIONARYVALUE,
-												   SUM(TP_PM_FQCITEMSPLAN.PLANINSPECTIONQUANTITY) PLANINSPECTIONQUANTITY,
-												   SUM(TP_PM_FQCITEMSPLAN.INSPECTIONQUANTITY) INSPECTIONQUANTITY,
-												   0 BUHEGESHU
-													FROM TP_PM_FQCITEMSPLAN
-													LEFT JOIN TP_MST_DATADICTIONARY ON TP_MST_DATADICTIONARY.DICTIONARYID = TP_PM_FQCITEMSPLAN.INSPECTTYPE
-												 LEFT JOIN TP_MST_GOODS ON TP_MST_GOODS.GOODSID = TP_PM_FQCITEMSPLAN.GOODSID
-												 LEFT JOIN TP_MST_GOODSTYPE GT ON GT.GOODSTYPEID = TP_MST_GOODS.GOODSTYPEID AND TP_MST_DATADICTIONARY.DICTIONARYTYPE = 'TPC021'
-												 WHERE TP_PM_FQCITEMSPLAN.VALUEFLAG = 1
-												   AND TP_PM_FQCITEMSPLAN.ACCOUNTID = 1
-												   AND TP_PM_FQCITEMSPLAN.CREATETIME >= TRUNC(SYSDATE - 7)
-												   AND TRUNC(TP_PM_FQCITEMSPLAN.CREATETIME) <= TRUNC(SYSDATE)
-												   AND TP_PM_FQCITEMSPLAN.INSPECTTYPE IN (616, 617, 653, 654, 647)
-												   AND TP_PM_FQCITEMSPLAN.INSPECTIONQUANTITY <> 0
-												 GROUP BY 
-														TP_PM_FQCITEMSPLAN.INSPECTTYPE,
-														TP_MST_DATADICTIONARY.DICTIONARYVALUE
-												 UNION ALL
-												 SELECT 
-														TP_PM_FQCITEMSDATA.INSPECTTYPE,
-												   TP_MST_DATADICTIONARY.DICTIONARYVALUE,
-												   0 PLANINSPECTIONQUANTITY,
-												   0 INSPECTIONQUANTITY,
-												   SUM(CASE WHEN TP_PM_FQCITEMSDATA.ISQUALIFIED = 0 THEN 1 ELSE 0 END) BUHEGESHU
-												 FROM TP_PM_FQCITEMSDATA
-												 LEFT JOIN TP_MST_DATADICTIONARY ON TP_MST_DATADICTIONARY.DICTIONARYID = TP_PM_FQCITEMSDATA.INSPECTTYPE
-												 WHERE TP_PM_FQCITEMSDATA.VALUEFLAG = 1
-												   AND TP_PM_FQCITEMSDATA.CREATETIME >= TRUNC(SYSDATE - 7)
-												   AND TRUNC(TP_PM_FQCITEMSDATA.CREATETIME) <= TRUNC(SYSDATE)
-												   AND TP_PM_FQCITEMSDATA.INSPECTTYPE IN (616, 617, 653, 654, 647)
-												 GROUP BY 
-														TP_PM_FQCITEMSDATA.INSPECTTYPE,
-														TP_MST_DATADICTIONARY.DICTIONARYVALUE
-												) T
-											   GROUP BY 
-													T.INSPECTTYPE,
-													T.DICTIONARYVALUE
-											) TT";
+                string sqlStr = @"SELECT   
+                          TO_CHAR(TT.plandate, 'MM-DD')AS plandate  ,
+                        TT.INSPECTIONQUANTITY,
+                        DECODE(NVL(TT.INSPECTIONQUANTITY, 0),0,0,TO_CHAR(((NVL(TT.INSPECTIONQUANTITY, 0)) /DECODE(NVL(TT.PLANINSPECTIONQUANTITY, 1),0,1,NVL(TT.PLANINSPECTIONQUANTITY, 1))) * 100,'fm99990.0')) AS WANCHENGLV,
+                        100 - DECODE(NVL(TT.BUHEGESHU, 0) ,0 ,0,TO_CHAR(((NVL(TT.BUHEGESHU, 0)) / DECODE(NVL(TT.INSPECTIONQUANTITY, 1), 0, 1, NVL(TT.INSPECTIONQUANTITY, 1))) * 100,'fm99990.0')) AS HEGELV
+                      FROM (
+                         SELECT 
+                              t.plandate  
+                              ,SUM(t.planquantity) PLANINSPECTIONQUANTITY
+                              ,SUM(t.INSPECTIONQUANTITY) INSPECTIONQUANTITY
+                              ,SUM(t.unqualifiedquantity) BUHEGESHU
+                          FROM (SELECT  
+                                      fp.plandate
+                                      ,SUM(fp.planinspectionquantity) planquantity
+                                      ,SUM(fp.inspectionquantity) INSPECTIONQUANTITY
+                                      ,COUNT(DISTINCT fd.barcode) unqualifiedquantity
+                                  FROM tp_pm_fqcitemsplan fp
+                                  LEFT JOIN tp_pm_fqcitemsdata fd
+                                    ON fd.planid = fp.planid
+                                   AND fd.isqualified = 0
+                                 WHERE fp.plandate > TRUNC(SYSDATE - 7)
+                                   AND fp.plandate  <= TRUNC(SYSDATE)
+                                   AND fp.configtype IN ('大件', '小件')
+                                   AND fp.planinspectionquantity <> 0 
+                                 GROUP BY  fp.plandate) t 
+                                          GROUP BY   t.plandate
+                        ) TT ORDER BY plandate ";
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);