#出库修改完成数量变更修改工作数量

zjj

2023-06-09 34a93b4b34e056ac7c20891efe5630245dc9766c

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

@@ -12,10 +12,11 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.*;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.LocOwnerService;
import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +32,8 @@

    @Autowired
    private LocDetlService locDetlService;
    @Autowired
    private LocOwnerService locOwnerService;
    @Autowired
    private LocDetlMapper locDetlMapper;
    @Autowired
@@ -80,10 +83,10 @@
                param.remove("modi_time");
            }
        }
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"2"));
    }

    @RequestMapping(value = "/locDetl/list/auth")
    @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 接口问题
    @ManagerAuth
    public R list(@RequestParam(defaultValue = "1")Integer curr,
                  @RequestParam(defaultValue = "10")Integer limit,
@@ -91,15 +94,39 @@
                  @RequestParam(required = false)String orderByType,
                  @RequestParam(required = false)String condition,
                  @RequestParam Map<String, Object> param){
        excludeTrash(param);
//        String row = "";
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        convert(param, wrapper);
//        if (param.get("row") != null) {
//            String chooseRow = (String) param.get("row");
//            if (chooseRow.length() == 1) {
//                row = "0" + chooseRow;
//                param.remove("row");
//            }else {
//                row = chooseRow;
//                param.remove("row");
//            }
//        }
        excludeTrash(param);
        String locNo = 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));
        Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
        if (Cools.isEmpty(locDetlPage) || locDetlPage.getTotal()==0){
            List<LocDetl> locDetls = locDetlService.queryStockViewMerge(locNo);
            return R.ok(locDetlPage.setRecords(locDetls));
        }else {
            return R.ok(locDetlPage);
        }
//        if (!row.equals("")){
//            wrapper.and()
//                    .where("loc_no like '" +row +"%'");
//        }
//        return R.ok();
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){

    private <T> String convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        String locNo=null;
        for (Map.Entry<String, Object> entry : map.entrySet()){
            String val = String.valueOf(entry.getValue());
            if (val.contains(RANGE_TIME_LINK)){
@@ -107,13 +134,15 @@
                wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
                wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
            } else {
                if (entry.getKey().equals("locNo")) {
                if (entry.getKey().equals("loc_no")) {
                    wrapper.eq("loc_no", String.valueOf(entry.getValue()));
                    locNo=String.valueOf(entry.getValue());
                } else {
                    wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
                }
            }
        }
        return locNo;
    }

    @RequestMapping(value = "/locDetl/add/auth")
@@ -158,7 +187,22 @@
        List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
        EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
        Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
        String row = "";
        if (map.get("row") != null) {
            String chooseRow = (String) map.get("row");
            if (chooseRow.length() == 1) {
                row = "0" + chooseRow;
                map.remove("row");
            }else {
                row = chooseRow;
                map.remove("row");
            }
        }
        convert(map, wrapper);
        if (!row.equals("")){
            wrapper.and()
                    .where("loc_no like '" +row +"%'");
        }
        List<LocDetl> list = locDetlService.selectList(wrapper);
        return R.ok(exportSupport(list, fields));
    }
@@ -237,4 +281,56 @@
        return R.ok(sum);
    }


    @RequestMapping(value = "/turn/over/list/auth")
    @ManagerAuth
    public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
                          @RequestParam(defaultValue = "10")Integer limit,
                          @RequestParam Map<String, Object> 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");
            }
        }
        if (!Cools.isEmpty(param.get("owner"))){
            List<LocOwner> locOwners = locOwnerService.selectList(new EntityWrapper<LocOwner>().eq("owner", param.get("owner")));
            if (Cools.isEmpty(locOwners) || locOwners.size()>1){
                return R.error();
            }else {
                param.remove("owner");
                param.put("owner", locOwners.get(0).getId());
            }
        }

        return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class),"1"));
    }


    @RequestMapping(value = "/locDetl/selectPayment/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 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());
        }


        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));
    }


}