#

cp

2025-06-19 e64b1d5ec0b3ca0c42048903f4ab5f9d588349e8

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

@@ -48,13 +48,10 @@

    @RequestMapping(value = "/locDetl/forlocNo/auth/v1")
    @ManagerAuth
    public R forlocNoV1(@RequestParam String locNo,@RequestParam String matnr) {
    public R forlocNoV1(@RequestParam String locNo) {
        LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>()
                .eq(LocDetl::getLocNo, locNo)
                .eq(LocDetl::getHostId, getHostId());
        if (!Cools.isEmpty(matnr)) {
            locDetlLambdaQueryWrapper.eq(LocDetl::getMatnr, matnr);
        }
        List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
        if (Cools.isEmpty(detls)){
            return R.error("未查询到库存数据");
@@ -69,9 +66,9 @@
                .eq(LocDetl::getLocNo, locNo)
                .eq(LocDetl::getHostId, getHostId())
                .eq(LocDetl::getMatnr, matnr);
        if (!Cools.isEmpty(batch)){
            locDetlLambdaQueryWrapper.eq(LocDetl::getBatch,batch);
        }
//        if (!Cools.isEmpty(batch)){
//            locDetlLambdaQueryWrapper.eq(LocDetl::getBatch,batch);
//        }
        List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
        if (Cools.isEmpty(detls)){
            return R.error("未查询到库存数据");
@@ -109,7 +106,17 @@
//                    .where("loc_no like '" +row +"%'");
//        }
        List<LocDetl> list = locDetlService.list(wrapper);
        return R.ok(exportSupport(list, fields));
        List<LocDetl> locDetls=new ArrayList<>();
        for (LocDetl l:list
             ) {
            if(Cools.isEmpty(l.getMaktx())){
                continue;
            }
            String new_String = l.getMaktx().replace("\"","");
            l.setMaktx(new_String);
            locDetls.add(l);
        }
        return R.ok(exportSupport(locDetls, fields));
    }

    private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){
@@ -299,56 +306,20 @@

    @RequestMapping(value = "/stock/out/list/auth")
    @ManagerAuth
    public R stockOutList(@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(required = false) String timeRange,
                          @RequestParam Map<String, Object> param) {
        QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();

        if (!Cools.isEmpty(param.get("decrees"))) {
            ArrayList<String> mats = new ArrayList<>();
            List<Mat> decrees = matService.list(new LambdaQueryWrapper<Mat>().like(Mat::getDecrees, param.get("decrees")));
            if (decrees.isEmpty()) {
                mats.add("-1");
            }else {
                for (Mat mat : decrees) {
                    mats.add(mat.getMatnr());
                }
    public R stockOutList(@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");
            }
            wrapper.in("matnr", mats);
            param.remove("decrees");
        }

        convert(param,wrapper);
        wrapper.eq("host_id", getHostId());
//        if (!Cools.isEmpty(condition)) {
//            wrapper.like(LocDetl::getLocNo, condition);
//        }
        if (!Cools.isEmpty(timeRange)) {
            String[] range = timeRange.split(RANGE_TIME_LINK);
            wrapper.ge("appe_time", DateUtils.convert(range[0]));
            wrapper.le("appe_time", DateUtils.convert(range[1]));
        }
        if (!Cools.isEmpty(param.get("locNo"))) {
            wrapper.like("loc_no", param.get("locNo"));
        }

        if (!Cools.isEmpty(param.get("zpallet"))) {
            wrapper.like("zpallet", param.get("zpallet"));
        }

        if (!Cools.isEmpty(orderByField)){
            wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
        }

        param.remove("locNo");
        param.remove("owner");
        param.remove("matnr");
        allLike(LocDetl.class, param.keySet(), wrapper, condition);
        return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
        param.put("hostId", getHostId());
        return R.ok(locDetlService.getStockOut(curr, limit, param));
    }

    @RequestMapping(value = "/locDetl/statis/export")