获取过程变量优化

Rodney Chen

2024-07-29 201b456883c4d4799561fd17acec3f8c2111445f

 Tiger.Business.MES/Transaction/PackingNode.cs

@@ -37,7 +37,7 @@
        /// <returns></returns>
        public async Task<ApiAction<SubmitOutput>> Submit(SubmitInput input)
        {
            var action = new ApiAction<SubmitOutput>();
            var action = new ApiAction<SubmitOutput>(new SubmitOutput());
            try
            {
                //工步列表为空或者工序节点工步有未完成时，优先完成工序节点工步
@@ -52,9 +52,10 @@
                   //当前岗位在当前工单不是首站，则查找条码已绑定的工单当作当前工单
                   else
                   {
                       var wosn = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((b, s) => new JoinQueryInfos(JoinType.Inner, b.ORDER_NO == s.WORK_ORDER)).ByAuth(input.AuthOption)
                                                   .Where((b, s) => s.SN == input.SN && b.ACT_LINE == CurLine.LINE_CODE && (b.STATUS == BIZ_MES_WO_BATCH.STATUSs.Release.GetValue() || b.STATUS == BIZ_MES_WO_BATCH.STATUSs.Working.GetValue()))
                                                   .Select((b, s) => new { Batch = b, SN = s }).First();
                       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();
                       //查找到条码已绑定的工单
                       if (!wosn.IsNullOrEmpty())
                       {
@@ -169,7 +170,7 @@
                    return woStatus;
                }
                //非法过站防呆：进入工序时要增加判断条码是否按流程过站
                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()
                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(),
@@ -188,15 +189,6 @@
                {
                    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())
@@ -302,7 +294,7 @@
                //未完成所有工步
                if (!IsFinishAllSteps)
                {
                    var result = new ApiAction<SubmitOutput>();
                    var result = new ApiAction<SubmitOutput>(new SubmitOutput());
                    //未完成所有工序节点工步
                    if (!IsFinishNodeSteps)
                    {