From d7993bd9928d605be845cad5620d20a9b16b2302 Mon Sep 17 00:00:00 2001
From: Ben Lin <maobin001@msn.com>
Date: 星期三, 16 十月 2024 15:23:53 +0800
Subject: [PATCH] 一些更改
---
Tiger.Business.MES/Transaction/PackingNode.cs | 53 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 37 insertions(+), 16 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index ebf4b87..7c1a076 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -89,7 +89,7 @@
info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
- else if (!IsFinishAllSteps)
+ else if (Steps.Any() && !IsFinishAllSteps)
{
action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
@@ -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;
@@ -475,7 +476,7 @@
CurWipSNHiss.Clear();
foreach (var wipSN in wipSNs)
{
- var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛");
+ var his = new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛锛圱ransId锛歿TransID}锛�");
wipSN.History.Add(his);
CurWipSNHiss.Add(his);
}
@@ -621,12 +622,18 @@
/// <returns></returns>
public ApiAction<SubmitOutput> DoIfFinishAllSteps(ApiAction<SubmitOutput> action, string locale)
{
+ var curPkg = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null;
var operInfo = SetOperNodeInfo(CurOperInfo(locale));
Action endAction = null;
//濡傛灉褰撳墠鏉＄爜宸茬粡璧板埌娴佺▼缁堢偣鍒欒褰曟潯鐮佸畬宸�
if (operInfo.IsReachedEndNode)
{
+ //鏍囪褰撳墠鍖呰淇℃伅涓虹粓鐐圭珯
+ if (!curPkg.IsNullOrEmpty())
+ {
+ curPkg.IsReachedEndNode = true;
+ }
//鏇存柊宸ュ崟鏉＄爜鏄庣粏淇℃伅
var woSNs = CurBatch.WoSNs.Where(q => CurWipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
foreach (var woSN in woSNs)
@@ -642,6 +649,7 @@
wipSN.NODE_NAME = curNode.NODE_NAME;
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
+ wipSN.OPERATION_TIME = DateTime.Now;
}
var wipHiss = new List<MES_WIP_HIS>();
@@ -656,15 +664,28 @@
var _woSns = woSNs.Clone();
var _wipSns = CurWipSNs.Clone();
var _wipHiss = wipHiss.Clone();
+ var _pkgList = curPkg?.IsFinished == true ? GetPackageList(curPkg.Item) : new();
//淇濆瓨鏁版嵁
endAction = () =>
{
//浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
var db = GetCommitDB();
//鏁版嵁淇濆瓨閫昏緫
- db.Storageable(_woSns, UserCode).ExecuteCommand();
- db.Storageable(_wipSns, UserCode).ExecuteCommand();
+ db.Updateable(_woSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS }).ExecuteCommand();
+ db.Updateable(_wipSns, UserCode).UpdateColumns(q => new { q.UPDATE_TIME, q.UPDATE_USER, q.STATUS, q.NODE_ID, q.NODE_NAME, q.OPER_CODE, q.SEGMENT, q.OPERATION_TIME }).ExecuteCommand();
db.Storageable(_wipHiss, UserCode).ExecuteCommand();
+ if (_pkgList.Any())
+ {
+ var wipIDs = _pkgList.Where(q => !q.WIP_ID.IsNullOrEmpty()).Select(q => q.WIP_ID).ToList();
+ var wo = _pkgList.First().WORK_ORDER;
+ //鍖呰淇℃伅淇濆瓨鍒扮敓浜ц繃绋嬭褰�
+ db.Updateable<MES_WIP_HIS>()
+ .SetColumns(q => q.TRAY_SN == curPkg.Item.Package.SN)
+ .SetColumns(q => q.INNER_SN == q.CARTON_SN)
+ .SetColumns(q => q.CARTON_SN == curPkg.Item.Package.SN)
+ .Where(q => q.WORK_ORDER == wo && q.OPER_CODE == "EndNode" && wipIDs.Contains(q.WIP_ID))
+ .ExecuteCommand();
+ }
};
}
@@ -673,7 +694,7 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
CurOperInfo(locale).InputQty += CurWipSNs.Count;
- action.Data.Data = new PackingActionOutput() { PkgInfo = Context.ContainsKey("CurPackage") ? Context["CurPackage"] as WipPkg : null };
+ action.Data.Data = new PackingActionOutput() { PkgInfo = curPkg };
action.Data.OperInfo = operInfo;
action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
--
Gitblit v1.9.3