From 0116b5d2ed16a0825da9e7474fc786ee06b2d60c Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期三, 04 九月 2024 08:40:31 +0800
Subject: [PATCH] 增加公布提示信息和状态
---
Tiger.Business.MES/WorkAction/PackingAction.cs | 49 +++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 45 insertions(+), 4 deletions(-)
diff --git a/Tiger.Business.MES/WorkAction/PackingAction.cs b/Tiger.Business.MES/WorkAction/PackingAction.cs
index 7a4421c..5172731 100644
--- a/Tiger.Business.MES/WorkAction/PackingAction.cs
+++ b/Tiger.Business.MES/WorkAction/PackingAction.cs
@@ -177,6 +177,8 @@
data.PrintLable = LabelDic[min.PKG_LEVEL];
CurCmd = data;
PrintTimes++;
+ CurStep.Message = Biz.L("鎵撳嵃鏍囩");
+ CurStep.Status = StepStatus.Normal;
action.Data.Data = data;
action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{min.PKG_LEVEL}灞傚寘瑁匸{min.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[min.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[min.PKG_LEVEL].LABEL_NAME}]");
@@ -207,6 +209,8 @@
if (!pInput.IsFinish || pInput.PkgSN.IsNullOrEmpty())
{
var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
+ CurStep.Message = Biz.L("鎵弿閿欒");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("鎵弿閿欒", ShortMessage.Types.Error);
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜鎵弿澶辫触锛岃閲嶆柊鎵弿绗瑊dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
@@ -217,6 +221,8 @@
if (GetPackageList(CurPkg.Item).Any(q => q.SN == pInput.PkgSN))
{
var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
+ CurStep.Message = Biz.L("鎵弿閿欒");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("鎵弿閿欒", ShortMessage.Types.Error);
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜[{pInput.PkgSN}]鏃犻渶閲嶅鎵弿锛岃鎵弿绗瑊dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
@@ -229,6 +235,8 @@
action = SavePkgData(input, action);
if (action.IsSuccessed)
{
+ CurStep.Message = Biz.L("鎵弿鎴愬姛");
+ CurStep.Status = StepStatus.Success;
action.Data.ShortMsg = new("鎵弿鎴愬姛", ShortMessage.Types.Success);
}
}
@@ -247,6 +255,8 @@
data.ExecCode = "Scan";
data.PkgLevel = dtl.PKG_LEVEL;
CurCmd = data;
+ CurStep.Message = Biz.L("鎵弿鏍囩");
+ CurStep.Status = StepStatus.Normal;
action.Data.Data = data;
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
@@ -259,6 +269,8 @@
if (PrintTimes < 3 && !CurCmd.IsNullOrEmpty())
{
PrintTimes++;
+ CurStep.Message = Biz.L("閲嶆柊鎵撳嵃");
+ CurStep.Status = StepStatus.Normal;
action.Data.Data = CurCmd;
action.Data.ShortMsg = new("閲嶆柊鎵撳嵃", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮媨PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
@@ -268,6 +280,8 @@
{
CurCmd = null;
PrintTimes = 0;
+ CurStep.Message = Biz.L("鎵撳嵃澶辫触");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("鎵撳嵃澶辫触", ShortMessage.Types.Failed);
action.IsSuccessed = false;
//action.LocaleMsg = new($"灏濊瘯绗瑊PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]澶辫触锛屽伐搴忓凡閲嶇疆锛岃閲嶆柊鎵弿杩涚珯浜у搧鏉＄爜");
@@ -287,6 +301,8 @@
if (!PkgProd.IsNullOrEmpty() && (pInput.WeightInfo.Weight < PkgProd.MIN_WEIGHT || PkgProd.MIN_WEIGHT < pInput.WeightInfo.Weight))
{
action.IsSuccessed = false;
+ CurStep.Message = Biz.L("閲嶉噺瓒呴檺");
+ CurStep.Status = StepStatus.Error;
action.Data.Data = CurCmd;
action.Data.ShortMsg = new("閲嶉噺瓒呴檺", ShortMessage.Types.Failed);
//action.LocaleMsg = new($"澶栧寘瑁呴噸閲廩{0}]瓒呭嚭浜у搧[{1}]鍦ㄥ寘瑁呰鍒橻{2}]涓殑棰勮鑼冨洿[{3} - {4}]锛岃澶勭悊鍚庨噸鏂颁笂绉扮О閲�");
@@ -317,7 +333,9 @@
data.ExecCode = "Scan";
data.PkgLevel = dtl.PKG_LEVEL;
CurCmd = data;
- action.Data.Data = data;
+ CurStep.Message = Biz.L("鎵弿鏍囩");
+ CurStep.Status = StepStatus.Normal;
+ action.Data.Data = data;
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
@@ -333,7 +351,9 @@
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
CurCmd = data;
PrintTimes++;
- action.Data.Data = data;
+ CurStep.Message = Biz.L("鎵撳嵃鏍囩");
+ CurStep.Status = StepStatus.Normal;
+ action.Data.Data = data;
action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
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);
@@ -345,6 +365,8 @@
else
{
action.IsSuccessed = false;
+ CurStep.Message = Biz.L("绉伴噸澶辫触");
+ CurStep.Status = StepStatus.Error;
action.Data.Data = CurCmd;
action.Data.ShortMsg = new("绉伴噸澶辫触", ShortMessage.Types.Failed);
//action.LocaleMsg = new($"澶栧寘瑁呯О閲嶆暟鎹紓甯革紝璇烽噸鏂颁笂绉扮О閲�");
@@ -366,6 +388,8 @@
data.ExecCode = "Weighing";
data.PkgLevel = CurPkgItem.PKG_LEVEL;
CurCmd = data;
+ CurStep.Message = Biz.L("鍖呰鎴愬姛");
+ CurStep.Status = StepStatus.Success;
action.Data.Data = data;
action.Data.ShortMsg = new("鍖呰鎴愬姛", ShortMessage.Types.Success);
//action.LocaleMsg = new($"璇锋妸鍖呰[{CurPkgItem.Package.SN}]涓婄О绉伴噸");
@@ -400,6 +424,8 @@
data.ExecCode = "Scan";
data.PkgLevel = dtl.PKG_LEVEL;
CurCmd = data;
+ CurStep.Message = Biz.L("鎵弿鏍囩");
+ CurStep.Status = StepStatus.Normal;
action.Data.Data = data;
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
@@ -416,6 +442,8 @@
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
CurCmd = data;
PrintTimes++;
+ CurStep.Message = Biz.L("鎵撳嵃鏍囩");
+ CurStep.Status = StepStatus.Normal;
action.Data.Data = data;
action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{min.PKG_LEVEL}灞傚寘瑁匸{min.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[min.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[min.PKG_LEVEL].LABEL_NAME}]");
@@ -565,6 +593,8 @@
data.ExecCode = "Weighing";
data.PkgLevel = CurPkgItem.PKG_LEVEL;
CurCmd = data;
+ CurStep.Message = Biz.L("涓婄О绉伴噸");
+ CurStep.Status = StepStatus.Normal;
action.Data.Data = data;
action.Data.ShortMsg = new("涓婄О绉伴噸", ShortMessage.Types.Success);
//action.LocaleMsg = new($"璇锋妸澶栧寘瑁呬笂绉扮О閲�");
@@ -579,7 +609,9 @@
data.ExecCode = "Scan";
data.PkgLevel = dtl.PKG_LEVEL;
CurCmd = data;
- action.Data.Data = data;
+ CurStep.Message = Biz.L("鎵弿鏍囩");
+ CurStep.Status = StepStatus.Normal;
+ action.Data.Data = data;
action.Data.ShortMsg = new("鎵弿鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"璇锋壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮�");
action.LocaleMsg = new("MES.WorkAction.PackingAction.PleaseScanLabel", dtl.PKG_LEVEL, dtl.PkgType.PKG_NAME);
@@ -595,7 +627,9 @@
data.PrintLable = LabelDic[dtl.PKG_LEVEL];
CurCmd = data;
PrintTimes++;
- action.Data.Data = data;
+ CurStep.Message = Biz.L("鎵撳嵃鏍囩");
+ CurStep.Status = StepStatus.Normal;
+ action.Data.Data = data;
action.Data.ShortMsg = new("鎵撳嵃鏍囩", ShortMessage.Types.Normal);
//action.LocaleMsg = new Locale($"寮�濮嬬{PrintTimes}娆℃墦鍗扮{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛綶{LabelDic[dtl.PKG_LEVEL]?.LABEL_CODE}: {LabelDic[dtl.PKG_LEVEL].LABEL_NAME}]");
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);
@@ -611,6 +645,8 @@
//鏁版嵁寮傚父
else
{
+ CurStep.Message = Biz.L("鍖呰閿欒");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("鍖呰閿欒", ShortMessage.Types.Error);
var pdtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
action.IsSuccessed = false;
@@ -622,6 +658,8 @@
}
catch (System.Exception ex)
{
+ CurStep.Message = Biz.L("鍖呰寮傚父");
+ CurStep.Status = StepStatus.Error;
action.Data.ShortMsg = new("鍖呰寮傚父", ShortMessage.Types.Exception);
var dtl = PkgRule.Details.First(q => q.PKG_LEVEL == pInput.PkgLevel);
action.CatchExceptionWithLog(ex, $"鍖呰琛屼负锛氭壂鎻忕{dtl.PKG_LEVEL}灞傚寘瑁匸{dtl.PkgType.PKG_NAME}]鐨勬爣绛炬潯鐮乕{input.SN}]鍚庝繚瀛樻暟鎹け璐�");
@@ -656,6 +694,8 @@
data.ExecCode = "Complete";
data.PkgLevel = CurPkg.Item.PKG_LEVEL;
CurCmd = data;
+ CurStep.Message = Biz.L("淇濆瓨鍖呰鏁版嵁");
+ CurStep.Status = StepStatus.Normal;
action.Data.Data = data;
action.Data.ShortMsg = new("淇濆瓨鍖呰鏁版嵁", ShortMessage.Types.Normal);
//action.LocaleMsg = new($"绗瑊CurPkg.Item.PKG_LEVEL}灞傚寘瑁匸{CurPkg.Item.PKG_NAME}]宸茬粡鍏ㄩ儴瀹屾垚锛屼繚瀛樺寘瑁呮暟鎹�");
@@ -791,6 +831,7 @@
}
IsFinished = true;
+ CurStep.Message = Biz.L("鍖呰瀹屾垚");
CurStep.Status = StepStatus.Finished;
action.Data.ShortMsg = new("鍖呰瀹屾垚", ShortMessage.Types.Success);
--
Gitblit v1.9.3