兼容四期

zhangc

2025-02-13 b25fc15afed603c0c874e77d37bf93f08d5398c9

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

@@ -48,7 +48,7 @@
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
        EntityWrapper<AgvLocMast> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        convert1(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(agvLockMastService.selectPage(new Page<>(curr, limit), wrapper.eq("status",0)));
    }
@@ -69,7 +69,7 @@
    @Transactional
    public R update(AgvLocMast locMast){
        if (Cools.isEmpty(locMast) || null==locMast.getLocNo()){
            return R.error();
            return R.error("参数缺失");
        }
        AgvWrkMast wrkMast = agvWrkMastService.selectOne(new EntityWrapper<AgvWrkMast>()
                .eq("source_loc_no", locMast.getLocNo())
@@ -80,6 +80,29 @@
        AgvLocMast oldLocMast = agvLockMastService.selectById(locMast.getLocNo());
        if (locMast.getLocSts().equals("F") && (oldLocMast.getLocSts().equals("D") || oldLocMast.getLocSts().equals("O"))) {
            return R.error("当前操作已被阻止，请联系管理员");
        }
        int br = 0;
        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();
        // 有物料时修改为空库位或者空板库位，则删除库存明细
@@ -99,18 +122,21 @@
                    adjDetl.setAppeTime(now);
                    adjDetl.setAppeUser(getUserId());
                    if (!adjDetlService.insert(adjDetl)) {
                        throw new CoolException("服务器错误，请联系管理员");
                        throw new CoolException("库位修改失败");
                    }
                }
                if (!agvLocDetlService.delete(new EntityWrapper<AgvLocDetl>().eq("loc_no", locMast.getLocNo()))) {
                    throw new CoolException("服务器错误，请联系管理员");
                    throw new CoolException("库位明细删除失败");
                }
                if (locMast.getLocSts().equals("O")) {
                    locMast.setBarcode("");
                }
            }
        }
        locMast.setModiUser(getUserId());
        locMast.setModiTime(now);
        if(!agvLockMastService.updateById(locMast)) {
            throw new CoolException("服务器错误，请联系管理员");
            throw new CoolException("主库位修改失败");
        }
        return R.ok();
    }
@@ -120,7 +146,7 @@
    public R delete(@RequestParam String param){
        List<AgvLocMast> list = JSONArray.parseArray(param, AgvLocMast.class);
        if (Cools.isEmpty(list)){
            return R.error();
            return R.error("参数缺失");
        }
        for (AgvLocMast entity : list){
            agvLockMastService.delete(new EntityWrapper<>(entity));
@@ -153,11 +179,13 @@
    @ManagerAuth(memo = "初始化库位")
    public R init(LocMastInitParam param) {
        //清空原有库位
        agvLockMastService.clearLoc();
//        agvLockMastService.clearLoc();
        //初始化一楼库位
        agvLockMastService.initLocFloor1();
        //初始化二楼库位
        agvLockMastService.initLocFloor2();
//        agvLockMastService.initLocFloor2();
        //初始化三楼站点
        //agvLockMastService.initLocFloor3();
//        agvLockMastService.initLocFloor3();

        return R.ok();
    }
@@ -180,4 +208,16 @@
            }
        }
    }
    private <T> void convert1(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
                String[] dates = val.split(RANGE_TIME_LINK);
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                wrapper.eq(entry.getKey(), val);
            }
        }
    }
}