From 676cbdde86ae8ea598be6e9f6776ae5bf67478f6 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期二, 19 十一月 2024 13:49:14 +0800
Subject: [PATCH] 完善訂單,添加出库订单

---
 zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
index 9cf3197..3b12b4c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/WrkMastController.java
@@ -40,8 +40,21 @@
         excludeTrash(param);
         QueryWrapper<WrkMast> wrapper = new QueryWrapper<>();
         wrapper.eq("host_id",getHostId());
-        System.out.println(param);
+        wrapper.orderByDesc("io_pri");
         convert(param, wrapper);
+
+        if (!Cools.isEmpty(condition)) {
+            wrapper.and(item -> {
+                item.like("wrk_no", condition)
+                        .or().like("wrk_sts", condition)
+                        .or().like("sta_no", condition)
+                        .or().like("source_sta_no", condition)
+                        .or().like("loc_no", condition)
+                        .or().like("barcode",condition)
+                        .or().like("source_loc_no", condition);
+            });
+        }
+
         return R.ok(wrkMastService.page(new Page<>(curr, limit), wrapper));
     }
     private <T> void convert(Map<String, Object> map, QueryWrapper<T> wrapper){

--
Gitblit v1.9.1