From 40a4304c8f10746b2a36cbbdff6a96a76e39ca70 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期四, 12 九月 2024 20:07:58 +0800
Subject: [PATCH] 优化包装行为
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 09fad06..23416c3 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -181,8 +181,20 @@
action.LocaleMsg = GetBeginMsg();
var min = PkgRule.Details.OrderBy(q => q.PKG_LEVEL).First();
+ if (min.PKG_LEVEL == CurPkg.Item.PKG_LEVEL && CurPkg.NeedWeighing)
+ {
+ var data = new PackingActionOutput() { PkgInfo = CurPkg };
+ data.ExecCode = "Weighing";
+ data.PkgLevel = min.PKG_LEVEL;
+ CurCmd = data;
+ CurStep?.SetStatusMessage(StepStatus.Normal, Biz.L("涓婄О绉伴噸"));
+ action.Data.Data = data;
+ action.Data.ShortMsg = new("涓婄О绉伴噸", ShortMessage.Types.Success);
+ //action.LocaleMsg = new($"璇锋妸澶栧寘瑁呬笂绉扮О閲�");
+ action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseWeighing");
+ }
//鏍规嵁鍖呰涓嶅悓灞傜骇鐨勬爣绛炬ā鏉夸唬鐮侊紝濡傛灉涓虹┖鍒欎笉闇�瑕佹墦鍗�
- if (LabelDic[min.PKG_LEVEL].IsNullOrEmpty())
+ else if (LabelDic[min.PKG_LEVEL].IsNullOrEmpty())
{
input.Data = new PackingActionInput()
{
@@ -376,8 +388,6 @@
action.LocaleMsg = new Locale("MES.WorkAction.PackingAction.BeginPrint", PrintTimes, dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME, LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE, LabelDic[dtl.PKG_LEVEL].LABEL_NAME);
}
}
-
-
}
else
{
--
Gitblit v1.9.3