From 4a3788499301329d245b07bf2ba0213cf9fba540 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期二, 13 八月 2024 21:03:29 +0800
Subject: [PATCH] 产品、工单绑定工艺路线更新
---
Tiger.Business.MES/Transaction/Position.cs | 65 ++++++++++++--------------------
1 files changed, 25 insertions(+), 40 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 33bcf88..757ae4e 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -335,50 +335,35 @@
/// </summary>
protected void SaveStepsCommitActionToDB()
{
- ////淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
- //foreach (var step in Steps.OrderBy(q => q.Sequence))
- //{
- // DBCommitList.Add(step.DBSubmitAction);
- //}
- ////濡傛灉涓嶉渶瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽垯鎶婃彁浜ゆ搷浣滃垪琛ㄦ彁浜ゅ埌鏁版嵁搴�
- //if (!NeedTemporaryStoreDBCommitAction)
- //{
- // //鎭㈠涓存椂瀛樺偍鏍囪涓篺alse
- // NeedTemporaryStoreDBCommitAction = false;
-
- // var dbTran = GetCommitDB().UseTran(() =>
- // {
- // //鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
- // foreach (var action in DBCommitList)
- // {
- // action.Invoke();
- // }
- // });
- // if (dbTran.IsSuccess)
- // {
- // //淇濆瓨鎴愬姛鍒欐竻绌烘彁浜ゆ搷浣滃垪琛�
- // DBCommitList.Clear();
- // }
- // else
- // {
- // //鎶涘嚭寮傚父
- // throw dbTran.ErrorException;
- // }
- //}
- if (NeedTemporaryStoreDBCommitAction)
+ //淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
+ foreach (var step in Steps.OrderBy(q => q.Sequence))
{
- NodeCommitList.Add(this.MemberwiseClone() as Position);
+ DBCommitList.Add(step.DBSubmitAction);
}
- else
+ //濡傛灉涓嶉渶瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽垯鎶婃彁浜ゆ搷浣滃垪琛ㄦ彁浜ゅ埌鏁版嵁搴�
+ if (!NeedTemporaryStoreDBCommitAction)
{
- //淇濆瓨鎴愬姛鍒欐竻绌烘彁浜ゆ搷浣滃垪琛�
- foreach (var item in NodeCommitList)
+ //鎭㈠涓存椂瀛樺偍鏍囪涓篺alse
+ NeedTemporaryStoreDBCommitAction = false;
+
+ var dbTran = GetCommitDB().UseTran(() =>
{
- item?.DoSaveToDB();
- item?.Dispose();
+ //鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
+ foreach (var action in DBCommitList)
+ {
+ action.Invoke();
+ }
+ });
+ if (dbTran.IsSuccess)
+ {
+ //淇濆瓨鎴愬姛鍒欐竻绌烘彁浜ゆ搷浣滃垪琛�
+ DBCommitList.Clear();
}
- DoSaveToDB();
- NodeCommitList.Clear();
+ else
+ {
+ //鎶涘嚭寮傚父
+ throw dbTran.ErrorException;
+ }
}
}
@@ -490,7 +475,7 @@
switch (pv.VAR_METHOD)
{
case "GetCartonGenerate":
- return Biz.CodeRule[lv.BARCODE_RULE].Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString();
+ return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate($"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
default:
return "";
}
--
Gitblit v1.9.3