Merge remote-tracking branch 'origin/phyzasrs-erp-4' into phyzasrs-erp-4

zhangc

2025-03-19 830b5f394b6f5c41d259be38272d578467b53cf1

 src/main/java/com/zy/asrs/service/impl/AgvWorkServiceImpl.java

@@ -903,7 +903,7 @@
                    }
                }
            }
            if (agvLocMast==null){
            if (agvLocMast == null) {
                throw new CoolException("没有该类型的空库位了");
            }

@@ -959,18 +959,23 @@
        if (!Cools.isEmpty(agvWrkMast)) {
            throw new CoolException("有货架在往站点搬运" + agvBasDevp.getDevNo() + ",无法进行空板出库");
        }
        AgvLocMast agvLocMast = null;
        if (station.startsWith("XI") && station.endsWith("F4") && containerType == 30) {
            agvLocMast = agvLocMastService.select30EmptyZpallet();
        } else {
            //寻找相应类型的空货架
            Integer floor = agvBasDevp.getFloor();
            if (floor == 4) {
                floor = 1;
            }
            agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, floor);
            if (containerType == 0) {
                //空板自动出库，根据站点类型选择
                agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());

        //寻找相应类型的空货架
        Integer floor = agvBasDevp.getFloor();
        if (floor == 4) {
            floor = 1;
            }
        }
        AgvLocMast agvLocMast = agvLocMastService.selectEmptyZpallet(containerType, floor);
        if (containerType == 0) {
            //空板自动出库，根据站点类型选择
            agvLocMastService.selectEmptyZpalletByLocType1(agvBasDevp.getLocType1());

        }

        if (Cools.isEmpty(agvLocMast)) {
            throw new CoolException("暂无当前出库站点类型的空货架！");
@@ -1345,6 +1350,9 @@
                if (wrkMast.getIoType() == 112) {
                    throw new CoolException("当前作业不能取消！");
                }
                if (wrkMast.getIoType() == 108 && wrkMast.getWrkSts() >= 204) {
                    throw new CoolException("源库位已经释放，当前作业不能取消！");
                }
                // 源库位
                String locNo = wrkMast.getSourceLocNo();
                // 目标库位
@@ -1407,6 +1415,9 @@

                // 回流单取消
            } else if (wrkMast.getIoType() == 114) {
                if (wrkMast.getWrkSts() >= 204) {
                    throw new CoolException("源库位已经释放，当前作业不能取消！");
                }
                //源库位
                String locNo = wrkMast.getSourceLocNo();
                // 目标库位