zy-asrs-admin/src/views/out/orderOut/index.vue | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/OrderController.java | ●●●●● 补丁 | 查看 | 原始文档 | 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 -> {