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/Transaction/CollectNode.cs | 4 +++-
Tiger.Business.MES/Transaction/PackingNode.cs | 3 ++-
Tiger.Business.MES/Common/WorkBatch.cs | 2 +-
Tiger.Business.MES/Transaction/TestNode.cs | 4 +++-
4 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Common/WorkBatch.cs b/Tiger.Business.MES/Common/WorkBatch.cs
index 72c507a..56bef9a 100644
--- a/Tiger.Business.MES/Common/WorkBatch.cs
+++ b/Tiger.Business.MES/Common/WorkBatch.cs
@@ -248,7 +248,7 @@
/// <returns></returns>
public MES_WO_OPER GetNodeSetting(MES_WO_NODE node)
{
- return NodeSets.FirstOrDefault(q => q.NODE_ID == node.ID);
+ return NodeSets.FirstOrDefault(q => q.NODE_ID == node?.ID);
}
/// <summary>
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 9470df1..a6d1db0 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -210,7 +210,7 @@
public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
{
var curNode = CurBatch.GetNode(PostCode);
- var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
try
{
//宸ュ簭鑺傜偣閫昏緫澧炲姞濡傛灉鏍瑰熀褰撳墠宀椾綅鎵句笉鍒板搴斿伐搴忕殑鏃跺�欒鎶ラ敊
@@ -222,6 +222,8 @@
action.LocaleMsg = new("MES.Transaction.CollectNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);
return action;
}
+ var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
//褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
if (Steps.IsNullOrEmpty())
{
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index d107e59..e5e5baf 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -251,7 +251,6 @@
public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
{
var curNode = CurBatch.GetNode(PostCode);
- var curNodeSetting = CurBatch.GetNodeSetting(curNode);
try
{
//宸ュ簭鑺傜偣閫昏緫澧炲姞濡傛灉鏍瑰熀褰撳墠宀椾綅鎵句笉鍒板搴斿伐搴忕殑鏃跺�欒鎶ラ敊
@@ -263,6 +262,8 @@
action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);
return action;
}
+ var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
//褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
if (Steps.IsNullOrEmpty())
{
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 1aa5208..249004b 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -210,7 +210,7 @@
public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input)
{
var curNode = CurBatch.GetNode(PostCode);
- var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
try
{
//宸ュ簭鑺傜偣閫昏緫澧炲姞濡傛灉鏍瑰熀褰撳墠宀椾綅鎵句笉鍒板搴斿伐搴忕殑鏃跺�欒鎶ラ敊
@@ -222,6 +222,8 @@
action.LocaleMsg = new("MES.Transaction.TestNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO);
return action;
}
+ var curNodeSetting = CurBatch.GetNodeSetting(curNode);
+
//褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
if (Steps.IsNullOrEmpty())
{
--
Gitblit v1.9.3