From 8bfaf7141c88f41d3dbd1995cfb9cb015ca0d1d6 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期五, 02 八月 2024 16:34:13 +0800
Subject: [PATCH] 整理了工序传入传出参数
---
Tiger.Business.MES/Transaction/CollectNode.cs | 46 ++++++++++++++++++----------------------------
1 files changed, 18 insertions(+), 28 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/CollectNode.cs b/Tiger.Business.MES/Transaction/CollectNode.cs
index 2bea459..b374b1b 100644
--- a/Tiger.Business.MES/Transaction/CollectNode.cs
+++ b/Tiger.Business.MES/Transaction/CollectNode.cs
@@ -10,6 +10,7 @@
using System.Threading.Tasks;
using Tiger.Model;
using Tiger.Model.Entitys.MES.Position;
+using static System.Net.Mime.MediaTypeNames;
namespace Tiger.Business.MES.Transaction
{
@@ -37,7 +38,7 @@
/// <returns></returns>
public async Task<ApiAction<SubmitOutput>> Submit(SubmitInput input)
{
- var action = new ApiAction<SubmitOutput>();
+ var action = new ApiAction<SubmitOutput>(new SubmitOutput());
try
{
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
@@ -52,9 +53,10 @@
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
else
{
- var wosn = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((b, s) => new JoinQueryInfos(JoinType.Inner, b.ORDER_NO == s.WORK_ORDER)).ByAuth(input.AuthOption)
- .Where((b, s) => s.SN == input.SN && b.ACT_LINE == CurLine.LINE_CODE && (b.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || b.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()))
- .Select((b, s) => new { Batch = b, SN = s }).First();
+ 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();
//鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗�
if (!wosn.IsNullOrEmpty())
{
@@ -122,12 +124,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);
}
}
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
@@ -139,14 +136,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;
}
@@ -169,7 +166,7 @@
return woStatus;
}
//闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
- var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
+ var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().First(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO) ?? new MES_WIP_DATA()
{
SN = input.SN,
STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
@@ -259,7 +256,6 @@
Steps.Clear();
var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
{
- NodeID = curNode.ID,
Sequence = Steps.Count + 1,
Node = curNode,
DBSubmitAction = () =>
@@ -272,7 +268,7 @@
};
Steps.Add(curStep);
- //鏈夐渶瑕佸垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
+ //鏈夐渶瑕佺敤鎴锋彁浜や俊鎭垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
//鏈�鍚庢坊鍔犲綋鍓嶅伐搴忕殑琛屼负宸ユ
GenerateSteps(curStep);
@@ -293,7 +289,7 @@
//鏈畬鎴愭墍鏈夊伐姝�
if (!IsFinishAllSteps)
{
- var result = new ApiAction<SubmitOutput>();
+ var result = new ApiAction<SubmitOutput>(new SubmitOutput());
//鏈畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝�
if (!IsFinishNodeSteps)
{
@@ -302,11 +298,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)
@@ -329,18 +321,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;
}
@@ -368,6 +356,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