#

whycq

2024-06-17 50907fb5ac01267870819f2cbd8632f9776835a7

#

 src/main/java/com/zy/asrs/controller/AgvLocMastController.java

@@ -82,25 +82,27 @@
            return R.error("当前操作已被阻止，请联系管理员");
        }
        int br = 0;
        switch (locMast.getBarcode().substring(0,2)) {
            case "10":
                br = 1;
                break;
            case "20":
                br = 2;
                break;
            case "21":
                br = 4;
                break;
            case "30":
                br = 3;
                break;
            case "40":
                br = 5;
                break;
        }
        if (oldLocMast.getLocType1() != br) {
            return  R.error("货架和库位类型不匹配！");
        if (locMast.getLocSts() == "O" || locMast.getLocSts() == "X"){
            switch (locMast.getBarcode().substring(0,2)) {
                case "10":
                    br = 1;
                    break;
                case "20":
                    br = 2;
                    break;
                case "21":
                    br = 4;
                    break;
                case "30":
                    br = 3;
                    break;
                case "40":
                    br = 5;
                    break;
            }
            if (oldLocMast.getLocType1() != br) {
                return  R.error("货架和库位类型不匹配！");
            }
        }
        Date now = new Date();
        // 有物料时修改为空库位或者空板库位，则删除库存明细

 src/main/java/com/zy/asrs/controller/OrderController.java

@@ -898,6 +898,7 @@
                    orderDetl2.setDeadTime(isocode);
                    orderDetl2.setStatus(1);
                    orderDetl2.setQty(0.0D);
                    orderDetl2.setProcessSts(proSts);
                    if (!orderDetlService.insert(orderDetl2)) {
                        throw new CoolException("生成单据明细失败，请重新导入！");
                    }
@@ -975,6 +976,7 @@
                        orderDetl3.setDeadTime(isocode);
                        orderDetl3.setStatus(1);
                        orderDetl3.setQty(0.0D);
                        orderDetl3.setProcessSts(proSts);
                        if (!orderDetlService.insert(orderDetl3)) {
                            throw new CoolException("生成单据明细失败，请重新导入！");
                        }

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

@@ -224,7 +224,6 @@
        switch (agvWrkMast.getIoType()) {
            case 108:
            case 12:
            case 57:
                agvTaskCreateParam.setTaskTyp("F06");
                break;
            case 109:
@@ -235,13 +234,27 @@
                }
                break;
            case 1:
            case 57:
                // 入库任务是只有 接驳位 -- > 库位
                AgvLocMast loc = agvLocMastService.selectOne(new EntityWrapper<AgvLocMast>().eq("loc_no", agvWrkMast.getLocNo()));
                String locSub = loc.getLocNo().substring(loc.getLocNo().length() - 4).substring(0, 2).substring(0, 2);
                AgvBasDevp agvBasDevp = agvBasDevpService.selectByDevNo(agvWrkMast.getSourceLocNo());
                if ("02".equals(locSub)) {
                    agvTaskCreateParam.setTaskTyp("F06");
                    if (agvBasDevp.getFloor() == 4) {
                        agvTaskCreateParam.setTaskTyp("F01");
                    } else {
                        agvTaskCreateParam.setTaskTyp("F06");
                    }

                } else {
                    agvTaskCreateParam.setTaskTyp("F01");
                    // 目标楼层位1楼 但源库位（接驳位）在吸塑二楼
                    if (agvBasDevp.getFloor() == 4) {
                        agvTaskCreateParam.setTaskTyp("F06");
                    } else {
                        agvTaskCreateParam.setTaskTyp("F01");
                    }


                }
                break;
            default:

 src/main/java/com/zy/common/service/AgvCommonService.java

@@ -238,7 +238,10 @@
        Boolean orderBy = false;
        int levCount = 0;
        int times = 1;
        if (floor == 1) {
        if (floor == 1 || floor >= 4) {
            if (floor >= 4 ) {
                floor = 1;
            }
            orderBy = true;
            levCount = 2;
        } else {