From 37fc700892a509346d5be0a1af2d3de1fe8d3a9e Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 20 八月 2024 18:38:10 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Transaction/TestNode.cs | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index 81213e3..05f1056 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -49,9 +49,16 @@
{
action = NodeSubmit(action, input);
//鏇存柊宸ュ簭淇℃伅
- var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
- action.Data.OperInfo = info;
+ if (!action.IsSuccessed)
+ {
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ action.Data.OperInfo = info;
+ }
+ else if (!IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
+ }
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
@@ -87,7 +94,10 @@
}
//鏉＄爜杩囩珯
action = NodeSubmit(action, input);
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
+ if (!IsFinishAllSteps)
+ {
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
+ }
}
}
//鏌ユ壘涓嶅埌鏉＄爜宸茬粦瀹氱殑宸ュ崟
@@ -149,7 +159,10 @@
{
result = DoIfFinishAllSteps(result);
}
- result.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
+ else
+ {
+ result.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
+ }
return result;
}
}
@@ -204,6 +217,10 @@
ITEM_CODE = CurBatch.WO.ITEM_CODE,
WORK_ORDER = CurBatch.Batch.ORDER_NO,
BATCH_NO = CurBatch.Batch.BATCH_NO,
+ FTY_CODE = CurFactory.FTY_CODE,
+ WS_CODE = CurWorkshop.WS_CODE,
+ LINE_CODE = CurLine.LINE_CODE,
+ POST_CODE = CurPosition.POST_CODE,
HOLD_FLAG = "N",
REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
FINISHED_FLAG = "N",
@@ -497,9 +514,11 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty += CurWipSNs.Count;
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
action.Data.ShortMsg = new("杩囩珯鎴愬姛", 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>());
+
//閲嶇疆宸ュ簭
ResetNode();
return action;
--
Gitblit v1.9.3