From 6c1b1e0601a7db6b576aaa180d6777418a404f18 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 25 十二月 2024 21:15:56 +0800
Subject: [PATCH] 修复了一些已知问题
---
Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs | 21 ++++++++++++++-------
1 files changed, 14 insertions(+), 7 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
index d370304..2a79431 100644
--- a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs
@@ -17,6 +17,7 @@
{
#region Propertys & Variables
#region 鍥哄畾鍐欐硶锛屽伐搴忎腑鐨勫繀瑕佷俊鎭�
+ public DbClient MainDB { get; set; }
public bool IsFinished { get; set; } = false;
public IWorkStep CurStep { get; set; }
public IPosition CurPosition { get; set; }
@@ -25,6 +26,7 @@
#endregion
public BAS_LABEL_TEMP Label { get; set; }
public List<BAS_LABEL_PV> LabelPV { get; set; }
+ public WipPkg CurPkg { get; set; }
public bool NoNeedInStorePrint { get; set; }
#endregion Propertys & Variables
@@ -36,14 +38,15 @@
public void Init(IWorkStep curStep, IPosition position, MES_WO_NODE_ACT nodeAct, MES_WO_ACTION setting)
{
#region 鍥哄畾鍐欐硶锛岀粰榛樿鍙橀噺璧嬪��
+ MainDB = position.MainDB;
CurStep = curStep;
CurPosition = position;
NodeAct = nodeAct;
Setting = setting;
#endregion
- 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();
+ Label = MainDB.Queryable<BAS_LABEL_TEMP>().Where(q => q.LABEL_CODE == setting.LABEL_CODE).IncludesAllFirstLayer().First();
+ LabelPV = MainDB.Queryable<BAS_LABEL_PV>().ToList();
CurStep.Message = Biz.L("绛夊緟鏍囩鎵撳嵃");
CurStep.Status = StepStatus.Normal;
@@ -67,6 +70,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())
{
@@ -76,13 +80,14 @@
{
//璁剧疆鎵撳嵃鍙橀噺鍊�
Label = CurPosition.SetLabelVariables(LabelPV, Label, this);
- if (CurPosition.Context.ContainsKey("CurPackage"))
+ if (!CurPkg.IsNullOrEmpty())
{
- (CurPosition.Context["CurPackage"] as WipPkg).InStoreLabel = Label;
+ CurPkg.InStoreActID = NodeAct.ID;
+ CurPkg.InStoreLabel = Label;
}
//鍒ゆ柇鏄惁闇�瑕佹墦鍗板叆搴撴爣绛�
- NoNeedInStorePrint = (!CurPosition.Context.ContainsKey("CurPackage") || !(CurPosition.Context["CurPackage"] as WipPkg).IsFinished)
+ NoNeedInStorePrint = (CurPkg.IsNullOrEmpty() || !CurPkg.IsFinished)
|| (CurPosition is YadaPacking && (CurPosition as YadaPacking).IsPrintCustomerLabel);
if (NoNeedInStorePrint)
{
@@ -176,8 +181,10 @@
PRD_CODE = wipSn.PRD_CODE,
ACT_TYPE = NodeAct.ACT_TYPE,
ACT_SN = wipSn.SN,
- ACT_VALUE_1 = Label?.LABEL_CODE,
- ACT_VALUE_2 = Label?.ToJson(),
+ ACT_VALUE_1 = CurPkg?.IsFinished == true ? "Y" : "N",
+ ACT_VALUE_2 = CurPkg?.ToJson(),
+ ACT_VALUE_3 = Label?.ToJson(),
+ ACT_VALUE_4 = "InStore",
ACT_RESULT = "Y",
ELAPSED_TIME = CurStep.GetElapsedTime().TotalMilliseconds.ToInt64(),
TRACE_INFO = NoNeedInStorePrint ? $"鏃犻渶鎵撳嵃鍏ュ簱鏍囩" : $"鏍囩{Label?.LABEL_NAME}[{Label?.LABEL_CODE}]鎵撳嵃鎴愬姛",
--
Gitblit v1.9.3