服务端的TigerApi 框架，基于.NET6 2024 版本
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
Rodney Chen
2024-12-08 006c12987d7dc7c2081fbf6715ebea98b93fdca0 
 Tiger.Business.MES/Transaction/CollectNode.cs


@@ -43,7 +43,7 @@


                //工步列表为空或者工序节点工步有未完成时，优先完成工序节点工步


                if (Steps.IsNullOrEmpty() || !IsFinishNodeSteps)


                {


                    var wosns = Biz.Db.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))


                    var wosns = MainDB.Queryable<BIZ_MES_WO_BATCH, BIZ_MES_WO_SN>((q, s) => new JoinQueryInfos(JoinType.Inner, q.ORDER_NO == s.WORK_ORDER && q.BATCH_NO == s.BATCH_NO))


                                .ByAuth(input.AuthOption)//.Where((q, s) => s.STATUS < BIZ_MES_WO_SN.STATUSs.Finished.GetValue())


                                .Where((q, s) => s.SN == input.SN || s.FLOW_SN == input.SN || s.TRAY_SN == input.SN).Select((q, s) => new { Batch = q, SN = s }).ToList();


                    //先判断当前工单不为空且当前岗位在当前工单是不是首站，如果是则不允许变更当前工单，尝试把条码绑定到当前工单


@@ -105,7 +105,7 @@


                                        action.Data.OperInfo = new();


                                        action.IsSuccessed = result.IsSuccessed;


                                        action.LocaleMsg = result.LocaleMsg;


                                        return action;


                                        return SetOutPutMqttMsg(action, input.Locale);


                                    }


                                }


                                //更新CurBatch


@@ -224,7 +224,7 @@


                //action.CatchExceptionWithLog(ex, $"采集工序：提交操作数据异常");


                action.CatchExceptionWithLog(ex, Biz.L("MES.Transaction.CollectNode.SubmitException"));


            }


            return action;


            return SetOutPutMqttMsg(action, input.Locale);


        }




        /// <summary>


@@ -262,7 +262,7 @@


                        return woStatus;


                    }




                    var wipSNs = Biz.Db.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();


                    var wipSNs = MainDB.Queryable<MES_WIP_DATA>().IncludesAllFirstLayer().Where(q => q.SN == input.SN || q.FLOW_SN == input.SN || q.TRAY_SN == input.SN).Where(q => q.FINISHED_FLAG != "Y").ToList();


                    if (wipSNs.IsNullOrEmpty())


                    {


                        var wipSN = new MES_WIP_DATA()


@@ -358,6 +358,7 @@


                        wipSN.POST_CODE = CurPosition.POST_CODE;


                        wipSN.OPER_CODE = curNode.OPER_CODE;


                        wipSN.SEGMENT = curNode.SEGMENT;


                        wipSN.UNBIND_FLAG = "N";


                        wipSN.OPERATION_TIME = DateTime.Now;


                        var curShiftPeriod = GetShiftPeriodForNow();


                        if (!curShiftPeriod.IsNullOrEmpty())