From 2b05362eba2f989b7857349cc9a3a1c12f8181b6 Mon Sep 17 00:00:00 2001
From: schangxiang@126.com <schangxiang@126.com>
Date: 周五, 26 9月 2025 11:35:50 +0800
Subject: [PATCH] 222
---
DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 52 insertions(+), 0 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 9c6d13c..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,48 @@
{
/// <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>
@@ -38,6 +80,8 @@
return 3 * 60;
case "OP60":
return 4 * 60;
+ case "OP70":
+ return 9 * 60;//9鍒嗛挓
default:
return 1 * 60;
}
@@ -63,6 +107,14 @@
{
return false;
}
+ if (n_workPieceID.ToUpper().IndexOf("ERR") > -1)
+ {
+ return false;
+ }
+ if (n_workPieceID.ToUpper().IndexOf('\0') > -1)
+ {
+ return false;
+ }
return true;
}
else
--
Gitblit v1.9.3