进入工序时要增加判断过站是否按流程设置，增加非法过站防呆 增加生产不良记录用于记录发现的不良的管理 工序节点跟节点设置增加是否允许不良品进站的字段

Rodney Chen

2024-07-25 f4f475fd3c0e066ad82cdc61707f0e8e19583a02

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -161,28 +161,15 @@
        {
            try
            {
                //当工步列表为空，则执行当前工序的必要逻辑当作第一个工序节点，完成后按需求创建后续的工步列表
                if (Steps.IsNullOrEmpty())
                {
                    var curNode = CurBatch.GetNode(PostCode);

                    //绑定条码到工单
                    if (!CurBatch.WoSNs.Any(q => q.SN == input.SN))
                //判断工单实时状态判断
                var woStatus = CurBatch.CheckStatus();
                if (!woStatus.IsSuccessed)
                   {
                       CurBatch.WoSNs.Add(new()
                       {
                            WORK_ORDER = CurBatch.Batch.ORDER_NO,
                           SN = input.SN,
                           STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
                       });
                    return woStatus;
                   }
                   var woSN = CurBatch.WoSNs.FirstOrDefault(q => q.SN == input.SN);
                    woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
                    woSN.AUTH_PROD = CurLine.LINE_CODE;
                    woSN.BATCH_NO = CurBatch.Batch.BATCH_NO;
                    
                   //条码过站
                   var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().First(q => q.SN == input.SN && q.BATCH_NO == CurBatch.Batch.BATCH_NO) ?? new MES_WIP_DATA()
                //非法过站防呆：进入工序时要增加判断条码是否按流程过站
                var wipSN = Biz.Db.Queryable<MES_WIP_DATA>().Where(q => q.SN == input.SN && q.WORK_ORDER == CurBatch.WO.ORDER_NO).IncludesAllFirstLayer().First() ?? new MES_WIP_DATA()
                   {
                       SN = input.SN,
                       STATUS = MES_WIP_DATA.STATUSs.Init.GetValue(),
@@ -196,6 +183,40 @@
                       DFT_FLAG = "N",
                       DFT_COUNT = 0,
                   };
                var canGotoNext = CurBatch.CanGotoNext(input, wipSN, curNode);
                if (!canGotoNext.IsSuccessed)
                {
                    return canGotoNext;
                }
                //if (nextNodes.Any(q => q.ID == curNode.ID))
                //{
                //    action.IsSuccessed = false;
                //    action.Data.CurWO = CurBatch.WO.ORDER_NO;
                //    action.Data.CurBatch = CurBatch.Batch.BATCH_NO;
                //    action.LocaleMsg = new($"条码[{wipSN.SN}]过站扫描错误，请先通过以下工序：{string.Join(", ", nextNodes.Select(q => q.NODE_NAME))}");
                //    action.LocaleMsg = new("MES.Transaction.PackingNode.NotNextNodeException", wipSN.SN, string.Join(", ", nextNodes.Select(q => q.NODE_NAME)));
                //    return action;
                //}

                //当工步列表为空，则执行当前工序的必要逻辑当作第一个工序节点，完成后按需求创建后续的工步列表
                if (Steps.IsNullOrEmpty())
                {
                    //绑定条码到工单
                    if (!CurBatch.WoSNs.Any(q => q.SN == input.SN))
                   {
                       CurBatch.WoSNs.Add(new()
                       {
                            WORK_ORDER = CurBatch.Batch.ORDER_NO,
                           SN = input.SN,
                           STATUS = BIZ_MES_WO_SN.STATUSs.NotInput.GetValue(),
                       });
                   }
                   var woSN = CurBatch.WoSNs.First(q => q.SN == input.SN);
                    woSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
                    woSN.AUTH_PROD = CurLine.LINE_CODE;
                    woSN.BATCH_NO = CurBatch.Batch.BATCH_NO;
                    
                   //条码过站
                    wipSN.AUTH_ORG = CurBatch.WO.AUTH_ORG;
                    wipSN.AUTH_PROD = CurLine.LINE_CODE;
                   wipSN.STATUS = wipSN.STATUS > 0 ? MES_WIP_DATA.STATUSs.OK.GetValue() : wipSN.STATUS;