#

whycq

2024-05-22 81672518fc9a2e86c5c34dba341aaa535c2f069d

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

@@ -52,6 +52,8 @@
    private LocDetlService locDetlService;
    @Autowired
    private MatService matService;
    @Autowired
    private AgvLocDetlService agvLocDetlService;

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
@@ -187,6 +189,33 @@
        return R.ok(orderDetlService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/bcpDb/detls/pakin/page/auth")
    @ManagerAuth
    public R bcpDbOrderDetls(@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);
        convert(param, wrapper);
//        return R.ok(orderDetlService.getPakoutPage(toPage(curr, limit, param, OrderDetl.class)));
        List<DocType> pakins = docTypeService.selectList(new EntityWrapper<DocType>().eq("pakout", 1));
        List<Long> docIds = new ArrayList<>();
        for (DocType pakin : pakins) {
            if (pakin.getDocId() == 33) {
                docIds.add(pakin.getDocId());
            }
        }
        wrapper.in("source",docIds);
        Page<OrderDetl> page = orderDetlService.selectPage(new Page<>(curr, limit), wrapper);
        for (OrderDetl record : page.getRecords()) {
            Double sumAnfme = agvLocDetlService.getSumAnfmeDb(record.getMatnr(), record.getThreeCode(),1);
            record.setStock(sumAnfme == null ? 0 : sumAnfme);
        }
        return R.ok(page);
    }

    @RequestMapping(value = "/order/detl/all/auth")
    @ManagerAuth
    public R head(@RequestParam Long orderId){