From 6a128ef4f3a8b79d25a8fcd36a6139b46ac51a65 Mon Sep 17 00:00:00 2001 From: schangxiang@126.com <schangxiang@126.com> Date: 周一, 09 9月 2024 14:42:10 +0800 Subject: [PATCH] 注释不用的代码 --- DataCapture/iWare_SCADA_DataCapture/iWare_SCADA_BusinessLogical/Utils/SystemBussinessHelper.cs | 33 ++++++++++++++++++++++++++++++++- 1 files changed, 32 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..e773294 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,33 @@ { /// <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; + default: + return 1 * 60; + } + } + + /// <summary> /// 鏍¢獙璇诲彇鐨勪簩缁寸爜鏄惁姝g‘ /// </summary> /// <param name="workPieceID"></param> @@ -32,7 +59,11 @@ 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; } -- Gitblit v1.9.3