#
Junjie
20 小时以前 b1b7d4380a7ddcd379f6bd8b8e5bac116badc43a
#
3个文件已修改
63 ■■■■ 已修改文件
src/main/java/com/zy/asrs/controller/BasLocStsController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/LocMastController.java 21 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/zy/asrs/controller/BasLocStsController.java
@@ -97,13 +97,26 @@
    @RequestMapping(value = "/basLocSts/delete/auth")
    @ManagerAuth(memo = "库位状态删除")
    public R delete(@RequestParam String param){
    public R delete(@RequestParam(value = "ids[]", required = false) String[] ids,
                    @RequestParam(value = "param", required = false) String param){
        List<String> deleteIds = new ArrayList<>();
        if (!Cools.isEmpty(ids)) {
            deleteIds.addAll(Arrays.asList(ids));
        } else if (!Cools.isEmpty(param)) {
        List<BasLocSts> list = JSONArray.parseArray(param, BasLocSts.class);
        if (Cools.isEmpty(list)){
            if (!Cools.isEmpty(list)) {
                for (BasLocSts entity : list) {
                    if (!Cools.isEmpty(entity) && !Cools.isEmpty(entity.getLocSts())) {
                        deleteIds.add(entity.getLocSts());
                    }
                }
            }
        }
        if (Cools.isEmpty(deleteIds)){
            return R.error();
        }
        for (BasLocSts entity : list){
            basLocStsService.remove(new QueryWrapper<>(entity));
        for (String id : deleteIds){
            basLocStsService.removeById(id);
        }
        return R.ok();
    }
src/main/java/com/zy/asrs/controller/BasWrkStatusController.java
@@ -97,13 +97,26 @@
    @RequestMapping(value = "/basWrkStatus/delete/auth")
    @ManagerAuth(memo = "工作状态删除")
    public R delete(@RequestParam String param){
    public R delete(@RequestParam(value = "ids[]", required = false) Long[] ids,
                    @RequestParam(value = "param", required = false) String param){
        List<Long> deleteIds = new ArrayList<>();
        if (!Cools.isEmpty(ids)) {
            deleteIds.addAll(Arrays.asList(ids));
        } else if (!Cools.isEmpty(param)) {
        List<BasWrkStatus> list = JSONArray.parseArray(param, BasWrkStatus.class);
        if (Cools.isEmpty(list)){
            if (!Cools.isEmpty(list)) {
                for (BasWrkStatus entity : list) {
                    if (!Cools.isEmpty(entity) && entity.getWrkSts() != null) {
                        deleteIds.add(entity.getWrkSts());
                    }
                }
            }
        }
        if (Cools.isEmpty(deleteIds)){
            return R.error();
        }
        for (BasWrkStatus entity : list){
            basWrkStatusService.remove(new QueryWrapper<>(entity));
        for (Long id : deleteIds){
            basWrkStatusService.removeById(id);
        }
        return R.ok();
    }
src/main/java/com/zy/asrs/controller/LocMastController.java
@@ -96,13 +96,26 @@
    @RequestMapping(value = "/locMast/delete/auth")
    @ManagerAuth(memo = "库位删除")
    public R delete(@RequestParam String param){
    public R delete(@RequestParam(value = "ids[]", required = false) String[] ids,
                    @RequestParam(value = "param", required = false) String param){
        List<String> deleteIds = new ArrayList<>();
        if (!Cools.isEmpty(ids)) {
            deleteIds.addAll(Arrays.asList(ids));
        } else if (!Cools.isEmpty(param)) {
        List<LocMast> list = JSONArray.parseArray(param, LocMast.class);
        if (Cools.isEmpty(list)){
            if (!Cools.isEmpty(list)) {
                for (LocMast entity : list) {
                    if (!Cools.isEmpty(entity) && !Cools.isEmpty(entity.getLocNo())) {
                        deleteIds.add(entity.getLocNo());
                    }
                }
            }
        }
        if (Cools.isEmpty(deleteIds)){
            return R.error();
        }
        for (LocMast entity : list){
            locMastService.remove(new QueryWrapper<>(entity));
        for (String id : deleteIds){
            locMastService.removeById(id);
        }
        return R.ok();
    }