标准wms2.0

zhang

3 天以前 e62569856fdfb0c7c31ee88cf96628af08eabf85

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

@@ -4,18 +4,15 @@
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.mapper.Wrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.common.DateUtils;
import com.core.exception.CoolException;
import com.zy.asrs.entity.BasWhsType;
import com.zy.asrs.entity.LocCache;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocCacheService;
import com.core.annotations.ManagerAuth;
import com.core.common.BaseRes;
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.common.model.Shelves;
import com.core.exception.CoolException;
import com.zy.asrs.entity.LocCache;
import com.zy.asrs.entity.param.LocMastInitParam;
import com.zy.asrs.service.LocCacheService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -36,24 +33,27 @@

    @RequestMapping(value = "/locCache/list/auth")
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
    public R list(@RequestParam(defaultValue = "1") Integer curr,
                  @RequestParam(defaultValue = "10") Integer limit,
                  @RequestParam(required = false) String orderByField,
                  @RequestParam(required = false) String orderByType,
                  @RequestParam(required = false) String condition,
                  @RequestParam Map<String, Object> param) {
        EntityWrapper<LocCache> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        allLike(LocCache.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        if (!Cools.isEmpty(orderByField)) {
            wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));
        }
        wrapper.eq("full_plt", "N");
        return R.ok(locCacheService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
    private <T> void convert(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)){
            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]));
@@ -70,10 +70,10 @@
        return R.ok();
    }

   @RequestMapping(value = "/locCache/update/auth")
   @ManagerAuth
    public R update(LocCache locCache){
        if (Cools.isEmpty(locCache) || null==locCache.getLocNo()){
    @RequestMapping(value = "/locCache/update/auth")
    @ManagerAuth
    public R update(LocCache locCache) {
        if (Cools.isEmpty(locCache) || null == locCache.getLocNo()) {
            return R.error();
        }
        locCacheService.updateById(locCache);
@@ -82,8 +82,8 @@

    @RequestMapping(value = "/locCache/delete/auth")
    @ManagerAuth
    public R delete(@RequestParam(value="ids[]") Long[] ids){
         for (Long id : ids){
    public R delete(@RequestParam(value = "ids[]") Long[] ids) {
        for (Long id : ids) {
            locCacheService.deleteById(id);
        }
        return R.ok();
@@ -91,7 +91,7 @@

    @RequestMapping(value = "/locCache/export/auth")
    @ManagerAuth
    public R export(@RequestBody JSONObject param){
    public R export(@RequestBody JSONObject param) {
        EntityWrapper<LocCache> wrapper = new EntityWrapper<>();
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        Map<String, Object> map = excludeTrash(param.getJSONObject("locCache"));
@@ -107,7 +107,7 @@
        wrapper.like("loc_no", condition);
        Page<LocCache> page = locCacheService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocCache locCache : page.getRecords()){
        for (LocCache locCache : page.getRecords()) {
            Map<String, Object> map = new HashMap<>();
            map.put("id", locCache.getLocNo());
            map.put("value", locCache.getLocNo());
@@ -120,7 +120,7 @@
    @ManagerAuth
    public R query(@RequestBody JSONObject param) {
        Wrapper<LocCache> wrapper = new EntityWrapper<LocCache>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
        if (null != locCacheService.selectOne(wrapper)){
        if (null != locCacheService.selectOne(wrapper)) {
            return R.parse(BaseRes.REPEAT).add(getComment(LocCache.class, String.valueOf(param.get("key"))));
        }
        return R.ok();
@@ -133,7 +133,7 @@
        if (Objects.isNull(param)) {
            throw new CoolException("参数不能为空！");
        }
       return locCacheService.initLocCache(param, getUserId());
        return locCacheService.initLocCache(param, getUserId());
    }

}