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

cp

2024-05-28 62d4c522ae452b3cb583a02982156047172230a2

 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/BasWhsController.java

@@ -26,7 +26,7 @@
    @RequestMapping(value = "/basWhs/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(basWhsService.getById(String.valueOf(id)));
        return R.ok(basWhsService.getOne(new LambdaQueryWrapper<BasWhs>().eq(BasWhs::getId, Long.parseLong(id)).eq(BasWhs::getHostId, getHostId())));
    }

    @RequestMapping(value = "/basWhs/page/auth")
@@ -37,6 +37,7 @@
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(BasWhs::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(BasWhs::getWhsDesc, condition);
        }
@@ -52,6 +53,7 @@
    @RequestMapping(value = "/basWhs/add/auth")
    @ManagerAuth
    public R add(BasWhs basWhs) {
        basWhs.setHostId(getHostId());
        basWhsService.save(basWhs);
        return R.ok();
    }
@@ -79,6 +81,7 @@
    @ManagerAuth
    public R query(String condition) {
        LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(BasWhs::getHostId, getHostId());
        wrapper.like(BasWhs::getWhsDesc, condition);
        Page<BasWhs> page = basWhsService.page(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +99,7 @@
    public R getDataKV(@RequestParam(required = false) String condition) {
        List<KeyValueVo> vos = new ArrayList<>();
        LambdaQueryWrapper<BasWhs> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(BasWhs::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(BasWhs::getWhsDesc, condition);
        }