#出入库日志修改

zjj

2023-06-16 be32a8ddbcbb4f6e7b707e6ef8d6c24c05a48897

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

@@ -13,6 +13,8 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.result.LocDetlAll;
import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocOwnerService;
@@ -38,6 +40,8 @@
    private LocDetlMapper locDetlMapper;
    @Autowired
    private MatService matService;
    @Autowired
    private ManLocDetlService manLocDetlService;

    @RequestMapping(value = "/locDetl/update")
    public R update1() {
@@ -318,18 +322,74 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        if (param.get("owner$") != null && param.get("owner$") != ""){
             LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
             param.remove("owner$");
             param.put("owner",locOwner.getId());
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
            if(locOwner == null){
                return R.error("参数有误！");
            }
            param.remove("owner$");
            param.put("owner",locOwner.getId());
        }

        LocDetlDTO locDetlDTO = new LocDetlDTO();
        locDetlDTO.setPageSize(limit);
        locDetlDTO.setPageNumber(curr);
        String locNo = String.valueOf(param.get("locNo"));
        String owner = String.valueOf(param.get("owner"));
        String matnr = String.valueOf(param.get("matnr"));
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            locDetlDTO.setLocNo(locNo);
        }
        if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
            locDetlDTO.setMatnr(matnr);
        }
        if (!Cools.isEmpty(owner) && !owner.equals("null")) {
            locDetlDTO.setOwner(owner);
        }
        List<LocDetlAll> list = locDetlService.selectAllPyment(locDetlDTO);
        int count = locDetlService.selectAllPymentcount(locDetlDTO);
        Page<LocDetlAll> page = new Page<>();
        page.setRecords(list);
        page.setTotal(count);
        return R.ok(page);
    }

        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        wrapper.eq("payment",0);
        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));
    @RequestMapping(value = "/locDetl/selectOwner/list/auth")
    @ManagerAuth
    public R selectOwnerlist(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
                  @RequestParam(required = false)String orderByField,
                  @RequestParam(required = false)String orderByType,
                  @RequestParam Map<String, Object> param){
        if (param.get("owner$") != null && param.get("owner$") != ""){
            LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().eq("owner", param.get("owner$")));
            if(locOwner == null){
                return R.error("参数有误！");
            }
            param.remove("owner$");
            param.put("owner",locOwner.getId());
        }

        LocDetlDTO locDetlDTO = new LocDetlDTO();
        locDetlDTO.setPageSize(limit);
        locDetlDTO.setPageNumber(curr);
        String locNo = String.valueOf(param.get("locNo"));
        String owner = String.valueOf(param.get("owner"));
        String matnr = String.valueOf(param.get("matnr"));
        if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
            locDetlDTO.setLocNo(locNo);
        }
        if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
            locDetlDTO.setMatnr(matnr);
        }
        if (!Cools.isEmpty(owner) && !owner.equals("null")) {
            locDetlDTO.setOwner(owner);
        }
        List<LocDetlAll> list = locDetlService.selectAllOwner(locDetlDTO);
        int count = locDetlService.selectAllCount(locDetlDTO);
        Page<LocDetlAll> page = new Page<>();
        page.setRecords(list);
        page.setTotal(count);
        return R.ok(page);
    }