no message

skyouc

2 天以前 d55a512c442dc258b0c78e519a997d4f1c614b00

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

@@ -46,10 +46,13 @@

    @RequestMapping(value = "/order/nav/list/auth")
    @ManagerAuth
    public R navList(@RequestParam(required = false) String orderNo){
    public R navList(@RequestParam(required = false) String orderNo, @RequestParam(required = false) String shipName){
        EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }
        if (!Cools.isEmpty(shipName)) {
            wrapper.like("ship_name", shipName);
        }
        wrapper.le("settle", 2).eq("status", 1);
        // 筛选出库单,不为OrderTypeEnum.STOCK
@@ -76,11 +79,15 @@

    @RequestMapping(value = "/order/AGV/nav/list/auth")
    @ManagerAuth
    public R AGVnavList(@RequestParam(required = false) String orderNo){
    public R AGVnavList(@RequestParam(required = false) String orderNo, @RequestParam(required = false) String shipCode){
        EntityWrapper<OrderPakout> wrapper = new EntityWrapper<>();
        if (!Cools.isEmpty(orderNo)) {
            wrapper.like("order_no", orderNo);
        }

        if (!Cools.isEmpty(shipCode)) {
            wrapper.like("ship_code", shipCode);
        }
        wrapper.le("settle", 2).eq("status", 1);
        wrapper.eq("doc_type", OrderTypeEnum.STOCK.type);
        wrapper.orderBy("create_time", false);