From 6c9535734ff0bd5e957620be0247689d6e2ca252 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 07 八月 2024 11:51:57 +0800
Subject: [PATCH] 创建变量克隆对象用于传入DBSubmitAction中保存当前需要暂存的数据值
---
Tiger.Business.MES/Transaction/TestNode.cs | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs
index e44b3a3..bae29ba 100644
--- a/Tiger.Business.MES/Transaction/TestNode.cs
+++ b/Tiger.Business.MES/Transaction/TestNode.cs
@@ -274,6 +274,40 @@
wipSN.DFT_FLAG = "Y";
wipSN.DFT_COUNT++;
wipSN.DFT_CODE = input.DFT_CODE;
+ var dft = CurBatch.Defects.FirstOrDefault(q => q.DFT_CODE == wipSN.DFT_CODE);
+ var defect = new MES_WIP_DFT()
+ {
+ AUTH_ORG = wipSN.AUTH_ORG,
+ AUTH_PROD = wipSN.LINE_CODE,
+ SN = wipSN.SN,
+ STATUS = MES_WIP_DFT.STATUSs.WaitHandle.GetValue(),
+ ITEM_CODE = wipSN.ITEM_CODE,
+ WORK_ORDER = wipSN.WORK_ORDER,
+ BATCH_NO = wipSN.BATCH_NO,
+ ROT_CODE = wipSN.ROT_CODE,
+ NODE_ID = wipSN.NODE_ID,
+ NODE_NAME = wipSN.NODE_NAME,
+ FTY_CODE = wipSN.FTY_CODE,
+ WS_CODE = wipSN.WS_CODE,
+ LINE_CODE = wipSN.LINE_CODE,
+ POST_CODE = wipSN.POST_CODE,
+ OPER_CODE = wipSN.OPER_CODE,
+ SEGMENT = wipSN.SEGMENT,
+ DFT_CODE = dft.DFT_CODE,
+ DFT_NAME = dft.DFT_NAME,
+ DFT_LEVEL = dft.DFT_LEVEL,
+ TRAY_SN = wipSN.TRAY_SN,
+ CONTAINER_SN = wipSN.CONTAINER_SN,
+ PALLET_SN = wipSN.PALLET_SN,
+ INV_FLAG = wipSN.INV_FLAG,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSN.SFTS_CODE,
+ SFT_CODE = wipSN.SFT_CODE,
+ PRD_CODE = wipSN.PRD_CODE,
+ OBA_BATCH = wipSN.OBA_BATCH,
+ LOCK_BATCH = wipSN.LOCK_BATCH,
+ };
+ CurDefects.Add(defect);
}
}
@@ -300,6 +334,11 @@
db.Storageable(woSNs, UserCode).ExecuteCommand();
db.Storageable(wipSNs, UserCode).ExecuteCommand();
db.Storageable(CurWipSNHiss, UserCode).ExecuteCommand();
+ //濡傛灉鏈変笉鑹垯淇濆瓨
+ if (CurDefects.Any())
+ {
+ db.Storageable(CurDefects, UserCode).ExecuteCommand();
+ }
//濡傛灉鏄姇鍏ョ珯
if (curNode.IS_INPUT == "Y")
{
@@ -346,7 +385,6 @@
//鏈畬鎴愭墍鏈夊伐姝�
if (!IsFinishAllSteps)
{
- var result = new ApiAction<SubmitOutput>(new SubmitOutput());
//鏈畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝�
if (!IsFinishNodeSteps)
{
@@ -355,14 +393,14 @@
NextSteps.Clear();
NextSteps.Add(next);
//鏍规嵁鍚庣画宸ユ杩斿洖ApiAction
- result.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
+ action.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
//鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙疯繑鍥炵浉搴旂殑鎿嶄綔鎻愮ず
switch (next.Sequence)
{
case 2:
//action.LocaleMsg = new($"璇锋墽琛岀浜屾");
- result.LocaleMsg = new("MES.Transaction.TestNode.绗簩姝ユ搷浣滄彁绀�");
+ action.LocaleMsg = new("MES.Transaction.TestNode.绗簩姝ユ搷浣滄彁绀�");
break;
default:
break;
@@ -371,9 +409,8 @@
//宸插畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝ワ紝寮�濮嬫墽琛岃涓哄伐姝�
else
{
- result = BeginNextActionStep(input);
+ action = BeginNextActionStep(input);
}
- return result;
}
//宸插畬鎴愭墍鏈夊伐姝�
if (IsFinishAllSteps)
--
Gitblit v1.9.3