From 0fa15afc31f7fb1a6100a78af3765d4d1bbab611 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 28 十月 2024 21:23:55 +0800
Subject: [PATCH] 优化入库标签行为数据存储
---
Tiger.Business.MES/WorkAction/ThreeInOne.cs | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index 77100cc..1a77309 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -267,8 +267,17 @@
CustCSN = Biz.Db.Queryable<MES_CUST_SN>().Where(q => q.CUST_SN == input.Data).First();
var isOK = true;
+ //瀹㈡埛鏉＄爜鎵埌鍘傚唴鏉＄爜
+ if (isOK && FlowCSN.FLOW_SN == input.Data)
+ {
+ CurStep.SetStatusMessage(StepStatus.Error, Biz.L("璇锋壂鎻忔纭殑瀹㈡埛鏍囩"));
+ action.Data.ShortMsg = new("璇锋壂鎻忔纭殑瀹㈡埛鏍囩", ShortMessage.Types.Failed);
+ action.IsSuccessed = isOK = false;
+ //action.LocaleMsg = new($"鍘傚唴鏉＄爜[{0}]缁戝畾瀹㈡埛鏉＄爜[{1}]澶辫触锛屽巶鍐呮潯鐮佷笌瀹㈡埛鏉＄爜涓嶈兘涓�鏍凤紝璇锋壂鎻忔纭殑瀹㈡埛鏍囩");
+ action.LocaleMsg = new("MES.WorkAction.ThreeInOne.TheSameSN", FlowCSN.FLOW_SN, input.Data);
+ }
//瀹㈡埛鏉＄爜宸茬粦瀹氬叾浠栧巶鍐呮潯鐮�
- if (!CustCSN.IsNullOrEmpty() && !CustCSN.FLOW_SN.IsNullOrEmpty() && CustCSN.FLOW_SN != FlowCSN.FLOW_SN)
+ if (isOK && !CustCSN.IsNullOrEmpty() && !CustCSN.FLOW_SN.IsNullOrEmpty() && CustCSN.FLOW_SN != FlowCSN.FLOW_SN)
{
CurStep.SetStatusMessage(StepStatus.Error, Biz.L("璇锋壂鎻忔纭殑瀹㈡埛鏍囩"));
action.Data.ShortMsg = new("璇锋壂鎻忔纭殑瀹㈡埛鏍囩", ShortMessage.Types.Failed);
@@ -277,7 +286,7 @@
action.LocaleMsg = new("MES.WorkAction.ThreeInOne.BindingOtherSN", CurPosition.CurWipSNs.First().SN, CustCSN.CUST_SN, CustCSN.FLOW_SN);
}
//瀹㈡埛鏉＄爜涓嶅睘浜庡綋鍓嶅伐鍗曠殑瀹㈡埛
- if (!CustCSN.IsNullOrEmpty() && CustCSN.CUST_CODE.IsNullOrEmpty(CurPosition.WorkBatch.WO.CUST_CODE) != CurPosition.WorkBatch.WO.CUST_CODE)
+ if (isOK && !CustCSN.IsNullOrEmpty() && CustCSN.CUST_CODE.IsNullOrEmpty(CurPosition.WorkBatch.WO.CUST_CODE) != CurPosition.WorkBatch.WO.CUST_CODE)
{
CurStep.SetStatusMessage(StepStatus.Error, Biz.L("璇锋壂鎻忔纭殑瀹㈡埛鏍囩"));
action.Data.ShortMsg = new("璇锋壂鎻忔纭殑瀹㈡埛鏍囩", ShortMessage.Types.Failed);
@@ -286,7 +295,7 @@
action.LocaleMsg = new("MES.WorkAction.ThreeInOne.NotSameCustomer", CustCSN.CUST_SN, CustCSN.CUST_CODE, CurPosition.WorkBatch.WO.CUST_CODE);
}
//楠岃瘉浜у搧瀹㈡埛鏍囩鏉＄爜瑙勫垯
- if (CustInfo.IsNullOrEmpty() && !CustInfo.RULE_CODE.IsNullOrEmpty() && !Biz.CodeRule[CustInfo.RULE_CODE].IsNullOrEmpty())
+ if (isOK && !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 +387,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