优化异常处理及订单同步逻辑

zhangc

2025-01-07 ce43df438a4bbef5b9ffaed0a33a97db6e88fbf1

 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();
        // 有物料时修改为空库位或者空板库位，则删除库存明细