From d34d9c35ba844da8b805993bd4c69b0253694fc0 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 02 八月 2024 22:48:08 +0800
Subject: [PATCH] 优化SubmitOutput字段
---
Tiger.Business.MES/Transaction/CollectNode.cs | 85 +++++++++++++++++++++++-------------------
1 files changed, 47 insertions(+), 38 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index f0e0bf1..070f91b 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -53,26 +53,35 @@
else
{
var wosn = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER))
- .ByAuth(input.AuthOption)
- .Where((q, s) => s.SN == input.SN && q.ACT_LINE == CurLine.LINE_CODE && (q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || q.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()))
- .Select((q, s) => new { Batch = q, SN = s }).First();
+ .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).First();
+
//鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
if (!wosn.IsNullOrEmpty())
{
- if (CurBatch?.Batch?.ORDER_NO != wosn.Batch.ORDER_NO)
+ if (wosn.Batch.ACT_LINE != CurLine.LINE_CODE)
{
- //鏉＄爜宸茬粦瀹氱殑宸ュ崟涓嶇瓑浜庡綋鍓嶅伐鍗曞垯閲嶆柊閫夋嫨宸ュ崟
- var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosn.Batch.ORDER_NO });
- if (!result.IsSuccessed)
- {
- action.IsSuccessed = result.IsSuccessed;
- action.LocaleMsg = result.LocaleMsg;
- return action;
- }
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鏉＄爜[{0}]宸插湪浜х嚎[{1}]鎶曞叆鐢熶骇锛岃鍦ㄦ纭矖浣嶆壂鎻�");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, wosn.Batch.ACT_LINE);
+ return action;
}
- //鏉＄爜杩囩珯
- action = NodeSubmit(action, input);
- return action;
+ else
+ {
+ if (CurBatch?.Batch?.ORDER_NO != wosn.Batch.ORDER_NO)
+ {
+ //鏉＄爜宸茬粦瀹氱殑宸ュ崟涓嶇瓑浜庡綋鍓嶅伐鍗曞垯閲嶆柊閫夋嫨宸ュ崟
+ var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosn.Batch.ORDER_NO });
+ if (!result.IsSuccessed)
+ {
+ action.IsSuccessed = result.IsSuccessed;
+ action.LocaleMsg = result.LocaleMsg;
+ return action;
+ }
+ }
+ //鏉＄爜杩囩珯
+ action = NodeSubmit(action, input);
+ return action;
+ }
}
//鏌ユ壘涓嶅埌鏉＄爜宸茬粦瀹氱殑宸ュ崟
else
@@ -123,12 +132,7 @@
}
else
{
- result.Data.IsFinished = IsFinishAllSteps;
- result.Data.CurWO = CurBatch.WO.ORDER_NO;
- result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
- result.Data.CurNode = CurStep?.NodeAct.ACT_NAME;
- result.Data.StepActCode = CurStep?.NodeAct.ACT_CODE;
- result.Data.NextStepID = CurStep?.ID;
+ result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
}
}
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
@@ -140,14 +144,14 @@
}
}
//娌℃湁鍙墽琛岀殑宸ユ
- ResetSteps();
+ ResetNode();
action.IsSuccessed = false;
//action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
action.LocaleMsg = new("MES.Transaction.CollectNode.Submit.WorkStepException", CurPosition.POST_CODE);
}
catch (Exception ex)
{
- action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氭壂鎻忎骇鍝佹潯鐮佸紓甯�");
+ action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
}
return action;
}
@@ -163,8 +167,8 @@
try
{
var curNode = CurBatch.GetNode(PostCode);
- //鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂�
- var woStatus = CurBatch.CheckStatus();
+ //鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂槸鍚﹀彲浠ョ敓浜�
+ var woStatus = CurBatch.CheckCanProduce(curNode);
if (!woStatus.IsSuccessed)
{
return woStatus;
@@ -260,7 +264,6 @@
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
{
- NodeID = curNode.ID,
Sequence = Steps.Count + 1,
Node = curNode,
DBSubmitAction = () =>
@@ -269,6 +272,18 @@
db.Storageable(woSN, UserCode).ExecuteCommand();
db.Storageable(wipSN, UserCode).ExecuteCommand();
db.Storageable(CurWipSNHis, UserCode).ExecuteCommand();
+ //濡傛灉鏄姇鍏ョ珯
+ if (curNode.IS_INPUT == "Y")
+ {
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
+ }
+ //濡傛灉鏄骇鍑虹珯
+ if (curNode.IS_OUTPUT == "Y")
+ {
+ db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
+ db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
+ }
}
};
Steps.Add(curStep);
@@ -303,11 +318,7 @@
NextSteps.Clear();
NextSteps.Add(next);
//鏍规嵁鍚庣画宸ユ杩斿洖ApiAction
- result.Data.IsFinished = IsFinishAllSteps;
- result.Data.CurWO = CurBatch.WO.ORDER_NO;
- result.Data.CurBatch = CurBatch.Batch.BATCH_NO;
- result.Data.CurNode = CurStep?.Node.NODE_NAME;
- result.Data.NextStepID = next.ID;
+ result.Data.SetValue(CurBatch, CurStep, next.ID, IsFinishAllSteps);
//鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙疯繑鍥炵浉搴旂殑鎿嶄綔鎻愮ず
switch (next.Sequence)
@@ -330,18 +341,14 @@
//宸插畬鎴愭墍鏈夊伐姝�
else
{
- action.Data.IsFinished = IsFinishAllSteps;
- action.Data.CurWO = CurBatch.WO.ORDER_NO;
- action.Data.CurBatch = CurBatch.Batch.BATCH_NO;
- action.Data.CurNode = CurStep?.Node.NODE_NAME;
- action.Data.NextStepID = "";
+ action.Data.SetValue(CurBatch, CurStep, "", IsFinishAllSteps);
action = DoIfFinishAllSteps(action);
}
}
catch (Exception ex)
{
- ResetSteps();
- action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氭壂鎻忎骇鍝佹潯鐮佸紓甯�");
+ ResetNode();
+ action.CatchExceptionWithLog(ex, $"閲囬泦宸ュ簭锛氬伐搴忚妭鐐瑰伐姝ユ彁浜ゆ暟鎹紓甯�");
}
return action;
}
@@ -369,6 +376,8 @@
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
//action.LocaleMsg = new($"宸ュ崟[{CurWipSN.WORK_ORDER}]鐨勬潯鐮乕{CurWipSN.SN}]鍦ㄥ矖浣峓{CurWipSN.POST_CODE}]宸ュ簭[{CurWipSN.NODE_NAME}]杩囩珯鎴愬姛锛岀姸鎬乕{CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>()}]", 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", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME,CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
+ //閲嶇疆宸ュ簭
+ ResetNode();
return action;
}
#endregion Functions
--
Gitblit v1.9.3