From d811e775f550e65f4af420806e3d7a12c0c334bc Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期一, 26 八月 2024 16:58:41 +0800
Subject: [PATCH] 合并
---
Tiger.Business.MES/WorkAction/ThreeInOne.cs | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/ThreeInOne.cs b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
index c0d6e5c..072cad6 100644
--- a/Tiger.Business.MES/WorkAction/ThreeInOne.cs
+++ b/Tiger.Business.MES/WorkAction/ThreeInOne.cs
@@ -84,8 +84,13 @@
{
CurCSN.WORK_ORDER = CurPosition.WorkBatch.WO.ORDER_NO;
CurCSN.ITEM_CODE = CurPosition.WorkBatch.WO.ITEM_CODE;
-
- End();
+ action.Data.Data = new
+ {
+ NeedPrint = false,
+ NeedScan = false,
+ Label = "",
+ };
+ action = End();
}
//鍘傚唴鏉＄爜鏈粦瀹氬鎴锋潯鐮�
else
@@ -96,7 +101,8 @@
action.Data.Data = new
{
NeedPrint = false,
- Label = "",
+ NeedScan = true,
+ Label = "",
};
action.Data.ShortMsg = new("鎵弿瀹㈡埛鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"璇锋壂鎻忓巶鍐呮潯鐮乕{0}]闇�瑕佺粦瀹氬鎴锋潯鐮�");
@@ -109,9 +115,10 @@
action.Data.Data = new
{
NeedPrint = true,
- Label,
+ NeedScan = true,
+ Label,
};
- action.Data.ShortMsg = new("鎵撳嵃瀹㈡埛鏍囩", ShortMessage.Types.Normal);
+ action.Data.ShortMsg = new("鎵弿宸叉墦鍗扮殑瀹㈡埛鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬫墦鍗板巶鍐呮潯鐮乕{0}]瀵瑰簲鐨勫鎴锋潯鐮�");
action.LocaleMsg = new Locale("MES.WorkAction.ThreeInOne.BeginPrint", wipSn.SN);
}
--
Gitblit v1.9.3