金坛修改

海波 张

2025-05-22 9ad3666d15deccc40a2aa4d1b96950c78eaf165f

 process/TaskProcess.cs

@@ -263,7 +263,7 @@
                        var endLoc = LocationHelper.GetLocOne(wcsTask.S_END_LOC);

                        var endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
                        var end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                        var end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                        LogHelper.Info($"当前巷道不可用，需要改道，新终点信息" + JsonConvert.SerializeObject(end), "改道安全交互");
                        if (end == null)
                        {
@@ -1335,15 +1335,22 @@
                    }

                    //查找终点
                    var endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
                    List<Location> endList ;

                    Location end = null;

                    if (!string.IsNullOrEmpty(workFlow.ZONECODE))
                    {
                        endList = LocationHelper.GetZoneLoc(workFlow.ZONECODE);
                    }
                    else {
                        endList = LocationHelper.GetAllLocList1(workFlow.ENDAREA);
                    }

                    if (workFlow.FLOWCODE == "1")
                    {
                        //满托入
                        end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                        end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                    }
                    else if (workFlow.FLOWCODE == "3")
                    {
@@ -1356,7 +1363,7 @@
                        //if (end == null)
                        //{
                            LogHelper.Info($"ZCSendTask入库任务没找到空托缓存区终点,寻找立库区空货位", "Mes任务下发");
                            end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                            end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                        //}
                        //else
                        //{
@@ -1374,7 +1381,7 @@
                        }
                        else
                        {
                            end = LocationHelper.FindEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                            end = LocationHelper.FindBalanceEndcolByLocList(endList, workFlow.ENDAREA, workFlow.ROADWAY);
                        }
                    }
                    else if (workFlow.FLOWCODE == "12")
@@ -1551,7 +1558,7 @@
                            start = LocationHelper.FindStartcolByLoclistAndItem(strrtList, model.PROD_NO, workFlow.STARTAREA, workFlow.ROADWAY);
                            if (start==null)
                            {

                                strrtList = LocationHelper.GetAllLocList2(workFlow.STARTAREA);
                                var itemFlag = LocationHelper.FindStartcolByLoclistAndItemFlag(strrtList, model.PROD_NO, workFlow.STARTAREA);
                                LogHelper.Info($"ZCSendTask满托出库任务没找到起点，校验是否有库存但是设备报警{itemFlag}", "Mes任务下发");
                                if (itemFlag)
@@ -1571,6 +1578,7 @@
                        start = LocationHelper.FindStartcolByLoclistAndcntr(strrtList, workFlow.STARTAREA);
                        if (start == null)
                        {
                            strrtList = LocationHelper.GetAllLocList2(workFlow.STARTAREA);
                            var itemFlag = LocationHelper.FindStartcolByLoclistAndcntrFlag(strrtList, workFlow.STARTAREA);
                            LogHelper.Info($"ZCSendTask空托出库任务没找到起点，校验是否有库存但是设备报警{itemFlag}", "Mes任务下发");