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/PrintInStoreLabel.cs | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
index 84c318f..6fbe831 100644
--- a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
@@ -68,6 +68,14 @@
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
+ //璁剧疆鎵撳嵃鍙橀噺鍊�
+ Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
+ if (CurPosition.Context.ContainsKey("CurPackage"))
+ {
+ (CurPosition.Context["CurPackage"] as WipPkg).InStoreLabel = Label;
+ }
+
+ //鍒ゆ柇鏄惁闇�瑕佹墦鍗板叆搴撴爣绛�
NoNeedInStorePrint = (!CurPosition.Context.ContainsKey("CurPackage") || !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
|| (CurPosition is YadaPacking && (CurPosition as YadaPacking).IsPrintCustomerLabel);
if (NoNeedInStorePrint)
@@ -76,8 +84,6 @@
}
else
{
- //璁剧疆鎵撳嵃鍙橀噺鍊�
- Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
action.Data.Data = Label;
//濡傛灉杩斿洖鎴愬姛鍒欒涓哄綋鍓嶈涓哄彲浠ュ紑濮嬫墽琛岋紝鍚﹀垯杩斿洖澶辫触
--
Gitblit v1.9.3