From 6c781d6e14d4fbd6903006d71acdf45ec87632c1 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 13 十月 2024 20:46:12 +0800
Subject: [PATCH] 修复手动结束包装后支持检查条工单完工
---
Tiger.Business.MES/Transaction/PackingNode.cs | 8 +++
Tiger.Business.MES/WorkAction/PackingAction.cs | 67 +++++++++++++++++----------------
Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs | 1
3 files changed, 43 insertions(+), 33 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index ebf4b87..5279f56 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -621,12 +621,18 @@
/// <returns></returns>
public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action, string locale)
{
+ var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
var operInfo = SetOperNodeInfo(CurOperInfo(locale));
Action endAction = null;
//濡傛灉褰撳墠鏉＄爜宸茬粡璧板埌娴佺▼缁堢偣鍒欒褰曟潯鐮佸畬宸�
if (operInfo.IsReachedEndNode)
{
+ //鏍囪褰撳墠鍖呰淇℃伅涓虹粓鐐圭珯
+ if (!curPkg.IsNullOrEmpty())
+ {
+ curPkg.IsReachedEndNode = true;
+ }
//鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
var woSNs = CurBatch.WoSNs.Where(q => CurWipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
foreach (var woSN in woSNs)
@@ -673,7 +679,7 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
CurOperInfo(locale).InputQty += CurWipSNs.Count;
- action.Data.Data = new PackingActionOutput() { PkgInfo = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null };
+ action.Data.Data = new PackingActionOutput() { PkgInfo = curPkg };
action.Data.OperInfo = operInfo;
action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 1e14532..480876e 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -893,39 +893,42 @@
}
else
{
- var _pkgList = CurPkg.IsFinished ? GetPackageList(CurPkg.Item) : new();
-
- //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
- CurPosition.NeedTemporaryStoreDBCommitAction = false;
- //淇濆瓨鏁版嵁
- CurPosition.SaveStepsCommitActionToDB(() =>
+ if (CurPkg.IsFinished)
{
- var db = CurPosition.GetCommitDB();
- if (_pkgList.Any())
- {
- db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
- foreach (var pkg in _pkgList)
- {
- //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
- db.Updateable<MES_WIP_DATA>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.INNER_SN == q.CARTON_SN)
- .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
- .ExecuteCommand();
- //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
- db.Updateable<BIZ_MES_WO_SN>()
- .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
- .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
- .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
- .ExecuteCommand();
- }
- }
- });
- //濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
- //if (action.Data.OperInfo.IsReachedEndNode)
- {
- CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
+ var _pkgList = GetPackageList(CurPkg.Item);
+
+ //鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
+ CurPosition.NeedTemporaryStoreDBCommitAction = false;
+ //淇濆瓨鏁版嵁
+ CurPosition.SaveStepsCommitActionToDB(() =>
+ {
+ var db = CurPosition.GetCommitDB();
+ if (_pkgList.Any())
+ {
+ db.Storageable(_pkgList, CurPosition.UserCode).ExecuteCommand();
+ foreach (var pkg in _pkgList)
+ {
+ //鍖呰淇℃伅淇濆瓨鍒板湪鍒跺搧淇℃伅琛�
+ db.Updateable<MES_WIP_DATA>()
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
+ .ExecuteCommand();
+ //鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
+ db.Updateable<BIZ_MES_WO_SN>()
+ .SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
+ .SetColumns(q => q.OUTER_SN == CurPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == pkg.WORK_ORDER && q.SN == pkg.SN)
+ .ExecuteCommand();
+ }
+ }
+ });
+ //濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
+ if (CurPkg.IsReachedEndNode)
+ {
+ CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
+ }
}
}
diff --git a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
index bd6cbee..7871de1 100644
--- a/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
+++ b/Tiger.Model.Net/Entitys/MES/ParameterEntity/PositionParameter.cs
@@ -168,6 +168,7 @@
public bool IsWeighed { get; set; } = false;
public WeightInfo WeightInfo { get; set; } = new WeightInfo();
public bool IsFinished => Item.IsFinished;
+ public bool IsReachedEndNode { get; set; } = false;
}
/// <summary>
--
Gitblit v1.9.3