林勇 冯 2 жил өмнө
parent
commit
e28be8bd21
1 өөрчлөгдсөн 208 нэмэгдсэн , 137 устгасан
  1. 208 137
      wwwroot/App_Code/Led.cs

+ 208 - 137
wwwroot/App_Code/Led.cs

@@ -22,75 +22,83 @@ public static class Led
 		DataTable infoDt = new DataTable();
 		//读取看板数据
 		using (IDataAccess conn = DataAccess.Create())
-		{	  
+		{
 			//一线明细
 			oneDt = conn.ExecuteDatatable(@"
 				SELECT
-					'07-09' AS sj,
-					SUM( ct ) 
+					sj,
+					CL 
 				FROM
 					(
 					SELECT
-						TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
-						COUNT( pd.BARCODE ) ct 
+						'07-09' AS sj,
+						SUM( ct ) CL 
 					FROM
-						TP_PM_PRODUCTIONDATA pd 
+						(
+						SELECT
+							TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
+							COUNT( pd.BARCODE ) ct 
+						FROM
+							TP_PM_PRODUCTIONDATA pd 
+						WHERE
+							pd.USERCODE = 'Z26' 
+							AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
+							AND pd.VALUEFLAG = 1 
+							AND pd.PROCEDUREID = 2 
+						GROUP BY
+							TO_CHAR( pd.CREATETIME, 'hh24' ) 
+						ORDER BY
+							TO_CHAR( pd.CREATETIME, 'hh24' ) 
+						) 
 					WHERE
-						pd.USERCODE = 'Z26' 
-						AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
-						AND pd.VALUEFLAG = 1 
-						AND pd.PROCEDUREID = 2 
-					GROUP BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					ORDER BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					) 
-				WHERE
-					sj IN ( '07', '08' ) UNION ALL
-				SELECT
-					sj,
-					ct 
-				FROM
-					(
+						sj IN ( '07', '08' ) UNION ALL
 					SELECT
-						TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
-						COUNT( pd.BARCODE ) ct 
+						sj,
+						ct 
 					FROM
-						TP_PM_PRODUCTIONDATA pd 
+						(
+						SELECT
+							TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
+							COUNT( pd.BARCODE ) ct 
+						FROM
+							TP_PM_PRODUCTIONDATA pd 
+						WHERE
+							pd.USERCODE = 'Z26' 
+							AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
+							AND pd.VALUEFLAG = 1 
+							AND pd.PROCEDUREID = 2 
+						GROUP BY
+							TO_CHAR( pd.CREATETIME, 'hh24' ) 
+						ORDER BY
+							TO_CHAR( pd.CREATETIME, 'hh24' ) 
+						) 
 					WHERE
-						pd.USERCODE = 'Z26' 
-						AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
-						AND pd.VALUEFLAG = 1 
-						AND pd.PROCEDUREID = 2 
-					GROUP BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					ORDER BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					) 
-				WHERE
-					sj NOT IN ( '07', '08', '12', '13' ) UNION ALL
-				SELECT
-					'12-14' AS sj,
-					SUM( ct ) 
-				FROM
-					(
+						sj NOT IN ( '07', '08', '12', '13' ) UNION ALL
 					SELECT
-						TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
-						COUNT( pd.BARCODE ) ct 
+						'12-14' AS sj,
+						SUM( ct ) 
 					FROM
-						TP_PM_PRODUCTIONDATA pd 
+						(
+						SELECT
+							TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
+							COUNT( pd.BARCODE ) ct 
+						FROM
+							TP_PM_PRODUCTIONDATA pd 
+						WHERE
+							pd.USERCODE = 'Z26' 
+							AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
+							AND pd.VALUEFLAG = 1 
+							AND pd.PROCEDUREID = 2 
+						GROUP BY
+							TO_CHAR( pd.CREATETIME, 'hh24' ) 
+						ORDER BY
+							TO_CHAR( pd.CREATETIME, 'hh24' ) 
+						) 
 					WHERE
-						pd.USERCODE = 'Z26' 
-						AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
-						AND pd.VALUEFLAG = 1 
-						AND pd.PROCEDUREID = 2 
-					GROUP BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					ORDER BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
+						sj IN ( '12', '13' ) 
 					) 
-				WHERE
-					sj IN ( '12', '13' )
+				ORDER BY
+					sj
 				",
 			   new CDAParameter("USERID", "")
 		   );
@@ -98,71 +106,79 @@ public static class Led
 			//二线明细
 			twoDt = conn.ExecuteDatatable(@"
 				SELECT
-					'07-09' AS sj,
-					SUM( ct ) 
-				FROM
-					(
-					SELECT
-						TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
-						COUNT( pd.BARCODE ) ct 
-					FROM
-						TP_PM_PRODUCTIONDATA pd 
-					WHERE
-						pd.USERCODE = 'Z26' 
-						AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
-						AND pd.VALUEFLAG = 1 
-						AND pd.PROCEDUREID = 2 
-					GROUP BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					ORDER BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					) 
-				WHERE
-					sj IN ( '07', '08' ) UNION ALL
-				SELECT
 					sj,
-					ct 
-				FROM
-					(
-					SELECT
-						TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
-						COUNT( pd.BARCODE ) ct 
-					FROM
-						TP_PM_PRODUCTIONDATA pd 
-					WHERE
-						pd.USERCODE = 'Z26' 
-						AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
-						AND pd.VALUEFLAG = 1 
-						AND pd.PROCEDUREID = 2 
-					GROUP BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					ORDER BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					) 
-				WHERE
-					sj NOT IN ( '07', '08', '12', '13' ) UNION ALL
-				SELECT
-					'12-14' AS sj,
-					SUM( ct ) 
+					CL 
 				FROM
 					(
 					SELECT
-						TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
-						COUNT( pd.BARCODE ) ct 
-					FROM
-						TP_PM_PRODUCTIONDATA pd 
-					WHERE
-						pd.USERCODE = 'Z26' 
-						AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
-						AND pd.VALUEFLAG = 1 
-						AND pd.PROCEDUREID = 2 
-					GROUP BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
-					ORDER BY
-						TO_CHAR( pd.CREATETIME, 'hh24' ) 
+									'07-09' AS sj,
+									SUM( ct ) CL
+								FROM
+									(
+									SELECT
+										TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
+										COUNT( pd.BARCODE ) ct 
+									FROM
+										TP_PM_PRODUCTIONDATA pd 
+									WHERE
+										pd.USERCODE = 'Z26' 
+										AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
+										AND pd.VALUEFLAG = 1 
+										AND pd.PROCEDUREID = 2 
+									GROUP BY
+										TO_CHAR( pd.CREATETIME, 'hh24' ) 
+									ORDER BY
+										TO_CHAR( pd.CREATETIME, 'hh24' ) 
+									) 
+								WHERE
+									sj IN ( '07', '08' ) UNION ALL
+								SELECT
+									sj,
+									ct 
+								FROM
+									(
+									SELECT
+										TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
+										COUNT( pd.BARCODE ) ct 
+									FROM
+										TP_PM_PRODUCTIONDATA pd 
+									WHERE
+										pd.USERCODE = 'Z26' 
+										AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
+										AND pd.VALUEFLAG = 1 
+										AND pd.PROCEDUREID = 2 
+									GROUP BY
+										TO_CHAR( pd.CREATETIME, 'hh24' ) 
+									ORDER BY
+										TO_CHAR( pd.CREATETIME, 'hh24' ) 
+									) 
+								WHERE
+									sj NOT IN ( '07', '08', '12', '13' ) UNION ALL
+								SELECT
+									'12-14' AS sj,
+									SUM( ct ) 
+								FROM
+									(
+									SELECT
+										TO_CHAR( pd.CREATETIME, 'hh24' ) sj,
+										COUNT( pd.BARCODE ) ct 
+									FROM
+										TP_PM_PRODUCTIONDATA pd 
+									WHERE
+										pd.USERCODE = 'Z26' 
+										AND TRUNC( pd.CREATETIME ) = trunc( SYSDATE ) 
+										AND pd.VALUEFLAG = 1 
+										AND pd.PROCEDUREID = 2 
+									GROUP BY
+										TO_CHAR( pd.CREATETIME, 'hh24' ) 
+									ORDER BY
+										TO_CHAR( pd.CREATETIME, 'hh24' ) 
+									) 
+								WHERE
+									sj IN ( '12', '13' )
 					) 
-				WHERE
-					sj IN ( '12', '13' )
+				ORDER BY
+					sj	
 				",
 			   new CDAParameter("USERID", "")
 		   );
@@ -205,32 +221,87 @@ public static class Led
 
 		//发送数据到LED
 		//SiemensS7.Open("172.19.2.71", 102);
-		SiemensS7.Open("172.19.26.82", 102);
-		SiemensS7.Write<short>("0.0", (Int16)infoDt.Rows[0]["总计"]);//包装总量
-		SiemensS7.Write<short>("2.0", (Int16)infoDt.Rows[0]["一线产量"]);//一线包装产量
-		SiemensS7.Write<short>("4.0", (Int16)infoDt.Rows[0]["二线产量"]);//二线包装产量
+		 SiemensS7.Open("172.19.26.82", 102);
+		if (infoDt != null && infoDt.Rows.Count > 0 && infoDt.Rows[0] != null && infoDt.Rows[0]["总计"] != null)
+		{
+			SiemensS7.Write<short>("0.0", Convert.ToInt16(infoDt.Rows[0]["总计"]));//包装总量
+		}
+		if (infoDt != null && infoDt.Rows.Count > 0 && infoDt.Rows[0] != null && infoDt.Rows[0]["一线产量"] != null)
+		{
+			SiemensS7.Write<short>("2.0", Convert.ToInt16(infoDt.Rows[0]["一线产量"]));//一线包装产量
+		}
+		if (infoDt != null && infoDt.Rows.Count > 0 && infoDt.Rows[0] != null && infoDt.Rows[0]["二线产量"] != null)
+		{
+			SiemensS7.Write<short>("4.0", Convert.ToInt16(infoDt.Rows[0]["二线产量"]));//二线包装产量
+		}
+
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[0] != null && oneDt.Rows[0]["CL"] != null)
+		{
+			SiemensS7.Write<short>("6.0", Convert.ToInt16(oneDt.Rows[0]["CL"]));//一线7:00-9:00产量
+		}
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[1] != null && oneDt.Rows[1]["CL"] != null)
+		{
+			SiemensS7.Write<short>("6.0", Convert.ToInt16(oneDt.Rows[1]["CL"]));//一线9:00-10:00产量
+		}
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[2] != null && oneDt.Rows[2]["CL"] != null)
+		{
+			SiemensS7.Write<short>("10.0", Convert.ToInt16(oneDt.Rows[2]["CL"]));//一线10:00-11:00产量
+		}
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[3] != null && oneDt.Rows[3]["CL"] != null)
+		{
+			SiemensS7.Write<short>("12.0", Convert.ToInt16(oneDt.Rows[3]["CL"]));//一线12:00-14:00产量
+		}
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[4] != null && oneDt.Rows[4]["CL"] != null)
+		{
+			SiemensS7.Write<short>("14.0", Convert.ToInt16(oneDt.Rows[4]["CL"]));//一线14:00-15:00产量
+		}
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[5] != null && oneDt.Rows[5]["CL"] != null)
+		{
+			SiemensS7.Write<short>("16.0", Convert.ToInt16(oneDt.Rows[5]["CL"]));//一线15:00-16:00产量
+		}
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[6] != null && oneDt.Rows[6]["CL"] != null)
+		{
+			SiemensS7.Write<short>("18.0", Convert.ToInt16(oneDt.Rows[6]["CL"]));//一线16:00-17:00产量
+		}
+		if (oneDt != null && oneDt.Rows.Count > 0 && oneDt.Rows[7] != null && oneDt.Rows[7]["CL"] != null)
+		{
+			SiemensS7.Write<short>("20.0", Convert.ToInt16(oneDt.Rows[7]["CL"]));//一线17:00-18:00产量
+		}
 
