一些更改

Ben Lin

2024-10-13 0299516d4ae48b5610de654c9ac6ba5137a3f1a9

一些更改

 Tiger.Business.MES/Transaction/CollectNode.cs

@@ -573,7 +573,7 @@
            Action endAction = null;

            //如果当前条码已经走到流程终点则记录条码完工
            if (action.Data.OperInfo.IsReachedEndNode)
            if (operInfo.IsReachedEndNode)
            {
                //更新工单条码明细信息
                var woSNs = CurBatch.WoSNs.Where(q => CurWipSNs.Any(w => q.WIP_ID == w.ID)).ToList();

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -625,7 +625,7 @@
            Action endAction = null;

            //如果当前条码已经走到流程终点则记录条码完工
            if (action.Data.OperInfo.IsReachedEndNode)
            if (operInfo.IsReachedEndNode)
            {
                //更新工单条码明细信息
                var woSNs = CurBatch.WoSNs.Where(q => CurWipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
@@ -669,7 +669,7 @@
            }

            //保存数据库
            SaveStepsCommitActionToDB();
            SaveStepsCommitActionToDB(endAction);

            //保存成功，返回过站消息
            CurOperInfo(locale).InputQty += CurWipSNs.Count;
@@ -679,6 +679,12 @@
            //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.PackingNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME, CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());

            //如果当前条码已经完工，检查当前工单批次和工单是否完工
            if (action.Data.OperInfo.IsReachedEndNode)
            {
                CurBatch.CheckIsComplete(UserCode);
            }

            //重置工序
            ResetNode();


 Tiger.Business.MES/Transaction/TestNode.cs

@@ -573,7 +573,7 @@
            Action endAction = null;

            //如果当前条码已经走到流程终点则记录条码完工
            if (action.Data.OperInfo.IsReachedEndNode)
            if (operInfo.IsReachedEndNode)
            {
                //更新工单条码明细信息
                var woSNs = CurBatch.WoSNs.Where(q => CurWipSNs.Any(w => q.WIP_ID == w.ID)).ToList();
@@ -617,7 +617,7 @@
            }

            //保存数据库
            SaveStepsCommitActionToDB();
            SaveStepsCommitActionToDB(endAction);

            //保存成功，返回过站消息
            CurOperInfo(locale).InputQty += CurWipSNs.Count;
@@ -625,7 +625,13 @@
            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.TestNode.ScanSn.PassSuccess", CurWipSNs.First().WORK_ORDER, CurSN, CurWipSNs.First().POST_CODE, CurWipSNs.First().NODE_NAME, CurWipSNs.First().STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
            

            //如果当前条码已经完工，检查当前工单批次和工单是否完工
            if (action.Data.OperInfo.IsReachedEndNode)
            {
                CurBatch.CheckIsComplete(UserCode);
            }

            //重置工序
            ResetNode();
            return action;

 Tiger.Business.MES/WorkAction/PackingAction.cs

@@ -922,6 +922,11 @@
                        }
                    }
                });
                //如果当前条码已经完工，检查当前工单批次和工单是否完工
                //if (action.Data.OperInfo.IsReachedEndNode)
                {
                    CurPosition.WorkBatch.CheckIsComplete(CurPosition.UserCode);
                }
            }

            if (CurPkg.IsFinished)