Merge remote-tracking branch 'origin/mdqdasrsVersion' into mdqdasrsVersion

野心家

2025-01-08 c688ad2d55d6a5355e0e75402177f3e7989600bc

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

@@ -92,6 +92,9 @@
   @RequestMapping(value = "/locMast/update/auth")
   @ManagerAuth(memo = "库位修改")
    public R update(LocMast locMast){
        if (locMast.getBay1() == 17 || locMast.getBay1() == 18){
            return R.error("17列和18列禁止修改");
        }
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
        }
@@ -200,7 +203,7 @@
            }
        }
//        locMastService.delete(new EntityWrapper<>());
        locDetlService.delete(new EntityWrapper<>());
//        locDetlService.delete(new EntityWrapper<>());
        locMastService.insertBatch(list);
        return R.ok("初始化成功");
    }