#

whycq

2024-05-20 9f2749cff3cc5c05ed6314f0dfac3f405052b21c

 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)));
    }
@@ -153,11 +153,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 +182,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);
            }
        }
    }
}