From eec9f268552af1d0ce8c95312930770669f1cc18 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 16 八月 2024 22:40:16 +0800
Subject: [PATCH] 增加客户端需要的工序信息和短消息
---
Tiger.Business.MES/Transaction/PackingNode.cs | 163 +++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 131 insertions(+), 32 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index b6ca249..0c6de97 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -55,9 +55,9 @@
//濡傛灉琛屼负琚爣璁版垚宸插畬鎴愶紝鍒欓噸缃伐搴�
if (TempPkgAction.IsFinished)
{
+ action.Data.OperInfo = OperInfoDic.ContainsKey(CurBatch?.Batch?.BATCH_NO ?? "") ? OperInfoDic[CurBatch.Batch.BATCH_NO] : new();
ResetNode();
}
- return action;
}
//NodeSubmit锛氫骇鍝佽繃绔欙紝姝ｅ父浜у搧杩囩珯閫昏緫
else
@@ -70,7 +70,10 @@
if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
{
action = NodeSubmit(action, input);
- return action;
+ //鏇存柊宸ュ簭淇℃伅
+ var info = WoContext.GetSnOperInfo(input.SN).Data;
+ info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ action.Data.OperInfo = info;
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
@@ -83,6 +86,8 @@
{
if (wosns.Count > 1 && wosns.Any(q => q.SN.TRAY_SN != q.SN.OUTER_SN))
{
+ action.Data.ShortMsg = new("璇锋壂鎻忎骇鍝�", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
action.IsSuccessed = false;
action.LocaleMsg = new($"鏉＄爜[{0}]鏄浇鍏锋潯鐮侊紝璇锋壂鎻忚浇鍏蜂腑鐨勪骇鍝佹潯鐮佺户缁寘瑁呮搷浣�");
action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.OnlyMinPackage", input.SN);
@@ -90,10 +95,11 @@
}
if (wosns.First().Batch.ACT_LINE != CurLine.LINE_CODE)
{
+ action.Data.ShortMsg = new("浜х嚎閿欒", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜[{0}]宸插湪浜х嚎[{1}]鎶曞叆鐢熶骇锛岃鍦ㄦ纭矖浣嶆壂鎻�");
action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, wosns.First().Batch.ACT_LINE);
- return action;
}
else
{
@@ -103,14 +109,16 @@
var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO });
if (!result.IsSuccessed)
{
- action.IsSuccessed = result.IsSuccessed;
+ action.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
+ action.IsSuccessed = result.IsSuccessed;
action.LocaleMsg = result.LocaleMsg;
return action;
}
}
//鏉＄爜杩囩珯
action = NodeSubmit(action, input);
- return action;
+ action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO]);
}
}
//鏌ユ壘涓嶅埌鏉＄爜宸茬粦瀹氱殑宸ュ崟
@@ -119,18 +127,20 @@
//娌℃湁褰撳墠宸ュ崟锛屽垯鍏堥�夋嫨宸ュ崟鍚庡啀鎵弿鏉＄爜
if (CurBatch.IsNullOrEmpty())
{
+ action.Data.ShortMsg = new("鏈�夋嫨宸ュ崟", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏈�夋嫨宸ュ崟锛岃鍏堥�夋嫨瑕佺敓浜х殑宸ュ崟");
action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException");
- return action;
}
//鏈夊綋鍓嶅伐鍗曚笖涓嶆槸鎶曞叆锛屽垯鎻愮ず鏉＄爜鏈姇鍏ョ敓浜э紝璇峰厛鍘婚绔欐壂鎻�
else
{
+ action.Data.ShortMsg = new("鏈姇鍏ョ敓浜�", ShortMessage.Types.Error);
+ action.Data.OperInfo = new();
action.IsSuccessed = false;
//action.LocaleMsg = new($"鏉＄爜[{input.SN}]灏氭湭鎶曞叆鐢熶骇锛岃鍏堝幓棣栫珯鎵弿", input.SN);
action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotInputException", input.SN);
- return action;
}
}
}
@@ -142,7 +152,7 @@
if (submitStep.IsNullOrEmpty())
{
action = BeginNextActionStep(input);
- return action;
+ action.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
}
else
{
@@ -168,20 +178,28 @@
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
if (IsFinishAllSteps)
{
- return DoIfFinishAllSteps(result);
+ result = DoIfFinishAllSteps(result);
}
+ result.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
return result;
}
}
//娌℃湁鍙墽琛岀殑宸ユ
- ResetNode();
- action.IsSuccessed = false;
- //action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
- action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.WorkStepException", CurPosition.POST_CODE);
+ else
+ {
+ action.Data.ShortMsg = new("閲嶇疆鎵弿", ShortMessage.Types.Error);
+ action.Data.OperInfo = OperInfoDic.ContainsKey(CurBatch?.Batch?.BATCH_NO ?? "") ? OperInfoDic[CurBatch.Batch.BATCH_NO] : new();
+ ResetNode();
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.WorkStepException", CurPosition.POST_CODE);
+ }
}
}
catch (Exception ex)
{
+ action.Data.ShortMsg = new("宸ュ簭寮傚父", ShortMessage.Types.Error);
+ action.Data.OperInfo = OperInfoDic.ContainsKey(CurBatch?.Batch?.BATCH_NO ?? "") ? OperInfoDic[CurBatch.Batch.BATCH_NO] : new();
//action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
}
@@ -203,16 +221,18 @@
var woStatus = CurBatch.CheckCanProduce(curNode);
if (!woStatus.IsSuccessed)
{
+ woStatus.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error);
return woStatus;
}
- //闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
+
var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => (q.SN == input.SN || q.TRAY_SN == input.SN) && q.WORK_ORDER == CurBatch.WO.ORDER_NO).ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
{
SN = input.SN,
- STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
+ FLOW_SN = input.SN,
+ STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
ITEM_CODE = CurBatch.WO.ITEM_CODE,
WORK_ORDER = CurBatch.Batch.ORDER_NO,
BATCH_NO = CurBatch.Batch.BATCH_NO,
@@ -225,9 +245,33 @@
};
wipSNs.Add(wipSN);
}
+
+ //濡傛灉鏉＄爜涓嶆槸褰撳墠宸ュ崟鎴栬�呬骇绾跨殑鍒欐姤閿�
+ if (wipSNs.Any(q => q.WORK_ORDER != CurBatch.WO.ORDER_NO || q.LINE_CODE != CurLine.LINE_CODE))
+ {
+ if (wipSNs.First().LINE_CODE == CurLine.LINE_CODE)
+ {
+ action.Data.ShortMsg = new("宸ュ崟閿欒", ShortMessage.Types.Error);
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"浜у搧[{CurSN}]涓嶅睘浜庡綋鍓嶅伐鍗曪紝璇峰垏鎹㈠埌宸ュ崟[{wipSNs.First().WORK_ORDER}]鍚庡啀鎵弿");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.WoError", CurSN, wipSNs.First().WORK_ORDER);
+ return action;
+ }
+ else
+ {
+ action.Data.ShortMsg = new("浜х嚎閿欒", ShortMessage.Types.Error);
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"浜у搧[{CurSN}]宸插湪浜х嚎[{wipSNs.First().LINE_CODE}]鎶曚骇锛岃鍒颁骇绾縖{wipSNs.First().LINE_CODE}]鎵弿");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.LineError", CurSN, wipSNs.First().LINE_CODE);
+ return action;
+ }
+ }
+
+ //闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
var canGotoNext = CurBatch.CanGotoNext(input, wipSNs.First(), curNode);
if (!canGotoNext.IsSuccessed)
{
+ woStatus.Data.ShortMsg = new("杩涚珯閿欒", ShortMessage.Types.Error);
return canGotoNext;
}
@@ -242,6 +286,7 @@
CurBatch.WoSNs.Add(new()
{
WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ WIP_ID = wipSN.ID,
SN = wipSN.SN,
TRAY_SN = wipSN.TRAY_SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
@@ -304,6 +349,43 @@
wipSN.DFT_FLAG = "Y";
wipSN.DFT_COUNT++;
wipSN.DFT_CODE = input.DFT_CODE;
+ var dft = CurBatch.Defects.FirstOrDefault(q => q.DFT_CODE == wipSN.DFT_CODE);
+ var defect = new MES_WIP_DFT()
+ {
+ AUTH_ORG = wipSN.AUTH_ORG,
+ AUTH_PROD = wipSN.LINE_CODE,
+ WIP_ID = wipSN.ID,
+ SN = wipSN.SN,
+ STATUS = MES_WIP_DFT.STATUSs.WaitHandle.GetValue(),
+ ITEM_CODE = wipSN.ITEM_CODE,
+ WORK_ORDER = wipSN.WORK_ORDER,
+ BATCH_NO = wipSN.BATCH_NO,
+ ROT_CODE = wipSN.ROT_CODE,
+ NODE_ID = wipSN.NODE_ID,
+ NODE_NAME = wipSN.NODE_NAME,
+ FTY_CODE = wipSN.FTY_CODE,
+ WS_CODE = wipSN.WS_CODE,
+ LINE_CODE = wipSN.LINE_CODE,
+ POST_CODE = wipSN.POST_CODE,
+ OPER_CODE = wipSN.OPER_CODE,
+ SEGMENT = wipSN.SEGMENT,
+ DFT_CODE = dft.DFT_CODE,
+ DFT_NAME = dft.DFT_NAME,
+ DFT_LEVEL = dft.DFT_LEVEL,
+ FLOW_SN = wipSN.FLOW_SN,
+ TRAY_SN = wipSN.TRAY_SN,
+ INNER_SN = wipSN.INNER_SN,
+ CARTON_SN = wipSN.CARTON_SN,
+ PALLET_SN = wipSN.PALLET_SN,
+ INV_FLAG = wipSN.INV_FLAG,
+ OPERATION_TIME = DateTime.Now,
+ SFTS_CODE = wipSN.SFTS_CODE,
+ SFT_CODE = wipSN.SFT_CODE,
+ PRD_CODE = wipSN.PRD_CODE,
+ OBA_BATCH = wipSN.OBA_BATCH,
+ LOCK_BATCH = wipSN.LOCK_BATCH,
+ };
+ CurDefects.Add(defect);
}
}
@@ -318,6 +400,14 @@
CurWipSNHiss.Add(new MES_WIP_HIS(wipSN, $"宸ュ崟[{wipSN.WORK_ORDER}]鏉＄爜[{wipSN.SN}]鍦ㄥ矖浣峓{wipSN.POST_CODE}]杩囩珯宸ュ簭[{wipSN.NODE_NAME}]鎴愬姛"));
}
+ //鍒涘缓鍙橀噺鍏嬮殕瀵硅薄鐢ㄤ簬浼犲叆DBSubmitAction涓繚瀛樺綋鍓嶉渶瑕佹殏瀛樼殑鏁版嵁鍊�
+ var _woSns = woSNs.Clone();
+ var _wipSns = wipSNs.Clone();
+ var _wipHiss = CurWipSNHiss.Clone();
+ var _defect = CurDefects.Clone();
+ var _curNode = curNode.Clone();
+ var _Batch = CurBatch.Batch.Clone();
+
//鍒濆鍖栧伐姝ュ垪琛�
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
@@ -326,21 +416,28 @@
Node = curNode,
DBSubmitAction = () =>
{
- var db = GetCommitDB();
- db.Storageable(woSNs, UserCode).ExecuteCommand();
- db.Storageable(wipSNs, UserCode).ExecuteCommand();
- db.Storageable(CurWipSNHiss, UserCode).ExecuteCommand();
- //濡傛灉鏄姇鍏ョ珯
- if (curNode.IS_INPUT == "Y")
+ //浣跨敤缁熶竴鐨勪簨鍔B瀵硅薄
+ var db = GetCommitDB();
+ //鏁版嵁淇濆瓨閫昏緫
+ db.Storageable(_woSns, UserCode).ExecuteCommand();
+ db.Storageable(_wipSns, UserCode).ExecuteCommand();
+ db.Storageable(_wipHiss, UserCode).ExecuteCommand();
+ //濡傛灉鏈変笉鑹垯淇濆瓨
+ if (_defect.Any())
{
- db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + wipSNs.Count).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
- db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + wipSNs.Count).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
+ db.Storageable(_defect, UserCode).ExecuteCommand();
+ }
+ //濡傛灉鏄姇鍏ョ珯
+ if (_curNode.IS_INPUT == "Y")
+ {
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
}
//濡傛灉鏄骇鍑虹珯
- if (curNode.IS_OUTPUT == "Y")
+ if (_curNode.IS_OUTPUT == "Y")
{
- db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + wipSNs.Count).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
- db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + wipSNs.Count).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.ORDER_NO == _Batch.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + _woSns.Count).Where(q => q.BATCH_NO == _Batch.BATCH_NO).ExecuteCommand();
}
}
};
@@ -376,7 +473,6 @@
//鏈畬鎴愭墍鏈夊伐姝�
if (!IsFinishAllSteps)
{
- var result = new ApiAction<SubmitOutput>(new SubmitOutput());
//鏈畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝�
if (!IsFinishNodeSteps)
{
@@ -385,14 +481,14 @@
NextSteps.Clear();
NextSteps.Add(next);
//鏍规嵁鍚庣画宸ユ杩斿洖ApiAction
- result.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
+ action.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
//鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙疯繑鍥炵浉搴旂殑鎿嶄綔鎻愮ず
switch (next.Sequence)
{
case 2:
//action.LocaleMsg = new($"璇锋墽琛岀浜屾");
- result.LocaleMsg = new("MES.Transaction.CollectNode.绗簩姝ユ搷浣滄彁绀�");
+ action.LocaleMsg = new("MES.Transaction.CollectNode.绗簩姝ユ搷浣滄彁绀�");
break;
default:
break;
@@ -401,12 +497,11 @@
//宸插畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝ワ紝寮�濮嬫墽琛岃涓哄伐姝�
else
{
- result = BeginNextActionStep(input);
+ action = BeginNextActionStep(input);
}
- return result;
}
//宸插畬鎴愭墍鏈夊伐姝�
- else
+ if (IsFinishAllSteps)
{
action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
action = DoIfFinishAllSteps(action);
@@ -414,6 +509,7 @@
}
catch (Exception ex)
{
+ action.Data.ShortMsg = new("宸ユ寮傚父", ShortMessage.Types.Error);
ResetNode();
//action.CatchExceptionWithLog(ex, $"{curNode.NODE_NAME}锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯革紝璇锋鏌ュ伐搴忚妭鐐硅缃�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.NodeSubmitException", curNode.NODE_NAME));
@@ -432,10 +528,13 @@
SaveStepsCommitActionToDB();
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
+ OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty += CurWipSNs.Count;
+ action.Data.ShortMsg = new("杩囩珯鎴愬姛", ShortMessage.Types.Success);
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]");
action.LocaleMsg = new("MES.Transaction.CollectNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME,CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
//閲嶇疆宸ュ簭
ResetNode();
+
return action;
}
--
Gitblit v1.9.3