*

whycq

2024-09-30 035eb4ea58c56ae748b10e4121fc907aa9de62ea

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

@@ -47,7 +47,29 @@
            wrapper.orderBy("create_time", false);
        }
        wrapper.eq("status", 1);
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
        Page<OrderDetl> orderDetlPage = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        // 根据商品编号和批号，分别在立库和平库库存表中查询其存量，并存入两个临时属性中
        orderDetlPage.getRecords().forEach(orderDetl -> {
            Map<String, Long> map = orderDetlService.selectCountByMatnr(orderDetl.getMatnr(), orderDetl.getBatch());
            orderDetl.setSupp(String.valueOf(map.get("asrCount")));
            orderDetl.setSuppCode(String.valueOf(map.get("manCount")));
        });
        return R.ok(orderDetlPage);
    }

    @RequestMapping("/orderPakin/page/auth")
    @ManagerAuth(memo = "查询入库订单")
    public R orderPakinPage(@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){
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        convertLike(param, wrapper);
        wrapper.eq("source",30);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        return R.ok(page);
    }

    @RequestMapping(value = "/orderDetl/pakout/list/auth")
@@ -73,6 +95,19 @@
        }
    }

    private <T> void convertLike(Map<String, Object> map, EntityWrapper<T> wrapper){
        for (Map.Entry<String, Object> entry : map.entrySet()){
            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 {
                wrapper.like(entry.getKey(), val);
            }
        }
    }

    @RequestMapping(value = "/orderDetl/add/auth")
    @ManagerAuth
    public R add(OrderDetl orderDetl) {