1

zhangc

2025-02-25 a7ec33be10c9c70d1dd9efbce7248b008f899ed5

 src/main/java/com/zy/asrs/task/AutoMoveScheduler.java

@@ -218,9 +218,7 @@
        // 查询 不为1楼的空货架
        List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>()
                // TODO 四期
                .eq("loc_sts", "D").eq("loc_type1", 3)
                .andNew()
                .ne("floor", 1).or().ne("lev1", 1));
                .eq("loc_sts", "D").eq("loc_type1", 3).andNew().ne("floor", 1).or().ne("lev1", 1));
        if (agvLocMasts.isEmpty()) {
            return;
        }
@@ -415,16 +413,25 @@
                    return;
                }

                List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("floor", 1).eq("loc_sts", "F").eq("loc_type1", 3).eq("ctn_no", "1"));
                List<AgvLocMast> agvLocMasts = agvLocMastService.selectList(new EntityWrapper<AgvLocMast>().eq("floor", 1).eq("loc_sts", "F").eq("loc_type1", 3).isNotNull("ctn_no"));
                if (agvLocMasts.isEmpty()) {
                    return;
                }
                for (AgvLocMast agvLocMast : agvLocMasts) {
                    try {
                        autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
                    } catch (Exception e) {
                        log.error("库位号" + agvLocMast.getLocNo() + "四期定时移库任务 吸塑 --> 吸塑,处理失败：===》异常原因：" + e.getMessage());
                    if (agvLocMast.getLev1() == 1 && agvLocMast.getFloor() == 1 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("2")) {
                        try {
                            autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
                        } catch (Exception e) {
                            log.error("库位号" + agvLocMast.getLocNo() + "四期定时移库任务 吸塑 --> 吸塑,处理失败：===》异常原因：" + e.getMessage());
                        }
                    } else if (agvLocMast.getLev1() == 2 && agvLocMast.getFloor() == 1 && !Cools.isEmpty(agvLocMast.getCtnNo()) && agvLocMast.getCtnNo().toString().equals("1")) {
                        try {
                            autoMoveHandler.autoTransfersV2(agvLocMast, maxTansk);
                        } catch (Exception e) {
                            log.error("库位号" + agvLocMast.getLocNo() + "四期定时移库任务 吸塑 --> 吸塑,处理失败：===》异常原因：" + e.getMessage());
                        }
                    }

                }
            }
        }