驾驶舱 看板调整

wwwroot/main/manage/JiaShiCang/demo.html

@@ -1299,7 +1299,6 @@
 					temp = temp.replace('{进水孔内孔/圆度}', json["rows"][2]['ZHANBI']);
 					temp = temp.replace('{外观缺陷}', json["rows"][3]['ZHANBI']);
 					$("#tablepinguan").append(temp);
-
 				}
 			});
 		}

wwwroot/main/manage/JiaShiCang/rpt.ashx

@@ -1175,137 +1175,58 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             }
 		if (context.Request["m"].ToString() == "Load09")
             {
-                string sqlStr = @"SELECT
-														TT.DICTIONARYVALUE,
-														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.00' 
-															) 
-														) 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.00' 
-															) 
-														) 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
+                string sqlStr = @"SELECT 
+												SUBSTR(TT.DICTIONARYVALUE, 0, 4) AS DICTIONARYVALUE,
+												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.00')) 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.00')) 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 
-														) T 
-													GROUP BY
-														T.INSPECTTYPE,
-														T.DICTIONARYVALUE 
-														) TT;
-													--缺陷占比前三
-													SELECT
-														T.ALLCOUNT,
-														T.INSPECTITEM,
-														T.SUMCOUNT,
-														CODE (
-															NVL( T.ALLCOUNT, 0 ),
-															0,
-															'0%',
-															TO_CHAR(
-																(
-																	( NVL( T.ALLCOUNT, 0 ) ) / DECODE( NVL( T.SUMCOUNT, 1 ), 0, 1, NVL( T.SUMCOUNT, 1 ) ) 
-																) * 100,
-																'FM99990.00' 
-															) || '%' 
-														) AS ZHANBI 
-													FROM
-														(
-														SELECT
-															COUNT( 1 ) ALLCOUNT,
-															INSPECTITEM,
-															SUM1.SUMCOUNT 
-														FROM
-															TP_PM_FQCITEMSDATA
-															LEFT JOIN (
-															SELECT
-																COUNT( 1 ) SUMCOUNT,
-																VALUEFLAG 
-															FROM
-																TP_PM_FQCITEMSDATA 
-															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 ) 
-																AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0 
-															GROUP BY
-																VALUEFLAG 
-															) SUM1 ON SUM1.VALUEFLAG = TP_PM_FQCITEMSDATA.VALUEFLAG 
-														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 ) 
-															AND TP_PM_FQCITEMSDATA.ISQUALIFIED = 0 
-														GROUP BY
-															INSPECTITEM,
-															SUM1.SUMCOUNT 
-														ORDER BY
-															ALLCOUNT DESC 
-														) T 
-													WHERE
-														ROWNUM < 4";
+												   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";
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);
@@ -1499,8 +1420,8 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             {
                 string sqlStr = @"SELECT 
 											T.ALLCOUNT,
-										  T.INSPECTITEM,
-										  T.SUMCOUNT,
+										    T.INSPECTITEM,
+										    T.SUMCOUNT,
 											DECODE(NVL(T.ALLCOUNT, 0) ,0 ,'0%' ,TO_CHAR(((NVL(T.ALLCOUNT, 0)) / DECODE(NVL(T.SUMCOUNT, 1) ,0 ,1 ,NVL(T.SUMCOUNT, 1))) * 100 ,'FM99990.00')|| '%') AS ZHANBI
 										  FROM (
 												SELECT 
@@ -1532,7 +1453,7 @@ public class rpt : IHttpHandler, IReadOnlySessionState
 											ORDER BY 
 													ALLCOUNT DESC 
 											) T
-										WHERE ROWNUM < = 4 ";
+										WHERE ROWNUM < 5";
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);