#

Junjie

2023-12-26 180e44f303dcaf2a9102fa91ac7669dbfc191980

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

File was renamed from zy-asrs-common/src/main/java/com/zy/asrs/common/wms/controller/LocDetlController.java
@@ -1,4 +1,4 @@
package com.zy.asrs.common.wms.controller;
package com.zy.asrs.wms.controller;

import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
@@ -37,6 +37,7 @@
                  @RequestParam(required = false) String timeRange,
                  @RequestParam Map<String, Object> param) {
        LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LocDetl::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(LocDetl::getLocNo, condition);
        }
@@ -45,6 +46,9 @@
            wrapper.ge(LocDetl::getAppeTime, DateUtils.convert(range[0]));
            wrapper.le(LocDetl::getAppeTime, DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("loc_no"))) {
            wrapper.eq(LocDetl::getLocNo, param.get("loc_no"));
        }
        return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
    }

@@ -52,6 +56,7 @@
    @RequestMapping(value = "/locDetl/add/auth")
    @ManagerAuth
    public R add(LocDetl locDetl) {
        locDetl.setHostId(getHostId());
        locDetlService.save(locDetl);
        return R.ok();
    }
@@ -79,6 +84,7 @@
    @ManagerAuth
    public R query(String condition) {
        LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LocDetl::getHostId, getHostId());
        wrapper.like(LocDetl::getLocNo, condition);
        Page<LocDetl> page = locDetlService.page(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
@@ -96,6 +102,7 @@
    public R getDataKV(@RequestParam(required = false) String condition) {
        List<KeyValueVo> vos = new ArrayList<>();
        LambdaQueryWrapper<LocDetl> wrapper = new LambdaQueryWrapper<>();
        wrapper.eq(LocDetl::getHostId, getHostId());
        if (!Cools.isEmpty(condition)) {
            wrapper.like(LocDetl::getLocNo, condition);
        }