From 0c2a5ba3e7e2334f1cd69a66cc60cc0be0e4129c Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期二, 30 七月 2024 22:34:39 +0800
Subject: [PATCH] 包装工序功能以及一些一直问题的优化
---
Tiger.Business.MES/Transaction/PackingNode.cs | 97 +++++++++++++++++++++++++++++-------------------
1 files changed, 59 insertions(+), 38 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 5be4048..7d64f06 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -37,7 +37,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 +52,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())
{
@@ -125,9 +126,9 @@
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.CurNode = CurStep?.NodeAct.ACT_NAME;
+ result.Data.StepActCode = CurStep?.NodeAct.ACT_CODE;
+ result.Data.NextStepID = CurStep?.ID;
}
}
//濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
@@ -161,39 +162,55 @@
{
try
{
+ var curNode = CurBatch.GetNode(PostCode);
+ //鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂�
+ var woStatus = CurBatch.CheckStatus();
+ if (!woStatus.IsSuccessed)
+ {
+ return woStatus;
+ }
+ //闈炴硶杩囩珯闃插憜锛氳繘鍏ュ伐搴忔椂瑕佸鍔犲垽鏂潯鐮佹槸鍚︽寜娴佺▼杩囩珯
+ 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(),
+ ITEM_CODE = CurBatch.WO.ITEM_CODE,
+ WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ BATCH_NO = CurBatch.Batch.BATCH_NO,
+ HOLD_FLAG = "N",
+ REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
+ FINISHED_FLAG = "N",
+ INV_FLAG = "N",
+ DFT_FLAG = "N",
+ DFT_COUNT = 0,
+ };
+ var canGotoNext = CurBatch.CanGotoNext(input, wipSN, curNode);
+ if (!canGotoNext.IsSuccessed)
+ {
+ return canGotoNext;
+ }
+
//褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃
if (Steps.IsNullOrEmpty())
{
- //缁戝畾鏉＄爜鍒板伐鍗�
- if (!CurBatch.WoSNs.Any(q => q.SN == input.SN))
+ //缁戝畾鏉＄爜鍒板伐鍗�
+ if (!CurBatch.WoSNs.Any(q => q.SN == input.SN))
{
CurBatch.WoSNs.Add(new()
{
- WORK_ORDER = CurBatch.Batch.ORDER_NO,
+ WORK_ORDER = CurBatch.Batch.ORDER_NO,
SN = input.SN,
STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
- BATCH_NO = CurBatch.Batch.BATCH_NO,
});
}
- var woSN = CurBatch.WoSNs.FirstOrDefault(q => q.SN == input.SN);
- var curNode = CurBatch.GetNode(PostCode);
-
+ var woSN = CurBatch.WoSNs.First(q => q.SN == input.SN);
+ woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
+ woSN.AUTH_PROD = CurLine.LINE_CODE;
+ woSN.BATCH_NO = CurBatch.Batch.BATCH_NO;
+
//鏉＄爜杩囩珯
- var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().First(q => q.SN == input.SN && q.BATCH_NO == CurBatch.Batch.BATCH_NO) ?? new MES_WIP_DATA()
- {
- 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,
- HOLD_FLAG = "N",
- REWORK_FLAG = CurBatch.WO.ORDER_TYPE == BIZ_MES_WO.ORDER_TYPEs.Rework.GetValue() ? "Y" : "N",
- FINISHED_FLAG = "N",
- INV_FLAG = "N",
- DFT_FLAG = "N",
- DFT_COUNT = 0,
- };
- wipSN.AUTH_PROD = CurLine.LINE_CODE;
+ wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
+ wipSN.AUTH_PROD = CurLine.LINE_CODE;
wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;
wipSN.ROT_CODE = CurBatch.WO.ROUTE_CODE;
wipSN.NODE_ID = curNode.ID;
@@ -205,9 +222,13 @@
wipSN.OPER_CODE = curNode.OPER_CODE;
wipSN.SEGMENT = curNode.SEGMENT;
wipSN.OPERATION_TIME = DateTime.Now;
- wipSN.SFTS_CODE = CurLine.SFTS_CODE;
- //wipSN.SFT_CODE = CurBatch.WO.ROUTE_CODE;
- //wipSN.PRD_CODE = CurBatch.WO.ROUTE_CODE;
+ var curShiftPeriod = GetShiftPeriodForNow();
+ if (!curShiftPeriod.IsNullOrEmpty())
+ {
+ wipSN.SFTS_CODE = curShiftPeriod.ShiftSys.SFTS_CODE;
+ wipSN.SFT_CODE = curShiftPeriod.Shift.SFT_CODE;
+ wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE;
+ }
CurBatch.StartWorking(UserCode);
//濡傛灉鏄姇鍏ョ珯
@@ -252,7 +273,7 @@
};
Steps.Add(curStep);
- //鏈夐渶瑕佸垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
+ //鏈夐渶瑕佺敤鎴锋彁浜や俊鎭垯娣诲姞宸ュ簭鑺傜偣鐨勫叾浠栧伐姝�
//鏈�鍚庢坊鍔犲綋鍓嶅伐搴忕殑琛屼负宸ユ
GenerateSteps(curStep);
@@ -273,7 +294,7 @@
//鏈畬鎴愭墍鏈夊伐姝�
if (!IsFinishAllSteps)
{
- var result = new ApiAction<SubmitOutput>();
+ var result = new ApiAction<SubmitOutput>(new SubmitOutput());
//鏈畬鎴愭墍鏈夊伐搴忚妭鐐瑰伐姝�
if (!IsFinishNodeSteps)
{
@@ -285,15 +306,15 @@
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.CurNode = CurStep?.Node.NODE_NAME;
result.Data.NextStepID = next.ID;
-
+
//鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙疯繑鍥炵浉搴旂殑鎿嶄綔鎻愮ず
switch (next.Sequence)
{
case 2:
//action.LocaleMsg = new($"璇锋墽琛岀浜屾");
- result.LocaleMsg = new("MES.Transaction.PackingNode.绗簩姝ユ搷浣滄彁绀�");
+ result.LocaleMsg = new("MES.Transaction.CollectNode.绗簩姝ユ搷浣滄彁绀�");
break;
default:
break;
@@ -312,7 +333,7 @@
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.CurNode = CurStep?.Node.NODE_NAME;
action.Data.NextStepID = "";
action = DoIfFinishAllSteps(action);
}
--
Gitblit v1.9.3