From 394189b16b4e0cb6fec8980c3bef15f2aaf10630 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期日, 14 七月 2024 17:22:12 +0800
Subject: [PATCH] 修复bug
---
Tiger.Business.MES/WorkAction/PrintLabel.cs | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PrintLabel.cs b/Tiger.Business.MES/WorkAction/PrintLabel.cs
index 8aac55d..115ab6d 100644
--- a/Tiger.Business.MES/WorkAction/PrintLabel.cs
+++ b/Tiger.Business.MES/WorkAction/PrintLabel.cs
@@ -78,8 +78,8 @@
//閲嶇疆褰撳墠宸ュ簭
CurPosition.ResetSteps();
action.IsSuccessed = false;
- action.LocaleMsg = new($"鏍囩[{Label.LABEL_NAME}]鎵撳嵃澶辫触锛岃閲嶆柊鎵弿浜у搧鏉＄爜", Label.LABEL_NAME);
- //action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintFail", Label.LABEL_NAME);
+ //action.LocaleMsg = new($"鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃澶辫触锛岃閲嶆柊鎵弿浜у搧鏉＄爜", Label.LABEL_NAME);
+ action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintFail", Label.LABEL_NAME, Label.LABEL_CODE);
}
return action;
}
@@ -91,8 +91,8 @@
{
var action = new ApiAction<SubmitOutput>();
IsFinished = true;
- action.LocaleMsg = new($"鏍囩[{Label.LABEL_NAME}]鎵撳嵃鎴愬姛", Label.LABEL_NAME);
- //action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintSuccess", Label.LABEL_NAME);
+ //action.LocaleMsg = new($"鏍囩{Label.LABEL_NAME}[{Label.LABEL_CODE}]鎵撳嵃鎴愬姛", Label.LABEL_NAME);
+ action.LocaleMsg = new("MES.WorkAction.PrintLabel.PrintSuccess", Label.LABEL_NAME, Label.LABEL_CODE);
return action;
}
@@ -109,6 +109,11 @@
{
case "GetSN":
return CurPosition.CurWipSN.SN;
+ case "GetBAS_ITEM":
+ var itemInfo = Biz.Db.Queryable<BAS_ITEM>().Where(q => q.ITEM_CODE == CurPosition.CurWipSN.ITEM_CODE).First();
+ return itemInfo.ToJson();
+ case "GetCustomer":
+ return CurPosition.WorkBatch.Batch.ToJson();
default:
return "";
}
--
Gitblit v1.9.3