From be19880a15155f93728dc4a9de0983b76b7e0319 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 09 十月 2024 17:16:15 +0800
Subject: [PATCH] 增加打印日志实体
---
Tiger.Business.MES/Transaction/Position.cs | 63 ++++++++++++++++++++++++-------
1 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/Position.cs b/Tiger.Business.MES/Transaction/Position.cs
index 30ef901..0ab06c3 100644
--- a/Tiger.Business.MES/Transaction/Position.cs
+++ b/Tiger.Business.MES/Transaction/Position.cs
@@ -395,15 +395,45 @@
/// <summary>
/// 淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版暟鎹簱
/// </summary>
- protected void SaveStepsCommitActionToDB()
+ /// <param name="appendToSave">鎻愪氦瀹屽伐姝ユ暟鎹悗锛屾彁浜ら檮鍔犵殑淇濆瓨鍐呭</param>
+ public void SaveStepsCommitActionToDB(Action appendToSave = null)
{
//淇濆瓨宸ユ鐨勬暟鎹簱鎻愪氦鎿嶄綔鍒版彁浜ゆ搷浣滃垪琛�
- var commitList = new List<Action>();
- foreach (var step in Steps.OrderBy(q => q.Sequence))
+ if (!Steps.IsNullOrEmpty())
{
- commitList.Add(step.DBSubmitAction);
+ var commitList = new List<Action>();
+ foreach (var step in Steps.OrderBy(q => q.Sequence))
+ {
+ commitList.Add(step.DBSubmitAction);
+ }
+ //璁板綍宸ュ簭鑰楁椂
+ commitList.Add(() =>
+ {
+ EndAt = DateTime.Now;
+ var ids = CurWipSNHiss.Select(q => q.ID).ToList();
+ GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
+ });
+ //澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
+ if (!appendToSave.IsNullOrEmpty())
+ {
+ commitList.Add(appendToSave);
+ }
+ DBCommitList.Add(CurSN, commitList);
}
- DBCommitList.Add(CurSN, commitList);
+ else
+ {
+ //澧炲姞闄勫姞鐨勪繚瀛樺唴瀹�
+ if (!appendToSave.IsNullOrEmpty())
+ {
+ if (!DBCommitList.ContainsKey("AppendSaveAction"))
+ {
+ DBCommitList.Add("AppendSaveAction", new List<Action>());
+ }
+ var commitList = DBCommitList["AppendSaveAction"];
+ commitList.Add(appendToSave);
+ }
+ }
+
//濡傛灉涓嶉渶瑕佷复鏃跺瓨鍌ㄦ暟鎹簱鎻愪氦鎿嶄綔锛屽垯鎶婃彁浜ゆ搷浣滃垪琛ㄦ彁浜ゅ埌鏁版嵁搴�
if (!NeedTemporaryStoreDBCommitAction)
{
@@ -413,17 +443,21 @@
var dbTran = GetCommitDB().UseTran(() =>
{
//鍦ㄥ悓涓�涓簨鍔′腑淇濆瓨鎵�鏈夊伐姝ョ殑鏁版嵁
- foreach (var wipSn in DBCommitList.Keys)
+ foreach (var wipSn in DBCommitList.Keys.Where(q => q != "AppendSaveAction"))
{
foreach (var action in DBCommitList[wipSn])
{
action.Invoke();
}
}
- //璁板綍宸ュ簭鑰楁椂
- EndAt = DateTime.Now;
- var ids = CurWipSNHiss.Select(q => q.ID).ToList();
- GetCommitDB().Updateable<MES_WIP_HIS>().SetColumns(q => q.ELAPSED_TIME == ElapsedTime.TotalMilliseconds.ToInt64()).Where(q => ids.Contains(q.ID)).ExecuteCommand();
+ //闄勫姞鐨勪繚瀛樺唴瀹�
+ if (DBCommitList.ContainsKey("AppendSaveAction"))
+ {
+ foreach (var action in DBCommitList["AppendSaveAction"])
+ {
+ action.Invoke();
+ }
+ }
});
if (dbTran.IsSuccess)
{
@@ -517,7 +551,7 @@
case "GetCardQR":
return action is PackingAction ? GetCardCode(lvars, action as PackingAction) : "";
case "GetDescription":
- return WorkBatch.Product.ITEM_DESC;
+ return WorkBatch.Product.ExtInfo.Packaging; //WorkBatch.Product.ITEM_DESC;
case "GetPAndO":
return WorkBatch.WO.SALES_CONTRACT;
case "GetLTD":
@@ -579,7 +613,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("B", $"{WorkBatch.Batch.BATCH_NO}-{WorkBatch.Batch.PLAN_QTY}-").Data.ToString() ?? "";
case "GetHW21SNGenerate":
return Biz.CodeRule[lv.BARCODE_RULE ?? ""]?.Generate("SN:", "05").Data.ToString() ?? "";
default:
@@ -645,7 +679,7 @@
/// <returns></returns>
private string GetCardOrBoxQR(string code, List<BAS_LABEL_VAR> lvars, PackingAction action)
{
- var itemCode = WorkBatch.Product.CUST_PROD_CODE;
+ var itemCode = WorkBatch.Product.ITEM_CODE;
var wo = WorkBatch.Batch.ORDER_NO;
var snList = string.Join("\r\n", action.GetMinPackageList(action.CurPkg.Item).Select(q => q.SN));
if (snList.IsNullOrEmpty()) { snList = $"{CurSN}"; }
@@ -659,7 +693,7 @@
var Display = WorkBatch.Product.ExtInfo.Display;
var Remark = WorkBatch.Product.ExtInfo.Remark;
- return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}|鍨嬪彿:{model},杈撳叆:{Input},鏄剧ず:{Display},杈撳嚭:{OutPut},鐢垫簮:{Power},绮惧害:{Accuracy},澶囨敞:{Remark}";
+ return $"{code}|{itemCode}|{wo}|\r\n{snList}|{weight}{unit}|鍨嬪彿:{model},杈撳叆:{Input},鏄剧ず:{Display},杈撳嚭:{OutPut},鐢垫簮:{Power},绮惧害:{Accuracy},澶囨敞:{Remark}";
}
/// <summary>
@@ -715,5 +749,6 @@
this.IsFinished = true;
return IsFinished ? base.Close(needSaveHistoryLog) : IsFinished;
}
+
}//endClass
}
\ No newline at end of file
--
Gitblit v1.9.3