成检 成型修改产量算法

wwwroot/main/Procedure/Boardkanban/Boardkanban.ashx

@@ -134,10 +134,52 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
 													),
 													一烧产量 as (
 
-													SELECT  COUNT(*) 一烧产量 FROM TP_PM_PRODUCTIONDATA 
-													WHERE PROCEDUREID IN(16) AND VALUEFLAG=1  AND TRUNC(CREATETIME)>={first} AND TRUNC(CREATETIME)<={second} 
-
-													AND GOODSLEVELID IN(4,5)
+												 SELECT COUNT( DISTINCT BARCODE ) 一烧出窑量 FROM (
+ SELECT
+	* 
+FROM
+	(
+	SELECT
+		BARCODE,
+		PROCEDUREID,
+		GOODSLEVELTYPEID,
+		GOODSCODE,
+		UNITPRICE,
+		GOODSNAME,
+		row_number ( ) over ( partition BY BARCODE ORDER BY GOODSLEVELTYPEID DESC ) AS rownums 
+	FROM
+		(
+		SELECT DISTINCT
+			PD.BARCODE,
+			pd.PROCEDUREID,
+			gd.GOODSNAME,
+		CASE
+				WHEN PDS.GOODSLEVELTYPEID < PD.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID < PDS.GOODSLEVELTYPEID THEN
+				PDS.GOODSLEVELTYPEID 
+				WHEN PDS.GOODSLEVELTYPEID IS NULL THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID = PDS.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID ELSE NULL 
+			END GOODSLEVELTYPEID,
+	pd.GOODSCODE AS GOODSCODE,
+	gd.UNITPRICE 
+FROM
+	TP_PM_PRODUCTIONDATA pd
+	LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID = pd.GOODSID
+	LEFT JOIN TP_PM_PRODUCTIONDATA pds ON PDS.BARCODE = PD.BARCODE 
+	AND PDS.PROCEDUREID = 60 
+	AND PDS.VALUEFLAG = 1 
+WHERE
+	pd.VALUEFLAG = 1 
+	AND TRUNC(PD.CREATETIME)>=  {first}AND TRUNC(PD.CREATETIME)< {second}
+	AND pd.PROCEDUREID = 16 
+	) 
+	) 
+WHERE
+	rownums =1
+ )
 													),
 													重烧产量 as (
 													SELECT COUNT(DISTINCT BARCODE)AS 重烧产量 FROM TP_PM_PRODUCTIONDATA
@@ -249,8 +291,53 @@ public class  FormingKanban : IHttpHandler, IReadOnlySessionState
             {
                 string sqlStr = @"with 一烧产量 AS 
 												(
-											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID IN (4,5) AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
-												),
+											   SELECT COUNT( DISTINCT BARCODE ) 出窑数 FROM (
+ SELECT
+	* 
+FROM
+	(
+	SELECT
+		BARCODE,
+		PROCEDUREID,
+		GOODSLEVELTYPEID,
+		GOODSCODE,
+		UNITPRICE,
+		GOODSNAME,
+		row_number ( ) over ( partition BY BARCODE ORDER BY GOODSLEVELTYPEID DESC ) AS rownums 
+	FROM
+		(
+		SELECT DISTINCT
+			PD.BARCODE,
+			pd.PROCEDUREID,
+			gd.GOODSNAME,
+		CASE
+				WHEN PDS.GOODSLEVELTYPEID < PD.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID < PDS.GOODSLEVELTYPEID THEN
+				PDS.GOODSLEVELTYPEID 
+				WHEN PDS.GOODSLEVELTYPEID IS NULL THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID = PDS.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID ELSE NULL 
+			END GOODSLEVELTYPEID,
+	pd.GOODSCODE AS GOODSCODE,
+	gd.UNITPRICE 
+FROM
+	TP_PM_PRODUCTIONDATA pd
+	LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID = pd.GOODSID
+	LEFT JOIN TP_PM_PRODUCTIONDATA pds ON PDS.BARCODE = PD.BARCODE 
+	AND PDS.PROCEDUREID = 60 
+	AND PDS.VALUEFLAG = 1 
+WHERE
+	pd.VALUEFLAG = 1 
+	AND TRUNC( PD.CREATETIME ) = trunc(sysdate) 
+	AND pd.PROCEDUREID = 16 
+	) 
+	) 
+WHERE
+	rownums =1
+ )
+						WHERE 					GOODSLEVELTYPEID in(4,5)	),
 												检验数 AS 
 												(
 											  SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
@@ -338,19 +425,54 @@ SELECT
 			{
 				string sqlStr = @"		with	一烧产量 AS 
 												(
-												SELECT
-												SJ,
-												SUM(一烧产量) AS 一烧产量
-												FROM
-												(
-												SELECT
-												TO_CHAR(CREATETIME,'MM-DD')AS SJ,
-												 COUNT( * ) 一烧产量 FROM TP_PM_PRODUCTIONDATA 
-												WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELTYPEID IN (4,5)   
-												and VALUEFLAG=1 AND TRUNC(CREATETIME)>=  {first}AND TRUNC(CREATETIME)< {second}
-												GROUP BY CREATETIME)
-												GROUP BY SJ ORDER BY SJ
-												),
+												 SELECT 	TO_CHAR(CREATETIME,'MM-DD')AS SJ,COUNT( DISTINCT BARCODE ) 一烧产量 FROM (
+ SELECT
+	* 
+FROM
+	(
+	SELECT
+		BARCODE,
+		PROCEDUREID,
+		GOODSLEVELTYPEID,
+		GOODSCODE,
+		UNITPRICE,
+		GOODSNAME,CREATETIME,
+		row_number ( ) over ( partition BY BARCODE ORDER BY GOODSLEVELTYPEID DESC ) AS rownums 
+	FROM
+		(
+		SELECT DISTINCT
+			PD.BARCODE,
+			pd.PROCEDUREID,
+			gd.GOODSNAME,
+		CASE
+				WHEN PDS.GOODSLEVELTYPEID < PD.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID < PDS.GOODSLEVELTYPEID THEN
+				PDS.GOODSLEVELTYPEID 
+				WHEN PDS.GOODSLEVELTYPEID IS NULL THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID = PDS.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID ELSE NULL 
+			END GOODSLEVELTYPEID,
+			pd.CREATETIME,
+	pd.GOODSCODE AS GOODSCODE,
+	gd.UNITPRICE 
+FROM
+	TP_PM_PRODUCTIONDATA pd
+	LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID = pd.GOODSID
+	LEFT JOIN TP_PM_PRODUCTIONDATA pds ON PDS.BARCODE = PD.BARCODE 
+	AND PDS.PROCEDUREID = 60 
+	AND PDS.VALUEFLAG = 1 
+WHERE
+	pd.VALUEFLAG = 1 
+	AND TRUNC(PD.CREATETIME)>=  {first}AND TRUNC(PD.CREATETIME)< {second}
+	AND pd.PROCEDUREID = 16 
+	) 
+	) 
+WHERE
+	rownums =1
+ )
+				GROUP BY 						TO_CHAR(CREATETIME,'MM-DD')												),
 												
 												
 												

wwwroot/main/Procedure/Boardkanban/Boardkanban.html

@@ -35,7 +35,7 @@
                 </div>
             </div>
             <div style="width:1840px;height:40%;display:flex;flex-direction:row; margin-top:-5%">
-                <div style="width: 78%; height: 100px; ">
+                <div style="width: 79%; height: 100px; ">
                     <canvas id="canvasMonthCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 120px; width: 100%;"></canvas>
                 </div>
             </div>
@@ -43,16 +43,16 @@
             <div>
                 <table rules="none" align="right" style="width: 22%; height: 270px; margin-left: 80%; margin-top: -671px ">
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
+                        <td style="width: 7%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">月度一烧产量：&nbsp;&nbsp;&nbsp;<span id="ysc" style="color:white;"> 加载中...</span></td>
+                        <td style="width: 7%; height: 95px; font-size: 30px; text-align: left ">月度一烧产量：&nbsp;&nbsp;&nbsp;<span id="ysc" style="color:white;"> 加载中...</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">月度综合产量：&nbsp;&nbsp;&nbsp;<span id="zhc" style="color:white;"> 加载中...</span></td>
+                        <td style="width: 7%; height: 95px; font-size: 30px; text-align: left ">月度综合产量：&nbsp;&nbsp;&nbsp;<span id="zhc" style="color:white;"> 加载中...</span></td>
                     </tr>
                     <tr class="tr_title_warning">
-                        <td style="width: 8%; height: 95px; font-size: 30px; text-align: left ">月度一烧出窑量：<span id="yscy" style="color:white;">加载中...</span></td>
+                        <td style="width: 7%; height: 95px; font-size: 30px; text-align: left ">月度一烧出窑量：<span id="yscy" style="color:white;">加载中...</span></td>
                     </tr>
                 </table>
             </div>

wwwroot/main/Procedure/FormingKanban/FormingKanban.ashx

@@ -156,16 +156,60 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 												LEFT JOIN TP_MST_DEFECT df ON df.DEFECTID = dfc.DEFECTID 
 												WHERE dfc.VALUEFLAG=1
 												and TRUNC(dfc.CREATETIME)=TRUNC(SYSDATE)
-												AND  dfc.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
-												'糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坯磕','漏气','空泡','水封不良','冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球') 
+												AND  df.DEFECTTYPEID=1
 												),
 												一烧产量 AS 
 												(
-											  SELECT COUNT( * ) 出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID IN (15,16)  AND GOODSLEVELID IN (1,4,5) AND TRUNC( CREATETIME ) = trunc(sysdate)    and VALUEFLAG=1 
+											  SELECT COUNT( DISTINCT BARCODE ) 出窑数 FROM (
+ SELECT
+	* 
+FROM
+	(
+	SELECT
+		BARCODE,
+		PROCEDUREID,
+		GOODSLEVELTYPEID,
+		GOODSCODE,
+		UNITPRICE,
+		GOODSNAME,
+		row_number ( ) over ( partition BY BARCODE ORDER BY GOODSLEVELTYPEID DESC ) AS rownums 
+	FROM
+		(
+		SELECT DISTINCT
+			PD.BARCODE,
+			pd.PROCEDUREID,
+			gd.GOODSNAME,
+		CASE
+				WHEN PDS.GOODSLEVELTYPEID < PD.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID < PDS.GOODSLEVELTYPEID THEN
+				PDS.GOODSLEVELTYPEID 
+				WHEN PDS.GOODSLEVELTYPEID IS NULL THEN
+				PD.GOODSLEVELTYPEID 
+				WHEN PD.GOODSLEVELTYPEID = PDS.GOODSLEVELTYPEID THEN
+				PD.GOODSLEVELTYPEID ELSE NULL 
+			END GOODSLEVELTYPEID,
+	pd.GOODSCODE AS GOODSCODE,
+	gd.UNITPRICE 
+FROM
+	TP_PM_PRODUCTIONDATA pd
+	LEFT JOIN TP_MST_GOODS gd ON gd.GOODSID = pd.GOODSID
+	LEFT JOIN TP_PM_PRODUCTIONDATA pds ON PDS.BARCODE = PD.BARCODE 
+	AND PDS.PROCEDUREID = 60 
+	AND PDS.VALUEFLAG = 1 
+WHERE
+	pd.VALUEFLAG = 1 
+	AND TRUNC(PD.CREATETIME)=TRUNC(SYSDATE) 
+	AND pd.PROCEDUREID = 16 
+	) 
+	) 
+WHERE
+	rownums =1
+ )
 												),
 											检验数 AS 
 												(
-											  SELECT COUNT( * ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
+											  SELECT COUNT( DISTINCT BARCODE ) 一烧出窑数 FROM TP_PM_PRODUCTIONDATA WHERE PROCEDUREID =16  and VALUEFLAG=1 	AND TRUNC(CREATETIME)=TRUNC(SYSDATE) 
 												)
 												SELECT
 												一烧产量.出窑数 ,
@@ -363,7 +407,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 													TMG.GOODSLEVELNAME 产品分级
 													FROM TP_PM_DEFECT TMDP
 													LEFT JOIN TP_MST_DEFECT DF ON DF.DEFECTID=TMDP.DEFECTID
-													AND DF.DEFECTTYPEID=1
+												
 														LEFT JOIN TP_MST_USERSTAFF class on class.USERID=tmdp.DEFECTUSERID
 														LEFT JOIN TP_HR_STAFF stf on stf.STAFFID=class.STAFFID
 														LEFT JOIN TP_PM_PRODUCTIONDATA PD ON TMDP.PRODUCTIONDATAID = PD.PRODUCTIONDATAID
@@ -375,9 +419,7 @@ public class FormingKanban : IHttpHandler, IReadOnlySessionState
 														AND TMDP.VALUEFLAG = '1' --有效 
 														AND TRUNC( TMDP.CREATETIME ) = trunc(sysdate)  
 														AND DF.DEFECTTYPEID=1
-														AND TMDP.DEFECTNAME IN ('坯脏','棕眼','裂底','裂圈','裂鼻子','裂水道','裂管','沾接裂','裂眼','板折',
-														 '糙活','变形','渣','管道渣','孔眼不良','睹眼','眼歪','丢气孔','丢眼','坯磕','漏气','空泡','水封不良',
-														 '冲刷不好','泥埂','断浆迹','模迹','重皮','气泡','眼扁','水绺','卡球')
+															AND DF.DEFECTTYPEID=1
 														
 															)";
                 //直接获取不分页数据

