#

zjj

2024-10-31 4262bd3905d0f9982dfa265bd443c82a1fff0a00

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

@@ -43,6 +43,18 @@
    @Autowired
    private WrkMastLogService wrkMastLogService;


    @RequestMapping(value = "/order/list/pda/page/auth")
    @ManagerAuth
    public R pdaPageList(@RequestParam(required = true)Long tagId,
                         @RequestParam(defaultValue = "1")Integer curr,
                         @RequestParam(defaultValue = "10")Integer limit){
        EntityWrapper<Order> wrapper = new EntityWrapper<>();
//        wrapper.eq("tag_id", tagId);
        wrapper.orderBy("create_time", false);
        return R.ok().add(orderService.selectPage(new Page<>(curr, limit), wrapper));
    }

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
    public R navList(@RequestParam(required = false) String orderNo){
@@ -298,7 +310,7 @@
                .add("list", wrkTraceVos)
                .add("orderNo", order.getOrderNo())
                .add("totalQty", totalQty)
                .add("wrkQty", wrkQty)
                .add("wrkQty", wrkQty+endQty)
                .add("lackQty", lackQty)
                .add("endQty",endQty)
        );