#

LSH

2022-12-05 6e8c80e42a05b46553b9b267fcdd23b8abb94cc2

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

@@ -96,6 +96,16 @@
            return R.error();
        }
        LocMast oldLocMast = locMastService.selectById(locMast.getLocNo());
        if (locX(locMast.getLocNo())){
            if (oldLocMast.getLocSts().equals("X")){
                return R.error("此处没有库位，请根据现场情况操作！！！");
            }else {
                locMast.setLocSts("X");
            }
        }
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
            return R.error("当前操作已被阻止，请联系管理员");
        }
        // 有物料时修改为空库位或者空板库位，则删除库存明细
        if (oldLocMast.getLocSts().equals("R") || oldLocMast.getLocSts().equals("F")) {
            if (locMast.getLocSts().equals("O") || locMast.getLocSts().equals("D")) {
@@ -106,6 +116,21 @@
        locMast.setModiTime(new Date());
        locMastService.updateById(locMast);
        return R.ok();
    }
    public boolean locX(String locNo){
        switch (locNo){
            case "1300601": case "1300602": case "1300603": case "1300604": case "1300605": case "1300606":
            case "1300701": case "1300702": case "1300703": case "1300704": case "1300705": case "1300706":
            case "1301301": case "1301302": case "1301303": case "1301304": case "1301305": case "1301306":
            case "1301401": case "1301402": case "1301403": case "1301404": case "1301405": case "1301406":
            case "1302001": case "1302002": case "1302003": case "1302004": case "1302005": case "1302006":
            case "1301205": case "1301206":
            case "1302402":
            case "1402402":
                return true;
            default:
                return false;
        }
    }

    @RequestMapping(value = "/locMast/delete/auth")
@@ -177,6 +202,7 @@
                            break;
                        }
                    }
                    Date now =  new Date();
                    LocMast locMast = new LocMast();
                    locMast.setLocNo(locNo);
                    locMast.setLocSts("O");
@@ -184,18 +210,18 @@
                    locMast.setBay1(b); // 列
                    locMast.setLev1(l); // 层
                    locMast.setCrnNo(crnNo); // 堆垛机
                    locMast.setLocType1(param.getLocType1());
                    locMast.setLocType1(!Cools.isEmpty(param.getLocType1()) ? param.getLocType1() : 1);
                    locMast.setLocType2(param.getLocType2());
                    locMast.setLocType3(param.getLocType3());
                    locMast.setAppeUser(getUserId());
                    locMast.setAppeTime(new Date());
                    locMast.setAppeTime(now);
                    locMast.setModiUser(getUserId());
                    locMast.setModiTime(new Date());
                    locMast.setModiTime(now);
                    list.add(locMast);
                }
            }
        }
        locMastService.delete(new EntityWrapper<>());
//        locMastService.delete(new EntityWrapper<>());
        locDetlService.delete(new EntityWrapper<>());
        locMastService.insertBatch(list);
        return R.ok("初始化成功");