wwwroot/main/Procedure/FormingKanban/FormingKanban.html

@@ -118,7 +118,7 @@
                     </tr>
                     <tr class="tr_title_warning">
                         <td style="font-size: 27px; width: 25%; height: 30px; ">责任工号</td>
-                        <td style="font-size: 27px; width: 25%; height: 30px; ">产品编码</td>
+                        <td style="font-size: 27px; width: 25%; height: 30px; ">生产线号</td>
                         <td style="font-size: 27px; width: 25%; height: 30px; ">缺陷名称</td>
                         <td style="font-size: 27px; width: 25%; height: 30px; ">产品分级</td>
                     </tr>

wwwroot/main/Procedure/HalfCheckKanban/HalfCheckKanban.html

@@ -28,31 +28,31 @@
 
             <!--31天产量曲线图-->
             <div style="width: 1840px; height: 30%; display: flex; flex-direction: row; margin-top: 15px">
-                <div style="width: 80%; height: 200px;">
+                <div style="width: 81%; height: 200px;">
                     <canvas id="canvasDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 220px; width: 100% "></canvas>
                 </div>
             </div>
             <div style="width:1840px;height:40%;display:flex;flex-direction:row; margin-top:-4%">
-                <div style="width: 80%; height: 180px; ">
+                <div style="width: 81%; height: 180px; ">
                     <canvas id="canvasMonthDayCL" style="-moz-user-select: none; -webkit-user-select: none; -ms-user-select: none; height: 200px; width: 100%;"></canvas>
                 </div>
             </div>
             <div>
                 <table rules="none" align="right" style="width: 20%; height: 270px; margin-left:80%;margin-top:-635px ">
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
+                        <td style="width: 7%; height: 60px; font-size: 30px; text-align: left" colspan="2"><strong><span id="sj" style="color:white;">2023-4-30 00:00:00</span></strong></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 75px; font-size: 35px; text-align: left ">月入库量：<span id="yrk" style="color:white;">加载中...</span></td>
+                        <td style="width: 7%; height: 75px; font-size: 35px; text-align: left ">月入库量：<span id="yrk" style="color:white;">加载中...</span></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 75px; font-size: 35px; text-align: left ">月出库量：<span id="yck" style="color:white;">加载中...</span></td>
+                        <td style="width: 7%; height: 75px; font-size: 35px; text-align: left ">月出库量：<span id="yck" style="color:white;">加载中...</span></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 70px; font-size: 35px; text-align: left ">月检验量：<span id="yjyl" style="color:white;">加载中...</span></td>
+                        <td style="width: 7%; height: 70px; font-size: 35px; text-align: left ">月检验量：<span id="yjyl" style="color:white;">加载中...</span></td>
                     </tr>
                     <tr class="tr_bg_dark_warning">
-                        <td style="width: 8%; height: 75px; font-size: 35px; text-align: left ">精坯库存：<span id="kc" style="color:white;">加载中...</span></td>
+                        <td style="width: 7%; height: 75px; font-size: 35px; text-align: left ">精坯库存：<span id="kc" style="color:white;">加载中...</span></td>
                     </tr>
                 </table>
             </div>