增加设备管理实体

Rodney Chen

2024-07-15 4efd39343a8f6268cb665c2ab920e44865038dc1

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -79,16 +79,16 @@
                           if (CurBatch.IsNullOrEmpty())
                           {
                               action.IsSuccessed = false;
                               action.LocaleMsg = new($"未选择工单，请先选择要生产的工单");
                               //action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException");
                               //action.LocaleMsg = new($"未选择工单，请先选择要生产的工单");
                               action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotSelectOrderException");
                               return action;
                           }
                           //有当前工单且不是投入，则提示条码未投入生产，请先去首站扫描
                           else
                           {
                               action.IsSuccessed = false;
                               action.LocaleMsg = new($"条码[{input.SN}]尚未投入生产，请先去首站扫描", input.SN);
                               //action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotInputException", input.SN);
                               //action.LocaleMsg = new($"条码[{input.SN}]尚未投入生产，请先去首站扫描", input.SN);
                               action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.NotInputException", input.SN);
                               return action;
                           }
                       }
@@ -115,8 +115,8 @@
                //没有可执行的工步
                ResetSteps();
                action.IsSuccessed = false;
                action.LocaleMsg = new($"岗位[{CurPosition.POST_CODE}]工步执行异常，请重新扫描产品条码", CurPosition.POST_CODE);
                //action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.WorkStepException", CurPosition.POST_CODE);
                //action.LocaleMsg = new($"岗位[{CurPosition.POST_CODE}]工步执行异常，请重新扫描产品条码", CurPosition.POST_CODE);
                action.LocaleMsg = new("MES.Transaction.PackingNode.Submit.WorkStepException", CurPosition.POST_CODE);
            }
            catch (Exception ex)
            {
@@ -208,7 +208,7 @@

                //初始化工步列表
                Steps.Clear();
                var curStep = new Biz.WorkStep(curNode.ID, Biz.WorkStep.Types.Node) {
                var curStep = new Biz.WorkStep(curNode.ID, IWorkStep.Types.Node) {
                    Sequence = Steps.Count + 1,
                    Node = curNode,
                    DBSubmitAction = () =>
@@ -225,7 +225,7 @@
                var acts = CurBatch.NodeActs.Where(q => q.NODE_ID == curNode.ID).ToList();
                foreach (var act in acts)
                {
                    Steps.Add(new Biz.WorkStep(act.ID, Biz.WorkStep.Types.Action)
                    Steps.Add(new Biz.WorkStep(act.ID, IWorkStep.Types.Action)
                    {
                        Sequence = Steps.Count + 1,
                        Node = curNode,
@@ -234,6 +234,8 @@
                    });
                }

                //完成当前工序节点
                curStep.IsFinished = true;
                //未完成所有工步
                if (!IsFinishAllSteps)
                {
@@ -279,8 +281,8 @@
                throw dbTran.ErrorException;
            }
            //保存成功，返回过站消息
            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.PackingNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
            //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.PackingNode.ScanSn.PassSuccess", CurWipSN.WORK_ORDER, CurWipSN.SN, CurWipSN.POST_CODE, CurWipSN.NODE_NAME, CurWipSN.STATUS.GetEnumDesc<MES_WIP_DATA.STATUSs>());
            return action;
        }
        #endregion Functions