From 83dbcd7c0d6afcbbd1f20dc1e7371be89ee28f0b Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 10 十月 2024 17:12:34 +0800
Subject: [PATCH] 优化工序逻辑
---
Tiger.Business.MES/Transaction/TestNode.cs | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 3a58f3c..5480ea9 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())
{
@@ -291,7 +293,7 @@
//缁戝畾鏉＄爜鍒板伐鍗�
foreach (var wipSN in wipSNs)
{
- if (!CurBatch.WoSNs.Any(q => q.SN == wipSN.SN))
+ if (!CurBatch.WoSNs.Any(q => q.WIP_ID == wipSN.ID))
{
CurBatch.WoSNs.Add(new()
{
@@ -306,7 +308,7 @@
}
//鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
- var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.SN == w.SN)).ToList();
+ var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
foreach (var woSN in woSNs)
{
woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
@@ -340,7 +342,7 @@
//濡傛灉鏄姇鍏ョ珯
if (curNodeSetting.IS_INPUT == "Y")
{
- var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue();
wipSN.STATUS = MES_WIP_DATA.STATUSs.Input.GetValue();
wipSN.INLINE_DATE = DateTime.Now;
@@ -348,7 +350,7 @@
//濡傛灉鏄骇鍑虹珯
if (curNodeSetting.IS_OUTPUT == "Y")
{
- var woSN = woSNs.First(q => q.SN == wipSN.SN);
+ var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID);
woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue();
wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue();
wipSN.OUTLINE_DATE = DateTime.Now;
@@ -560,7 +562,7 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
CurOperInfo(locale).InputQty += CurWipSNs.Count;
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale));
- action.Data.ShortMsg = new("杩囩珯鎴愬姛", ShortMessage.Types.Success);
+ action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME, CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
--
Gitblit v1.9.3