From 6e1296126a4a9b1b808796a5ff2bfadf50da8bcc Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 08 十月 2024 22:54:47 +0800
Subject: [PATCH] 保存工步的数据库提交操作到数据库，增加可以保存完工步数据后，保存附加的内容
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 47 ++++++++++++++++++++++++++++++++++-------------
1 files changed, 34 insertions(+), 13 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 3a074e2..a8fbe4d 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -1,4 +1,5 @@
-锘縰sing Rhea.Common;
+锘縰sing Microsoft.CodeAnalysis.Differencing;
+using Rhea.Common;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -270,11 +271,11 @@
CurCmd = null;
PrintTimes = 0;
action = SavePkgData(input, action);
- if (action.IsSuccessed)
- {
- CurStep?.SetStatusMessage(StepStatus.Success, Biz.L("鎵弿鎴愬姛"));
- action.Data.ShortMsg = new("鎵弿鎴愬姛", ShortMessage.Types.Success);
- }
+ //if (action.IsSuccessed)
+ //{
+ // CurStep?.SetStatusMessage(StepStatus.Success, Biz.L("鎵弿鎴愬姛"));
+ // action.Data.ShortMsg = new("鎵弿鎴愬姛", ShortMessage.Types.Success);
+ //}
}
break;
//Print锛氭墦鍗帮紝鎵撳嵃褰撳墠鍖呰灞傜骇鐨勬爣绛�
@@ -748,6 +749,27 @@
return list;
}
+ public List<MES_WIP_PKG> GetMinPackageList(WipPkgItem parent)
+ {
+ List<MES_WIP_PKG> list = new();
+ if (parent.Items.Any())
+ {
+ foreach (var item in parent.Items)
+ {
+ item.Package.PARENT_SN = parent.Package?.SN;
+ list.AddRange(GetMinPackageList(item));
+ }
+ }
+ else
+ {
+ if (!parent.Package.IsNullOrEmpty())
+ {
+ list.Add(parent.Package);
+ }
+ }
+ return list;
+ }
+
public ApiAction<SubmitOutput> CompletePkg()
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
@@ -827,6 +849,7 @@
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
ACT_RESULT = "Y",
+ ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = $"浜у搧鏉＄爜[{string.Join("锛�", CurPosition.CurSN)}]鍖呰瀹屾垚",
};
wipActs.Add(wipAct);
@@ -868,10 +891,13 @@
else
{
var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
+
+ //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
+ CurPosition.NeedTemporaryStoreDBCommitAction = false;
//淇濆瓨鏁版嵁
- var db = Biz.Db;
- var dbTran = db.UseTran(() =>
+ CurPosition.SaveStepsCommitActionToDB(() =>
{
+ var db = CurPosition.GetCommitDB();
if (_pkgList.Any())
{
db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
@@ -893,11 +919,6 @@
}
}
});
- if (!dbTran.IsSuccess)
- {
- //鎶涘嚭寮傚父
- throw dbTran.ErrorException;
- }
}
if (CurPkg.IsFinished)
--
Gitblit v1.9.3