#
Junjie
2024-09-12 fb4e7fd8575a97467a972028a91484f71985656c
#
2个文件已修改
6 ■■■■ 已修改文件
zy-asrs-admin/src/views/out/orderOut/index.vue 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
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) {
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java
@@ -89,7 +89,10 @@
        }
        wrapper.in(Order::getOrderType, types);
        if (map.containsKey("orderOut")) {
        wrapper.isNull(Order::getWaveId);
        }
        if (!Cools.isEmpty(condition)) {
            wrapper.and(wrapper1 -> {