-		SiemensS7.Write<short>("6.0", (Int16)oneDt.Rows[0]["SUM( ct )"]);//一线7:00-9:00产量
-		SiemensS7.Write<short>("8.0", (Int16)oneDt.Rows[1]["SUM( ct )"]);//一线9:00-10:00产量
-		SiemensS7.Write<short>("10.0", (Int16)oneDt.Rows[2]["SUM( ct )"]);//一线10:00-11:00产量
-		SiemensS7.Write<short>("12.0", (Int16)oneDt.Rows[3]["SUM( ct )"]);//一线12:00-14:00产量
-		SiemensS7.Write<short>("14.0", (Int16)oneDt.Rows[4]["SUM( ct )"]);//一线14:00-15:00产量
-		SiemensS7.Write<short>("16.0", (Int16)oneDt.Rows[5]["SUM( ct )"]);//一线15:00-16:00产量
-		SiemensS7.Write<short>("18.0", (Int16)oneDt.Rows[6]["SUM( ct )"]);//一线16:00-17:00产量
-		SiemensS7.Write<short>("20.0", (Int16)oneDt.Rows[7]["SUM( ct )"]);//一线17:00-18:00产量
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[0] != null && twoDt.Rows[0]["CL"] != null)
+		{
+			SiemensS7.Write<short>("6.0", Convert.ToInt16(twoDt.Rows[0]["CL"]));//一线7:00-9:00产量
+		}
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[1] != null && twoDt.Rows[1]["CL"] != null)
+		{
+			SiemensS7.Write<short>("6.0", Convert.ToInt16(twoDt.Rows[1]["CL"]));//一线9:00-10:00产量
+		}
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[2] != null && twoDt.Rows[2]["CL"] != null)
+		{
+			SiemensS7.Write<short>("10.0", Convert.ToInt16(twoDt.Rows[2]["CL"]));//一线10:00-11:00产量
+		}
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[3] != null && twoDt.Rows[3]["CL"] != null)
+		{
+			SiemensS7.Write<short>("12.0", Convert.ToInt16(twoDt.Rows[3]["CL"]));//一线12:00-14:00产量
+		}
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[4] != null && twoDt.Rows[4]["CL"] != null)
+		{
+			SiemensS7.Write<short>("14.0", Convert.ToInt16(twoDt.Rows[4]["CL"]));//一线14:00-15:00产量
+		}
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[5] != null && twoDt.Rows[5]["CL"] != null)
+		{
+			SiemensS7.Write<short>("16.0", Convert.ToInt16(twoDt.Rows[5]["CL"]));//一线15:00-16:00产量
+		}
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[6] != null && twoDt.Rows[6]["CL"] != null)
+		{
+			SiemensS7.Write<short>("18.0", Convert.ToInt16(twoDt.Rows[6]["CL"]));//一线16:00-17:00产量
+		}
+		if (twoDt != null && twoDt.Rows.Count > 0 && twoDt.Rows[7] != null && twoDt.Rows[7]["CL"] != null)
+		{
+			SiemensS7.Write<short>("20.0", Convert.ToInt16(twoDt.Rows[7]["CL"]));//一线17:00-18:00产量
+		}
 
