From 0859eca81c7d64fbc91c49928f78b50d6271760d Mon Sep 17 00:00:00 2001 From: Rodney Chen <rodney.chen@hotmail.com> Date: 星期五, 11 十月 2024 00:48:31 +0800 Subject: [PATCH] 优化了一些已知问题 --- Tiger.Business.MES/Transaction/TestNode.cs | 230 ++++++++++++++++++++++++++++++++------------------------- 1 files changed, 129 insertions(+), 101 deletions(-) diff --git a/Tiger.Business.MES/Transaction/TestNode.cs b/Tiger.Business.MES/Transaction/TestNode.cs index 11b5364..e276ea0 100644 --- a/Tiger.Business.MES/Transaction/TestNode.cs +++ b/Tiger.Business.MES/Transaction/TestNode.cs @@ -55,19 +55,20 @@ 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)); } } //褰撳墠宀椾綅鍦ㄥ綋鍓嶅伐鍗曚笉鏄绔欙紝鍒欐煡鎵炬潯鐮佸凡缁戝畾鐨勫伐鍗曞綋浣滃綋鍓嶅伐鍗� else { - var wosns = 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 || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList(); + var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO)) + .ByAuth(input.AuthOption).Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue()) + .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList(); //鏌ユ壘鍒版潯鐮佸凡缁戝畾鐨勫伐鍗� if (!wosns.IsNullOrEmpty()) @@ -85,7 +86,7 @@ if (CurBatch?.Batch?.ORDER_NO != wosns.First().Batch.ORDER_NO) { //鏉$爜宸茬粦瀹氱殑宸ュ崟涓嶇瓑浜庡綋鍓嶅伐鍗曞垯閲嶆柊閫夋嫨宸ュ崟 - var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO }); + var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosns.First().Batch.ORDER_NO }, wosns.First().Batch.BATCH_NO); if (!result.IsSuccessed) { action.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error); @@ -102,12 +103,12 @@ 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) + else if (Steps.Any() && !IsFinishAllSteps) { - action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], input.Locale); + action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(input.Locale)); } } } @@ -142,18 +143,18 @@ 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 @@ -161,30 +162,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); @@ -194,7 +194,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.TestNode.SubmitException")); } @@ -210,77 +210,90 @@ public ApiAction<SubmitOutput> NodeSubmit(ApiAction<SubmitOutput> action, SubmitInput input) { var curNode = CurBatch.GetNode(PostCode); + try { - //鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂槸鍚﹀彲浠ョ敓浜� - var woStatus = CurBatch.CheckCanProduce(curNode); - if (!woStatus.IsSuccessed) + //宸ュ簭鑺傜偣閫昏緫澧炲姞濡傛灉鏍瑰熀褰撳墠宀椾綅鎵句笉鍒板搴斿伐搴忕殑鏃跺�欒鎶ラ敊 + if (curNode.IsNullOrEmpty()) { - woStatus.Data.ShortMsg = new("宸ュ崟寮傚父", ShortMessage.Types.Error); - return woStatus; + action.Data.ShortMsg = new("鏈煡宸ュ簭", ShortMessage.Types.Error); + action.IsSuccessed = false; + //action.LocaleMsg = new($"宀椾綅[{0}]鍦ㄥ伐鍗昜{1}]宸ヨ壓璺嚎涓壘涓嶅埌瀵瑰簲鐨勫伐搴忥紝璇锋鏌ュ伐鍗曞伐鑹鸿矾绾夸腑宸ュ簭涓庡矖浣嶇殑缁戝畾鍏崇郴鏄惁姝g‘"); + action.LocaleMsg = new("MES.Transaction.TestNode.NodeSubmit.OperateNodeError", PostCode, CurBatch.WO.ORDER_NO); + return action; } - - 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() - { - SN = input.SN, - 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, - FTY_CODE = CurFactory.FTY_CODE, - WS_CODE = CurWorkshop.WS_CODE, - LINE_CODE = CurLine.LINE_CODE, - POST_CODE = CurPosition.POST_CODE, - 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, - }; - 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.TestNode.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.TestNode.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; - } + var curNodeSetting = CurBatch.GetNodeSetting(curNode); //褰撳伐姝ュ垪琛ㄤ负绌猴紝鍒欐墽琛屽綋鍓嶅伐搴忕殑蹇呰閫昏緫褰撲綔绗竴涓伐搴忚妭鐐癸紝瀹屾垚鍚庢寜闇�姹傚垱寤哄悗缁殑宸ユ鍒楄〃 if (Steps.IsNullOrEmpty()) { + BeginAt = DateTime.Now; + //鍒ゆ柇宸ュ崟瀹炴椂鐘舵�佸垽鏂槸鍚﹀彲浠ョ敓浜� + var woStatus = CurBatch.CheckCanProduce(curNode, curNodeSetting); + 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.FLOW_SN == input.SN || q.TRAY_SN == input.SN).ToList(); + if (wipSNs.IsNullOrEmpty()) + { + var wipSN = new MES_WIP_DATA() + { + SN = input.SN, + 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, + FTY_CODE = CurFactory.FTY_CODE, + WS_CODE = CurWorkshop.WS_CODE, + LINE_CODE = CurLine.LINE_CODE, + POST_CODE = CurPosition.POST_CODE, + 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, + }; + 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.TestNode.NodeSubmit.WoError", input.SN, 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.TestNode.NodeSubmit.LineError", input.SN, 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; + } + //缁戝畾鏉$爜鍒板伐鍗� foreach (var wipSN in wipSNs) { - if (!CurBatch.WoSNs.Any(q => q.SN == wipSN.SN)) + if (!CurBatch.WoSNs.Any(q => q.WIP_ID == wipSN.ID)) { CurBatch.WoSNs.Add(new() { @@ -295,7 +308,7 @@ } //鏇存柊宸ュ崟鏉$爜鏄庣粏淇℃伅 - var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.SN == w.SN)).ToList(); + var woSNs = CurBatch.WoSNs.Where(q => wipSNs.Any(w => q.WIP_ID == w.ID)).ToList(); foreach (var woSN in woSNs) { woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG; @@ -327,17 +340,17 @@ wipSN.PRD_CODE = curShiftPeriod.Period.PRD_CODE; } //濡傛灉鏄姇鍏ョ珯 - if (curNode.IS_INPUT == "Y") + if (curNodeSetting.IS_INPUT == "Y") { - var woSN = woSNs.First(q => q.SN == wipSN.SN); + var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID); woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Inputed.GetValue(); wipSN.STATUS = MES_WIP_DATA.STATUSs.Input.GetValue(); wipSN.INLINE_DATE = DateTime.Now; } //濡傛灉鏄骇鍑虹珯 - if (curNode.IS_OUTPUT == "Y") + if (curNodeSetting.IS_OUTPUT == "Y") { - var woSN = woSNs.First(q => q.SN == wipSN.SN); + var woSN = woSNs.First(q => q.WIP_ID == wipSN.ID); woSN.STATUS = BIZ_MES_WO_SN.STATUSs.Finished.GetValue(); wipSN.STATUS = MES_WIP_DATA.STATUSs.Finished.GetValue(); wipSN.OUTLINE_DATE = DateTime.Now; @@ -407,12 +420,12 @@ var _wipSns = wipSNs.Clone(); var _wipHiss = CurWipSNHiss.Clone(); var _defect = CurDefects.Clone(); - var _curNode = curNode.Clone(); + var _curNodeSetting = curNodeSetting.Clone(); var _Batch = CurBatch.Batch.Clone(); //鍒濆鍖栧伐姝ュ垪琛� Steps.Clear(); - var curStep = new Biz.WorkStep(IWorkStep.NodeTypes.Node, this) + var curStep = new WorkStep(IWorkStep.NodeTypes.Node, this) { Name = "鎵弿浜у搧", Sequence = Steps.Count + 1, @@ -432,13 +445,13 @@ db.Storageable(_defect, UserCode).ExecuteCommand(); } //濡傛灉鏄姇鍏ョ珯 - if (_curNode.IS_INPUT == "Y") + if (_curNodeSetting.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 (_curNodeSetting.IS_OUTPUT == "Y") { 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(); @@ -462,6 +475,7 @@ } //瀹屾垚绗竴涓伐搴忚妭鐐瑰伐姝� + curStep.IsFinished = true; curStep.Status = StepStatus.Finished; CurStep = curStep; } @@ -469,9 +483,23 @@ { var curStep = Steps.Where(q => q.NodeType == IWorkStep.NodeTypes.Node && !q.IsFinished).OrderBy(q => q.Sequence).First(); - //瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ - curStep.Status = StepStatus.Finished; - CurStep = curStep; + //鏍规嵁宸ュ簭鑺傜偣宸ユ鐨勫簭鍙峰鐞嗙浉搴斿伐姝ョ殑澶勭悊閫昏緫 + switch (curStep.Sequence) + { + case 2: + { + //绗簩宸ユ鐨勫鐞嗛�昏緫 + + + //瀹屾垚褰撳墠宸ュ簭鑺傜偣宸ユ + curStep.IsFinished = true; + curStep.Status = StepStatus.Finished; + CurStep = curStep; + } + break; + default: + break; + } } //鏈畬鎴愭墍鏈夊伐姝� @@ -532,9 +560,9 @@ SaveStepsCommitActionToDB(); //淇濆瓨鎴愬姛锛岃繑鍥炶繃绔欐秷鎭� - OperInfoDic[CurBatch.Batch.BATCH_NO].InputQty += CurWipSNs.Count; - action.Data.OperInfo = SetOperNodeInfo(OperInfoDic[CurBatch.Batch.BATCH_NO], locale); - action.Data.ShortMsg = new("杩囩珯鎴愬姛", ShortMessage.Types.Success); + CurOperInfo(locale).InputQty += CurWipSNs.Count; + action.Data.OperInfo = SetOperNodeInfo(CurOperInfo(locale)); + action.Data.ShortMsg = new(CurWipSNs.Any(q => q.DFT_FLAG == "Y") ? "涓嶈壇杩囩珯" : "鑹搧杩囩珯", 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>()); -- Gitblit v1.9.3