兼容四期

zhangc

2025-02-18 985c427122c8aa1e421bdec8c13e8947117f967d

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

@@ -215,6 +215,36 @@
//        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }


    //  入库订单明细
    @RequestMapping(value = "/order/detls/pakin/page/auth/v2")
    @ManagerAuth
    public R orderDetlsV2(@RequestParam(defaultValue = "1") Integer curr,
                        @RequestParam(defaultValue = "100") Integer limit,
                        @RequestParam(required = false) String orderByField,
                        @RequestParam(required = false) String orderByType,
                        @RequestParam Map<String, Object> param) {
        EntityWrapper<OrderDetl> wrapper = new EntityWrapper<>();
        excludeTrash(param);
        Object o = param.get("orderType");
        if (o != null) {
            String[] split = o.toString().split(",");
            wrapper.in("source", split);
            param.remove("orderType");
        }
        convert(param, wrapper);
//        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
//        List<Long> docIds = new ArrayList<>();
//        for (DocType pakin : pakins) {
//            if (pakin.getDocId() != 32) {
//                docIds.add(pakin.getDocId());
//            }
//        }

        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }


    @RequestMapping(value = "/order/detls/pakin")
    @ManagerAuth
    public R orderDetlsIn(@RequestParam(defaultValue = "1") Integer curr,
@@ -269,7 +299,7 @@
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakin", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 36) {
            if (pakin.getDocId() == 36||pakin.getDocId() == 39) {
                docIds.add(pakin.getDocId());
            }
        }