#

luxiaotao1123

2021-04-13 c36c0562f48f671d36aae11505e7ecc83b9fd042

 src/main/java/zy/cloud/wms/manager/controller/LocDetlController.java

@@ -14,7 +14,9 @@
import org.springframework.web.bind.annotation.*;
import zy.cloud.wms.common.web.BaseController;
import zy.cloud.wms.manager.entity.LocDetl;
import zy.cloud.wms.manager.entity.Mat;
import zy.cloud.wms.manager.service.LocDetlService;
import zy.cloud.wms.manager.service.MatService;

import java.util.ArrayList;
import java.util.HashMap;
@@ -26,6 +28,19 @@

    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private MatService matService;

    @RequestMapping(value = "/locDetl/queryDetl/auth")
    @ManagerAuth
    public R queryDetl(@RequestParam(required = false) String uuid) {
        if (Cools.isEmpty(uuid)) {
            return R.ok();
        }
        List<LocDetl> locDetls = locDetlService.findByNodeUuid(uuid);
        return R.ok().add(locDetls);
    }


    @RequestMapping(value = "/locDetl/{id}/auth")
    @ManagerAuth
@@ -40,11 +55,26 @@
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convert(param, wrapper);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
        Object nodeId = param.get("node_id");
        if (Cools.isEmpty(nodeId)) {
            nodeId = getOriginNode().getId();
            param.put("node_id", String.valueOf(nodeId));
        }
        Object tagId = param.get("tag_id");
        if (Cools.isEmpty(tagId)) {
            tagId = getOriginTag().getId();
            param.put("tag_id", String.valueOf(tagId));
        }
        if (!Cools.isEmpty(param.get("update_time"))){
            String val = String.valueOf(param.get("update_time"));
            if (val.contains(RANGE_TIME_LINK)) {
                String[] dates = val.split(RANGE_TIME_LINK);
                param.put("startTime", DateUtils.convert(dates[0]));
                param.put("endTime", DateUtils.convert(dates[1]));
                param.remove("update_time");
            }
        }
        return R.ok(locDetlService.getPage(toPage(curr, limit, param, LocDetl.class)));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
@@ -127,4 +157,12 @@
        return R.ok();
    }

    @RequestMapping(value = "/locDetl/chart/auth", method = RequestMethod.POST)
    @ManagerAuth
    public R chart(@RequestParam String matnr) {
        Mat mat = matService.selectByMatnr(matnr);
        List<LocDetl> locDetls = locDetlService.findOfSort(matnr);
        return R.ok(matnr + (mat==null?"": " - " + mat.getMaktx())).add(locDetls);
    }

}