From a1190b73462ad2cd7d3ff4a5d942d1435ac62031 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 10 十月 2024 09:49:13 +0800
Subject: [PATCH] 优化工序逻辑
---
Tiger.Business.MES/WorkAction/ThreeInOne.cs | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index 94e5ea3..b2ca033 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -286,7 +286,7 @@
action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotSameCustomer", CustCSN.CUST_SN, CustCSN.CUST_CODE, CurPosition.WorkBatch.WO.CUST_CODE);
}
//楠岃瘉浜у搧瀹㈡埛鏍囩鏉＄爜瑙勫垯
- if (!CustInfo.RULE_CODE.IsNullOrEmpty() && !Biz.CodeRule[CustInfo.RULE_CODE].IsNullOrEmpty())
+ if (!CustInfo.IsNullOrEmpty() && !CustInfo.RULE_CODE.IsNullOrEmpty() && !Biz.CodeRule[CustInfo.RULE_CODE].IsNullOrEmpty())
{
var result = Biz.CodeRule[CustInfo.RULE_CODE].Verify(CustCSN.CUST_SN);
if (!result.IsSuccessed)
@@ -378,8 +378,8 @@
PRD_CODE = wipSn.PRD_CODE,
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
- ACT_VALUE_1 = Label.LABEL_CODE,
- ACT_VALUE_2 = Label.Variables.ToJson(),
+ ACT_VALUE_1 = Label?.LABEL_CODE,
+ ACT_VALUE_2 = Label?.Variables.ToJson(),
ACT_RESULT = "Y",
ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"鍘傚唴鏉＄爜[{FlowCSN.FLOW_SN}]缁戝畾瀹㈡埛鏉＄爜[{FlowCSN.CUST_SN}]鎴愬姛",
--
Gitblit v1.9.3