驾驶舱看板调整

wwwroot/main/manage/JiaShiCang/demo.html

@@ -91,9 +91,14 @@
 				</div>
 				<div class="doughnut">
 					<canvas id="canvas031" style="margin-left:60px; margin-top:120px;"></canvas>
-
-					<canvas id="canvas032" style="margin-left:440px; margin-top:-200px"></canvas>
-
+					<label style="font-size: 30px; color: white; margin-left: 100px; width:1070px">
+						一车间
+						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+						二车间
+						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+						三车间
+					</label>
+					<canvas id="canvas032" style="margin-left:440px; margin-top:-250px"></canvas>
 					<canvas id="canvas033" style="margin-left:820px; margin-top:-200px"></canvas>
 				</div>
 			</div>
@@ -119,7 +124,14 @@
 				</div>
 				<div class="doughnut">
 					<canvas id="canvas021" style="margin-left:60px; margin-top:120px;"></canvas>
-					<canvas id="canvas022" style="margin-left:440px; margin-top:-200px"></canvas>
+					<label style="font-size: 30px; color: white; margin-left: 100px; width:1070px">
+						一车间
+						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+						二车间
+						&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
+						三车间
+					</label>
+					<canvas id="canvas022" style="margin-left:440px; margin-top:-250px"></canvas>
 					<canvas id="canvas023" style="margin-left:820px; margin-top:-200px"></canvas>
 				</div>
 			</div>
@@ -272,9 +284,7 @@
 			initAll();
 			//设置缩放
 			xuwell.setScale(0.391);
-			//loadAll();
-            load08();
-            load02(); load03();
+			loadAll();
 		});
 
 		//初期加载画面样式
@@ -663,7 +673,7 @@
 			var ctx033 = document.getElementById("canvas033").getContext("2d");
 			window.chart033 = new Chart(ctx033, config033);
 		}
-		//每周各车间成型产量湿收率
+		//新品入仓
 		function init04() {
 			window.config04 = {
 				data: {
@@ -711,8 +721,8 @@
 								labelString: 'Value'
 							},
 							ticks: {
-								min: 100,
-								stepSize: 500
+								min: 500,
+								stepSize: 1000
 							}
 						}]
 					}
@@ -1108,11 +1118,10 @@
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
 					let onedate = []; let onelabel = [];
-					//var num = parseInt(json["rows"][0]["ROWNUM"]);
 					var num = parseInt(json["rows"].length);
 					for (var i = 0; i < num; i++) {
 						onedate.push(parseInt(json["rows"][i]["FINNUM"]));
-						onelabel.push(json["rows"][i]["GOODSCODE"]);
+						onelabel.push(json["rows"][i]["MATERIALCODE"]);
 						window.chart04.data.labels = onelabel;
 						window.chart04.data.datasets[0].data = onedate;
 						window.chart04.update();
@@ -1216,7 +1225,6 @@
 			$.get("rpt.ashx?m=Load10", function (data) {
 				//更新图表数据
 				var json = JSON.parse(data);
-				console.log(json);
 				if (json["success"] == true) {
 					let onedate1 = [];
 					let onedate2 = [];
@@ -1236,7 +1244,7 @@
 		//品管抽检数据展示
 		function load09() {
 			//加载数据
-			$.get("rpt.ashx?m=Load90", function (data) {
+			$.get("rpt.ashx?m=Load09", function (data) {
 				//更新图表数据
 				var json = JSON.parse(data);
 				if (json["success"] == true) {
@@ -1248,7 +1256,6 @@
 						onedate1.push(parseInt(json["rows"][i]["WANCHENGLV"]));
 						onedate2.push(parseInt(json["rows"][i]["HEGELV"]));
 						onedate3.push(json["rows"][i]["DICTIONARYVALUE"]);
-
 					}
 					window.chart09.data.datasets[0].data = onedate1;
 					window.chart09.data.datasets[1].data = onedate2;

wwwroot/main/manage/JiaShiCang/rpt.ashx

@@ -1175,98 +1175,137 @@ public class rpt : IHttpHandler, IReadOnlySessionState
             }
 		if (context.Request["m"].ToString() == "Load09")
             {
-                string sqlStr = @"
-													SELECT 
+                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 
+														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 
+															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_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_MST_DATADICTIONARY.DICTIONARYVALUE UNION ALL
+															SELECT
 																TP_PM_FQCITEMSDATA.INSPECTTYPE,
-																TP_MST_DATADICTIONARY.DICTIONARYVALUE
-														) T
-													   GROUP BY 
-															T.INSPECTTYPE,
-															T.DICTIONARYVALUE
-													) TT;
-													
-													
+																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;
 													--缺陷占比前三
-													SELECT 
+													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; ";
+														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";
                 DataTable dt = conn.ExecuteDatatable(sqlStr);
                 string jsonStr = new JsonResult(dt).ToJson();
                 context.Response.Write(jsonStr);