#

Junjie

2024-09-12 fb4e7fd8575a97467a972028a91484f71985656c

#

 zy-asrs-admin/src/views/out/orderOut/index.vue

@@ -120,7 +120,8 @@
    post('/api/order/out/page', {
        current: currentPage,
        pageSize: pageSize,
        condition: searchOrder.value
        condition: searchOrder.value,
        orderOut: true,
    }).then((resp) => {
        let result = resp.data;
        if (result.code == 200) {
@@ -196,7 +197,7 @@
        if (result.code == 200) {
            message.success(formatMessage('page.add.success', '成功'));
            emit('pageReload', 'reload')
        }else{
        } else {
            message.error(result.msg);
        }
    })

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

@@ -89,7 +89,10 @@
        }

        wrapper.in(Order::getOrderType, types);
        wrapper.isNull(Order::getWaveId);

        if (map.containsKey("orderOut")) {
            wrapper.isNull(Order::getWaveId);
        }

        if (!Cools.isEmpty(condition)) {
            wrapper.and(wrapper1 -> {