From 006c12987d7dc7c2081fbf6715ebea98b93fdca0 Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期日, 08 十二月 2024 17:04:32 +0800 Subject: [PATCH] 增加工单批次缓存,不良代码缓存,岗位缓存 --- Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs | 12 +++++++----- 1 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs b/Tiger.Business.MES/WorkAction/PrintInStoreLabel.cs index 681a240..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; } @@ -37,15 +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(); - CurPkg = CurPosition.Context.ContainsKey("CurPackage") ? CurPosition.Context["CurPackage"] as WipPkg : null; + 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; @@ -69,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()) { @@ -85,7 +87,7 @@ } //鍒ゆ柇鏄惁闇�瑕佹墦鍗板叆搴撴爣绛� - NoNeedInStorePrint = (!CurPkg.IsNullOrEmpty() || !CurPkg.IsFinished) + NoNeedInStorePrint = (CurPkg.IsNullOrEmpty() || !CurPkg.IsFinished) || (CurPosition is YadaPacking && (CurPosition as YadaPacking).IsPrintCustomerLabel); if (NoNeedInStorePrint) { @@ -182,7 +184,7 @@ ACT_VALUE_1 = CurPkg?.IsFinished == true ? "Y" : "N", ACT_VALUE_2 = CurPkg?.ToJson(), ACT_VALUE_3 = Label?.ToJson(), - ACT_VALUE_4 = "InStroe", + 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