优化SubmitOutput字段

Rodney Chen

2024-08-02 d34d9c35ba844da8b805993bd4c69b0253694fc0

 Tiger.Business.MES/Transaction/TestNode.cs

@@ -53,26 +53,35 @@
                    else
                    {
                        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();
                                                        .ByAuth(input.AuthOption).Where((q, s) => s.SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).First();

                        //查找到条码已绑定的工单
                        if (!wosn.IsNullOrEmpty())
                        {
                            if (CurBatch?.Batch?.ORDER_NO != wosn.Batch.ORDER_NO)
                            if (wosn.Batch.ACT_LINE != CurLine.LINE_CODE)
                            {
                                //条码已绑定的工单不等于当前工单则重新选择工单
                                var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosn.Batch.ORDER_NO });
                                if (!result.IsSuccessed)
                                {
                                    action.IsSuccessed = result.IsSuccessed;
                                    action.LocaleMsg = result.LocaleMsg;
                                    return action;
                                }
                                action.IsSuccessed = false;
                                //action.LocaleMsg = new($"条码[{0}]已在产线[{1}]投入生产，请在正确岗位扫描");
                                action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotCorrectLine", input.SN, wosn.Batch.ACT_LINE);
                                return action;
                            }
                            //条码过站
                            action = NodeSubmit(action, input);
                            return action;
                            else
                            {
                                if (CurBatch?.Batch?.ORDER_NO != wosn.Batch.ORDER_NO)
                                {
                                    //条码已绑定的工单不等于当前工单则重新选择工单
                                    var result = await SelectOrder(new() { AuthOption = input.AuthOption, OrderNo = wosn.Batch.ORDER_NO });
                                    if (!result.IsSuccessed)
                                    {
                                        action.IsSuccessed = result.IsSuccessed;
                                        action.LocaleMsg = result.LocaleMsg;
                                        return action;
                                    }
                                }
                                //条码过站
                                action = NodeSubmit(action, input);
                                return action;
                            }
                        }
                        //查找不到条码已绑定的工单
                        else
@@ -124,12 +133,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);
                            }
                        }
                        //如果所有工步都完成
@@ -141,14 +145,14 @@
                    }
                }
                //没有可执行的工步
                ResetSteps();
                ResetNode();
                action.IsSuccessed = false;
                //action.LocaleMsg = new($"岗位[{CurPosition.POST_CODE}]工步执行异常，请重新扫描产品条码", CurPosition.POST_CODE);
                action.LocaleMsg = new("MES.Transaction.TestNode.Submit.WorkStepException", CurPosition.POST_CODE);
            }
            catch (Exception ex)
            {
                action.CatchExceptionWithLog(ex, $"测试工序：扫描产品条码异常");
                action.CatchExceptionWithLog(ex, $"测试工序：提交操作数据异常");
            }
            return action;
        }
@@ -164,14 +168,14 @@
            try
            {
                var curNode = CurBatch.GetNode(PostCode);
                //判断工单实时状态判断
                var woStatus = CurBatch.CheckStatus();
                //判断工单实时状态判断是否可以生产
                var woStatus = CurBatch.CheckCanProduce(curNode);
                if (!woStatus.IsSuccessed)
                {
                    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(),
@@ -261,7 +265,6 @@
                    Steps.Clear();
                    var curStep = new Biz.WorkStep(IWorkStep.Types.Node, this)
                    {
                        NodeID = curNode.ID,
                        Sequence = Steps.Count + 1,
                        Node = curNode,
                        DBSubmitAction = () =>
@@ -270,11 +273,23 @@
                            db.Storageable(woSN, UserCode).ExecuteCommand();
                            db.Storageable(wipSN, UserCode).ExecuteCommand();
                            db.Storageable(CurWipSNHis, UserCode).ExecuteCommand();
                            //如果是投入站
                            if (curNode.IS_INPUT == "Y")
                            {
                                db.Updateable<BIZ_MES_WO>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
                                db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.INPUT_QTY == q.INPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
                            }
                            //如果是产出站
                            if (curNode.IS_OUTPUT == "Y")
                            {
                                db.Updateable<BIZ_MES_WO>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.ORDER_NO == CurBatch.WO.ORDER_NO).ExecuteCommand();
                                db.Updateable<BIZ_MES_WO_BATCH>().SetColumns(q => q.OUTPUT_QTY == q.OUTPUT_QTY + 1).Where(q => q.BATCH_NO == CurBatch.Batch.BATCH_NO).ExecuteCommand();
                            }
                        }
                    };
                    Steps.Add(curStep);

                    //有需要则添加工序节点的其他工步
                    //有需要用户提交信息则添加工序节点的其他工步

                    //最后添加当前工序的行为工步
                    GenerateSteps(curStep);
@@ -304,11 +319,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)
@@ -331,18 +342,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;
        }
@@ -370,6 +377,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.TestNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
            //重置工序
            ResetNode();
            return action;
        }