From a6aaad96f92dbf9c6ae2c81072509981cc97e6d7 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周三, 03 12月 2025 11:38:45 +0800
Subject: [PATCH] 消警处理
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs | 81 ++++++++++++++++++++++++++++++++++++++++
1 files changed, 80 insertions(+), 1 deletions(-)
diff --git a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
index 854b9bb..5117e74 100644
--- a/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
+++ b/DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs
@@ -17,6 +17,77 @@
{
/// <summary>
+ /// 鑾峰彇澶瑰叿宸ヤ綅
+ /// </summary>
+ /// <param name="str"></param>
+ /// <param name="workingProcedure"></param>
+ /// <returns></returns>
+ public static string GetJiaJuGongWei(string str, string workingProcedure)
+ {
+ try
+ {
+ if (string.IsNullOrEmpty(str))
+ {
+ return "";
+ }
+
+ if (workingProcedure == "OP20")
+ {
+ if (str.Length == "OP2002C2".Length)
+ {
+ int length = str.Length;
+ string lastTwoCharacters = str.Substring(length - 2, 2);
+ return lastTwoCharacters;
+ }
+ }
+ else if (workingProcedure == "OP50")
+ {
+ if (str.Length == "OP5001A3".Length)
+ {
+ int length = str.Length;
+ string lastTwoCharacters = str.Substring(length - 2, 2);
+ return lastTwoCharacters;
+ }
+ }
+ }
+ catch (Exception)
+ {
+ return "";
+ }
+ return "";
+ }
+
+
+ /// <summary>
+ /// 妯℃嫙鏃堕棿锛堣繑鍥炵锛�
+ /// </summary>
+ /// <param name="workingProcedure"></param>
+ /// <returns></returns>
+ public static int MoNiTimeForWorkingProcedure(string workingProcedure)
+ {
+ switch (workingProcedure)
+ {
+ case "OP10":
+ case "OP40":
+ return 4;
+ case "OP20":
+ return 2 * 60;
+ case "OP30":
+ return 2 * 60;
+ case "OP35":
+ return 1 * 60;
+ case "OP50":
+ return 3 * 60;
+ case "OP60":
+ return 4 * 60;
+ case "OP70":
+ return 9 * 60;//9鍒嗛挓
+ default:
+ return 1 * 60;
+ }
+ }
+
+ /// <summary>
/// 鏍￠獙璇诲彇鐨勪簩缁寸爜鏄惁姝ｇ‘
/// </summary>
/// <param name="workPieceID"></param>
@@ -32,7 +103,15 @@
var n_workPieceID = workPieceID.Trim();
if (n_workPieceID.Length == 22)
{
- if (n_workPieceID.IndexOf("ERROR") > -1)
+ if (n_workPieceID.ToUpper().IndexOf("ERROR") > -1)
+ {
+ return false;
+ }
+ if (n_workPieceID.ToUpper().IndexOf("ERR") > -1)
+ {
+ return false;
+ }
+ if (n_workPieceID.ToUpper().IndexOf('\0') > -1)
{
return false;
}
--
Gitblit v1.9.3