From 69a1f63305d303745b831d55168cd2c8990f6fa9 Mon Sep 17 00:00:00 2001
From: Rodney Chen <rodney.chen@hotmail.com>
Date: 星期六, 21 九月 2024 09:56:17 +0800
Subject: [PATCH] 修复包装行为，手动结束包装不称重和创建package对象异常
---
Tiger.Business.MES/Transaction/PackingNode.cs | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/Tiger.Business.MES/Transaction/PackingNode.cs b/Tiger.Business.MES/Transaction/PackingNode.cs
index 96f3392..53f846b 100644
--- a/Tiger.Business.MES/Transaction/PackingNode.cs
+++ b/Tiger.Business.MES/Transaction/PackingNode.cs
@@ -55,7 +55,7 @@
//濡傛灉琛屼负琚爣璁版垚宸插畬鎴愶紝鍒欓噸缃伐搴�
if (TempPkgAction.IsFinished)
{
- action.Data.OperInfo = OperInfoDic.ContainsKey(CurBatch?.Batch?.BATCH_NO ?? "") ? OperInfoDic[CurBatch.Batch.BATCH_NO] : new();
+ action.Data.OperInfo = CurOperInfo(input.Locale);
ResetNode();
}
}
@@ -63,25 +63,26 @@
else
{
NodeCmd = "NodeSubmit";
- //鏇存柊CurBatch
- CurBatch = WoContext.GetBatch(CurBatch?.OrderNo, CurLine.LINE_CODE);
//宸ユ鍒楄〃涓虹┖鎴栬�呭伐搴忚妭鐐瑰伐姝ユ湁鏈畬鎴愭椂锛屼紭鍏堝畬鎴愬伐搴忚妭鐐瑰伐姝�
if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)
{
//鍏堝垽鏂綋鍓嶅伐鍗曚笉涓虹┖涓斿綋鍓嶅矖浣嶅湪褰撳墠宸ュ崟鏄笉鏄绔欙紝濡傛灉鏄垯涓嶅厑璁稿彉鏇村綋鍓嶅伐鍗曪紝灏濊瘯鎶婃潯鐮佺粦瀹氬埌褰撳墠宸ュ崟
if (!CurBatch.IsNullOrEmpty() && CurBatch.IsFirstNode(PostCode))
{
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+ //鎻愪氦鏁版嵁
action = NodeSubmit(action, input);
//鏇存柊宸ュ簭淇℃伅
if (!action.IsSuccessed)
{
var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
else if (!IsFinishAllSteps)
{
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
}
//褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗�
@@ -134,17 +135,19 @@
return action;
}
}
- //鏉＄爜杩囩珯
- action = NodeSubmit(action, input);
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+ //鏉＄爜杩囩珯
+ action = NodeSubmit(action, input);
if (!action.IsSuccessed && !CurWipSNs.Any())
{
var info = WoContext.GetSnOperInfo(input.SN).Data;
- info.InputQty = OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty;
+ info.InputQty = CurOperInfo(input.Locale).InputQty;
action.Data.OperInfo = info;
}
else if (!IsFinishAllSteps)
{
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale);
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale));
}
}
}
@@ -175,19 +178,22 @@
//瀹屾垚宸ュ簭鑺傜偣宸ユ鍚庯紝鍚庡紑濮嬫墽琛屽綋鍓嶅伐搴忕殑琛屼负宸ユ
else if (IsFinishNodeSteps && !IsFinishAllSteps)
{
+ //鏇存柊CurBatch
+ CurBatch?.Update();
+
var submitStep = Steps.Where(q => q.ID == input.CurStepID && !q.IsFinished).FirstOrDefault();
+ //濡傛灉瀹㈡埛绔繑鍥炵殑褰撳墠宸ユID鎵句笉鍒版湭瀹屾垚鐨勮涓哄伐姝ワ紝鍒欑洿鎺ュ紑濮嬩笅涓�涓涓哄伐姝�
if (submitStep.IsNullOrEmpty())
{
action = BeginNextActionStep(input);
- action.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
}
else
{
- var result = submitStep.Submit(input);
+ action = submitStep.Submit(input);
//濡傛灉褰撳墠宸ユ宸插畬鎴愶紝寮�濮嬫墽琛屼笅涓�宸ユ
- if (result.IsSuccessed && submitStep.IsFinished)
+ if (action.IsSuccessed && submitStep.IsFinished)
{
- result = BeginNextActionStep(input);
+ action = BeginNextActionStep(input);
}
//濡傛灉褰撳墠宸ユ鏈畬鎴�
else
@@ -195,30 +201,29 @@
//琛屼负鎵ц鍑洪敊锛屽伐姝ヨ閲嶇疆
if (Steps.IsNullOrEmpty())
{
- result.LocaleMsg = new(Biz.T(result.LocaleMsg, input.Locale) + Biz.T(Biz.L("MES.Transaction.Position.RescanSN"), input.Locale));
+ action.LocaleMsg = new(Biz.T(action.LocaleMsg, input.Locale) + Biz.T(Biz.L("MES.Transaction.Position.RescanSN"), input.Locale));
}
else
{
- result.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
+ action.Data.SetValue(CurBatch, CurStep, CurStep?.ID, IsFinishAllSteps);
}
}
- //濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
- if (IsFinishAllSteps)
- {
- result = DoIfFinishAllSteps(result, input.Locale);
- }
- else
- {
- result.Data.OperInfo = OperInfoDic[CurBatch.Batch.BATCH_NO];
- }
- return result;
+ }
+ //濡傛灉鎵�鏈夊伐姝ラ兘瀹屾垚
+ if (IsFinishAllSteps)
+ {
+ action = DoIfFinishAllSteps(action, input.Locale);
+ }
+ else
+ {
+ action.Data.OperInfo = CurOperInfo(input.Locale);
}
}
//娌℃湁鍙墽琛岀殑宸ユ
else
{
action.Data.ShortMsg = new("閲嶇疆鎵弿", ShortMessage.Types.Error);
- action.Data.OperInfo = OperInfoDic.ContainsKey(CurBatch?.Batch?.BATCH_NO ?? "") ? OperInfoDic[CurBatch.Batch.BATCH_NO] : new();
+ action.Data.OperInfo = CurOperInfo(input.Locale);
ResetNode();
action.IsSuccessed = false;
//action.LocaleMsg = new($"宀椾綅[{CurPosition.POST_CODE}]宸ユ鎵ц寮傚父锛岃閲嶆柊鎵弿浜у搧鏉＄爜", CurPosition.POST_CODE);
@@ -229,7 +234,7 @@
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.Data.OperInfo = CurOperInfo(input.Locale);
//action.CatchExceptionWithLog(ex, $"鍖呰宸ュ簭锛氭彁浜ゆ搷浣滄暟鎹紓甯�");
action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.PackingNode.SubmitException"));
}
@@ -254,8 +259,8 @@
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();
+
+ var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).ToList();
if (wipSNs.IsNullOrEmpty())
{
var wipSN = new MES_WIP_DATA()
@@ -288,7 +293,7 @@
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);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.WoError", input.SN, wipSNs.First().WORK_ORDER);
return action;
}
else
@@ -296,7 +301,7 @@
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);
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NodeSubmit.LineError", input.SN, wipSNs.First().LINE_CODE);
return action;
}
}
@@ -497,6 +502,7 @@
}
//瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝�
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -505,6 +511,7 @@
var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First();
//瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ
+ curStep.IsFinished = true;
curStep.Status = StepStatus.Finished;
CurStep = curStep;
}
@@ -567,8 +574,8 @@
SaveStepsCommitActionToDB();
//淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭�
- OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty += CurWipSNs.Count;
- action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], locale);
+ CurOperInfo(locale).InputQty += CurWipSNs.Count;
+ action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale));
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>());
@@ -583,7 +590,7 @@
/// 鍖呰宸ュ簭锛氭墜鍔ㄧ粨鏉熷寘瑁�
/// </summary>
/// <returns></returns>
- public async Task<ApiAction<SubmitOutput>> CompletePkg()
+ public async Task<ApiAction<SubmitOutput>> CompletePkg(ApiAction input)
{
var action = new ApiAction<SubmitOutput>(new SubmitOutput());
try
@@ -593,10 +600,24 @@
{
if (Context.ContainsKey("CurPackage"))
{
+ var CurPkg = Context["CurPackage"] as WipPkg;
+ int shipQty = input.Data.ToInt32();
+
NodeCmd = "PkgSubmit";
TempPkgAction = new PackingAction();
TempPkgAction.Init(this);
+
+ int curQty = CurPkg.Item.TotalQty;
+ int ruleQty = TempPkgAction.PkgRule.GetTotalQty();
+ //鏈夊～鍑鸿揣鏁伴噺鍒欓獙璇佸綋鍓嶅寘瑁呮暟閲忓繀椤荤瓑浜庯紙鍑鸿揣鏁伴噺/鍖呰瑙勫垯鏁伴噺锛夌殑浣欐暟
+ if (shipQty > 0 && curQty != shipQty % ruleQty)
+ {
+ action.IsSuccessed = false;
+ //action.LocaleMsg = new($"鍑鸿揣鏁伴噺璁惧畾涓篬{0}]锛岀洰鍓嶅寘瑁呬簡[{1}]锛屽寘瑁呭熬鏁扮殑鏁伴噺蹇呴渶鏄痆{2}]锛岃瑁呭鏁伴噺鍚庡啀缁撴潫鍖呰");
+ action.LocaleMsg = new("MES.Transaction.PackingNode.NotMatchShipQty", shipQty, curQty, shipQty % ruleQty);
+ return action;
+ }
action = TempPkgAction.Submit(null);
}
else
--
Gitblit v1.9.3