From 83d595aad854a42d6b28f8651ee7ef774dfd4e04 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期二, 29 十月 2024 23:38:55 +0800 Subject: [PATCH] 一些更改 --- Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs index 681a240..42c1fbe 100644 --- a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs +++ b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs @@ -45,7 +45,6 @@ Label = Biz.Db.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First(); LabelPV = Biz.Db.Queryable<BAS_LABEL_PV>().ToList(); - CurPkg = CurPosition.Context.ContainsKey("CurPackage") ? CurPosition.Context["CurPackage"] as WipPkg : null; CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃"); CurStep.Status = StepStatus.Normal; @@ -69,6 +68,7 @@ public ApiAction<SubmitOutput> TryBegin(SubmitInput input) { var action = new ApiAction<SubmitOutput>(new SubmitOutput()); + CurPkg = CurPosition.Context.ContainsKey("CurPackage") ? CurPosition.Context["CurPackage"] as WipPkg : null; if (Label.IsNullOrEmpty()) { @@ -85,7 +85,7 @@ } //鍒ゆ柇鏄惁闇�瑕佹墦鍗板叆搴撴爣绛� - NoNeedInStorePrint = (!CurPkg.IsNullOrEmpty() || !CurPkg.IsFinished) + NoNeedInStorePrint = (CurPkg.IsNullOrEmpty() || !CurPkg.IsFinished) || (CurPosition is YadaPacking && (CurPosition as YadaPacking).IsPrintCustomerLabel); if (NoNeedInStorePrint) { -- Gitblit v1.9.3