From 582d7ab9eb6879f4b5f3e1b1b7d162f3d53a0e39 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期日, 27 十月 2024 14:12:32 +0800
Subject: [PATCH] Merge branch 'master' into master_ben
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 33 ++++++++++++++++++++++++++++++++-
1 files changed, 32 insertions(+), 1 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index d0cf4fb..885702d 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -230,6 +230,12 @@
data.PkgLevel = min.PKG_LEVEL;
data.PrintLable = LabelDic[min.PKG_LEVEL];
data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -399,6 +405,12 @@
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -497,6 +509,12 @@
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -717,6 +735,12 @@
data.PkgLevel = dtl.PKG_LEVEL;
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
data.RealPrint = data.PkgLevel != CurPkg.Item.PKG_LEVEL || CurPosition is not YadaPacking || (CurPosition as YadaPacking).IsPrintCustomerLabel;
+ //鎵嬪姩缁撴潫鍖呰鏃讹紝濡傛灉鏄疪ealPrint涓篺alse锛屽垯杩斿洖褰撳墠鍖呰淇℃伅鐨勫叆搴撴爣绛惧苟鎵撳嵃
+ if (IsManually && !data.RealPrint && !CurPkg.InStoreLabel.IsNullOrEmpty())
+ {
+ data.RealPrint = true;
+ data.PrintLable = CurPkg.InStoreLabel;
+ }
CurCmd = data;
PrintTimes++;
CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("鎵撳嵃鏍囩"));
@@ -923,6 +947,7 @@
if (CurPkg.IsFinished)
{
var _pkgList = CurPosition.GetPackageList(CurPkg.Item).Clone();
+ var _lastWipID = CurPosition.LastWipSNs?.FirstOrDefault()?.ID;
//鏈�澶栧眰鍖呰宸茬粡瀹屾垚鍖呰锛屽垯鎶婂伐搴忎腑鏆傚瓨鏍囪璁句负false锛岀粺涓�鎻愪氦鍖呰鍐呬骇鍝佺殑杩囩珯璁板綍
CurPosition.NeedTemporaryStoreDBCommitAction = false;
@@ -959,6 +984,12 @@
.SetColumns(q => q.CARTON_SN == CurPkg.Item.Package.SN)
.Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && wipIDs.Contains(q.WIP_ID))
.ExecuteCommand();
+ db.Updateable<MES_WIP_ACT>()
+ .SetColumns(q => q.ACT_VALUE_1 == (CurPkg.IsFinished ? "Y" : "N"))
+ .SetColumns(q => q.ACT_VALUE_2 == CurPkg.ToJson())
+ .SetColumns(q => q.ACT_VALUE_3 == (CurPkg.IsFinished ? LabelDic[CurPkg.Item.PKG_LEVEL].ToJson() : ""))
+ .Where(q => q.WORK_ORDER == wo && q.NODE_ID == nodeID && q.ACT_ID == actID && q.WIP_ID == _lastWipID)
+ .ExecuteCommand();
//鍖呰淇℃伅淇濆瓨鍒板伐鍗曟潯鐮佹槑缁嗚〃
db.Updateable<BIZ_MES_WO_SN>()
.SetColumns(q => q.TRAY_SN == CurPkg.Item.Package.SN)
@@ -968,7 +999,7 @@
}
});
//濡傛灉褰撳墠鏉＄爜宸茬粡瀹屽伐锛屾鏌ュ綋鍓嶅伐鍗曟壒娆″拰宸ュ崟鏄惁瀹屽伐
- if (CurPkg.IsReachedEndNode)
+ //if (CurPkg.IsReachedEndNode)
{
CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
}
--
Gitblit v1.9.3