From 5aa991b7f330a0efff66069024aabcfe491aa723 Mon Sep 17 00:00:00 2001 From: Ben Lin <maobin001@msn.com> Date: 星期日, 13 十月 2024 22:26:27 +0800 Subject: [PATCH] 已完工更新 --- Tiger.Business.MES/Transaction/PackingNode.cs | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs index 5279f56..6087d6d 100644 --- a/Tiger.Business.MES/Transaction/PackingNode.cs +++ b/Tiger.Business.MES/Transaction/PackingNode.cs @@ -165,29 +165,30 @@ //鏌ユ壘涓嶅埌鏉$爜宸茬粦瀹氱殑宸ュ崟 else { - //娌℃湁褰撳墠宸ュ崟锛屽垯鍏堥�夋嫨宸ュ崟鍚庡啀鎵弿鏉$爜 - if (CurBatch.IsNullOrEmpty()) + var lastSn = wosns.OrderByDescending(q => q.SN.UPDATE_TIME).FirstOrDefault(); + if (!lastSn.IsNullOrEmpty()) { - action.Data.ShortMsg = new("鏈�夋嫨宸ュ崟", ShortMessage.Types.Error); + action.Data.ShortMsg = new($"浜у搧{lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error); action.Data.OperInfo = new(); action.IsSuccessed = false; - //action.LocaleMsg = new($"鏈�夋嫨宸ュ崟锛岃鍏堥�夋嫨瑕佺敓浜х殑宸ュ崟"); - action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException"); + //action.LocaleMsg = new($"杩涚珯鎵弿閿欒锛屾潯鐮乕{0}]{1}", input.SN); + action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.SnStatusError", input.SN, lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()); } - //鏈夊綋鍓嶅伐鍗曚笖涓嶆槸鎶曞叆锛屽垯鎻愮ず鏉$爜鏈姇鍏ョ敓浜э紝璇峰厛鍘婚绔欐壂鎻� else { - var lastSn = wosns.OrderByDescending(q => q.SN.UPDATE_TIME).FirstOrDefault(); - if (!lastSn.IsNullOrEmpty()) + //娌℃湁褰撳墠宸ュ崟锛屽垯鍏堥�夋嫨宸ュ崟鍚庡啀鎵弿鏉$爜 + if (CurBatch.IsNullOrEmpty()) { - action.Data.ShortMsg = new($"浜у搧{lastSn.SN.STATUS.GetEnumDesc<BIZ_MES_WO_SN.STATUSs>()}", ShortMessage.Types.Error); + action.Data.ShortMsg = new("鏈�夋嫨宸ュ崟", ShortMessage.Types.Error); action.Data.OperInfo = new(); action.IsSuccessed = false; - //action.LocaleMsg = new($"杩涚珯鎵弿閿欒锛屾潯鐮乕{0}]{1}", input.SN); - action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotInputException", input.SN); + //action.LocaleMsg = new($"鏈�夋嫨宸ュ崟锛岃鍏堥�夋嫨瑕佺敓浜х殑宸ュ崟"); + action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException"); } + //鏈夊綋鍓嶅伐鍗曚笖涓嶆槸鎶曞叆锛屽垯鎻愮ず鏉$爜鏈姇鍏ョ敓浜э紝璇峰厛鍘婚绔欐壂鎻� else { + action.Data.ShortMsg = new("鏈姇鍏ョ敓浜�", ShortMessage.Types.Error); action.Data.OperInfo = new(); action.IsSuccessed = false; -- Gitblit v1.9.3