#

18516761980

2022-01-26 4ec829bcbe9d8370476b71c9692eb7b3ef6e5e6f

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

@@ -11,7 +11,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.LocMast;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocMastService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -24,10 +26,37 @@
    @Autowired
    private LocDetlService locDetlService;

    @Autowired
    private LocMastService locMastService;

    @RequestMapping(value = "/locDetl/update")
    public R update1() {
        if (!locDetlService.updateLocNo("0402805", "0402804")) {
            return R.error();
        }
        return R.ok();
    }

    @RequestMapping(value = "/locDetl/{id}/auth")
    @ManagerAuth
    public R get(@PathVariable("id") String id) {
        return R.ok(locDetlService.selectById(String.valueOf(id)));
    }

    @GetMapping(value = "/locDetl/auth")
    @ManagerAuth
    public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
        if (!locNos.isEmpty()) {
            List<LocDetl> res = new ArrayList<>();
            for (String locNo : new HashSet<>(locNos)) {
                List<LocDetl> locDetls = locDetlService.selectList(new EntityWrapper<LocDetl>().eq("loc_no", locNo));
                if (!locDetls.isEmpty()) {
                    res.addAll(locDetls);
                }
            }
            return R.ok().add(res);
        }
        return R.parse(BaseRes.EMPTY);
    }

    @RequestMapping(value = "/stock/out/list/auth")
@@ -35,7 +64,16 @@
    public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> param){
        return R.ok(locDetlService.getStockOut(new Page<LocDetl>(curr, limit).setCondition(param)));
        if (!Cools.isEmpty(param.get("modi_time"))){
            String val = String.valueOf(param.get("modi_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("modi_time");
            }
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
    }

    @RequestMapping(value = "/locDetl/list/auth")
@@ -44,20 +82,23 @@
                  @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){
        excludeTrash(param);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
        return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    private void convert(Map<String, Object> map, EntityWrapper wrapper){
    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().endsWith(">")) {
                wrapper.ge(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            } else if (entry.getKey().endsWith("<")) {
                wrapper.le(Cools.deleteChar(entry.getKey()), DateUtils.convert(String.valueOf(entry.getValue())));
            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 {
                if (entry.getKey().equals("locNo")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
@@ -67,6 +108,34 @@
            }
        }
    }


    @RequestMapping(value = "/locDetl/list/sts")
    @ManagerAuth
    public R stsList(@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){
        excludeTrash(param);
        String value= null;
        for (String s : param.keySet()) {
            value= (String) param.get(s);
        }
        LocMast loc_no = locMastService.selectOne(new EntityWrapper<LocMast>().eq("loc_no", value));
        if (loc_no.getLocSts().equals("O")||loc_no.getLocSts().equals("D")||loc_no.getLocSts().equals("F")){
            EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
            convert(param, wrapper);
            allLike(LocDetl.class, param.keySet(), wrapper, condition);
            if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
            return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
        }else {
            return R.error("该库位当前状态不能调整");
        }
    }



    @RequestMapping(value = "/locDetl/add/auth")
    @ManagerAuth(memo = "库位明细添加")
@@ -82,7 +151,7 @@
   @RequestMapping(value = "/locDetl/update/auth")
   @ManagerAuth(memo = "库位明细修改")
    public R update(LocDetl locDetl){
        if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
        if (Cools.isEmpty(locDetl) || null==locDetl.getMatNo()){
            return R.error();
        }
        locDetl.setModiUser(getUserId());
@@ -119,13 +188,13 @@
    @ManagerAuth
    public R query(String condition) {
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        wrapper.like("matnr", condition);
        wrapper.like("mat_no", condition);
        Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
        List<Map<String, Object>> result = new ArrayList<>();
        for (LocDetl locDetl : page.getRecords()){
            Map<String, Object> map = new HashMap<>();
            map.put("id", locDetl.getMatnr());
            map.put("value", locDetl.getMatnr());
            map.put("id", locDetl.getMatNo());
            map.put("value", locDetl.getMatNo());
            result.add(map);
        }
        return R.ok(result);
@@ -141,4 +210,6 @@
        return R.ok();
    }



}