-		SiemensS7.Write<short>("22.0", (Int16)twoDt.Rows[0]["SUM( ct )"]);//二线7:00-9:00产量
-		SiemensS7.Write<short>("24.0", (Int16)twoDt.Rows[1]["SUM( ct )"]);//二线9:00-10:00产量
-		SiemensS7.Write<short>("26.0", (Int16)twoDt.Rows[2]["SUM( ct )"]);//二线10:00-11:00产量
-		SiemensS7.Write<short>("28.0", (Int16)twoDt.Rows[3]["SUM( ct )"]);//二线12:00-14:00产量
-		SiemensS7.Write<short>("30.0", (Int16)twoDt.Rows[4]["SUM( ct )"]);//二线14:00-15:00产量
-		SiemensS7.Write<short>("32.0", (Int16)twoDt.Rows[5]["SUM( ct )"]);//二线15:00-16:00产量
-		SiemensS7.Write<short>("34.0", (Int16)twoDt.Rows[6]["SUM( ct )"]);//二线16:00-17:00产量
-		SiemensS7.Write<short>("36.0", (Int16)twoDt.Rows[7]["SUM( ct )"]);//二线17:00-18:00产量
 		SiemensS7.Close();
-		Logger.Debug(infoDt.Rows[0]["总计"].ToString());
-		Logger.Debug(oneDt.Rows[0]["SUM( ct )"].ToString());
-		Logger.Debug(twoDt.Rows[0]["SUM( ct )"].ToString());
 		Logger.Debug("发送LED数据完成!");
 
 	}