From b4bd82fdbace031a81ab40963c8344d5eaa4a772 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 21 八月 2024 17:19:44 +0800
Subject: [PATCH] 增加雅达三码合一行为，用于厂内条码绑定并打印客户条码
---
Tiger.Business.MES/Transaction/Position.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index d4b8184..a932e37 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -71,7 +71,7 @@
/// 鏄惁闇�瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽緟闇�瑕佺殑鏃跺�欏啀鎻愪氦
/// </summary>
public bool NeedTemporaryStoreDBCommitAction { get; set; } = false;
- protected List<Action> DBCommitList { get; set; } = new();
+ protected Dictionary<string, List<Action>> DBCommitList { get; set; } = new();
protected List<Position> NodeCommitList { get; set; } = new();
protected Dictionary<string, OperInfo> OperInfoDic { get; set; } = new();
protected OperInfo CurOperInfo { get; set; }
@@ -360,10 +360,12 @@
protected void SaveStepsCommitActionToDB()
{
//淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
+ var commitList = new List<Action>();
foreach (var step in Steps.OrderBy(q => q.Sequence))
{
- DBCommitList.Add(step.DBSubmitAction);
+ commitList.Add(step.DBSubmitAction);
}
+ DBCommitList.Add(CurSN, commitList);
//濡傛灉涓嶉渶瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽垯鎶婃彁浜ゆ搷浣滃垪琛ㄦ彁浜ゅ埌鏁版嵁搴�
if (!NeedTemporaryStoreDBCommitAction)
{
@@ -373,9 +375,12 @@
var dbTran = GetCommitDB().UseTran(() =>
{
//鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
- foreach (var action in DBCommitList)
+ foreach (var wipSn in DBCommitList.Keys)
{
- action.Invoke();
+ foreach (var action in DBCommitList[wipSn])
+ {
+ action.Invoke();
+ }
}
});
if (dbTran.IsSuccess)
--
Gitblit v1.9.3