From c715703c903ae6b47bb17684b4c27fa345921cf2 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期二, 08 七月 2025 09:37:04 +0800
Subject: [PATCH] #pda订单下拉选择

---
 src/main/resources/mapper/OrderMapper.xml                    |   11 +++++++++++
 src/main/java/com/zy/asrs/service/OrderService.java          |    1 +
 src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java |    5 ++++-
 src/main/java/com/zy/asrs/mapper/OrderMapper.java            |    1 +
 src/main/java/com/zy/asrs/controller/MobileController.java   |   12 ++++++++++++
 src/main/resources/license.lic                               |    0 
 6 files changed, 29 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 1081145..5a3ffde 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -168,6 +168,18 @@
         mobileService.comb(combParam, getUserId());
         return R.ok("缁勬墭鎴愬姛");
     }
+    @RequestMapping("/order/search/orderNoList/auth")
+    @ManagerAuth
+    public R orderSearchList(@RequestParam String orderNo) {
+        if (Cools.isEmpty(orderNo)) {
+            orderNo = null;
+        }
+        List<Order> orders = orderService.selectorderNoL2(orderNo);
+        if (Cools.isEmpty(orders)) {
+            return R.ok();
+        }
+        return R.ok().add(orders);
+    }
 
     @RequestMapping("/pickIn/auth")
 //    @ManagerAuth(memo="鐩樼偣鍏ュ簱")
diff --git a/src/main/java/com/zy/asrs/mapper/OrderMapper.java b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
index c975faf..a1c7b08 100644
--- a/src/main/java/com/zy/asrs/mapper/OrderMapper.java
+++ b/src/main/java/com/zy/asrs/mapper/OrderMapper.java
@@ -20,6 +20,7 @@
     int addToLogTable(Order order);
 
     List<Order> selectorderNoL(@Param("orderNo")String orderNo);
+    List<Order> selectorderNoL2(@Param("orderNo")String orderNo);
 
     Order selectOrderMoveStatus();
     Order selectOrderMoveStatusInitial();
diff --git a/src/main/java/com/zy/asrs/service/OrderService.java b/src/main/java/com/zy/asrs/service/OrderService.java
index af6ff2c..2aae35d 100644
--- a/src/main/java/com/zy/asrs/service/OrderService.java
+++ b/src/main/java/com/zy/asrs/service/OrderService.java
@@ -28,6 +28,7 @@
     boolean addToLogTable(Order order);
 
     List<Order> selectorderNoL(String orderNo);
+    List<Order> selectorderNoL2(String orderNo);
 
     Order selectOrderMoveStatus();
     Order selectOrderMoveStatusInitial();
diff --git a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
index ca68042..d20ce26 100644
--- a/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
+++ b/src/main/java/com/zy/asrs/service/impl/OrderServiceImpl.java
@@ -154,7 +154,10 @@
     public List<Order> selectorderNoL(String orderNo) {
         return this.baseMapper.selectorderNoL(orderNo);
     }
-
+    @Override
+    public List<Order> selectorderNoL2(String orderNo) {
+        return this.baseMapper.selectorderNoL2(orderNo);
+    }
     @Override
     public Order selectOrderMoveStatus() {
         return this.baseMapper.selectOrderMoveStatus();
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index c9e9181..738a643 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
diff --git a/src/main/resources/mapper/OrderMapper.xml b/src/main/resources/mapper/OrderMapper.xml
index d74bcb9..b8f4354 100644
--- a/src/main/resources/mapper/OrderMapper.xml
+++ b/src/main/resources/mapper/OrderMapper.xml
@@ -109,6 +109,17 @@
             and order_no = #{orderNo}
         </if>
     </select>
+    <select id="selectorderNoL2" resultMap="BaseResultMap">
+        SELECT TOP 10 *
+        FROM man_order
+        WHERE 1=1
+        <if test="orderNo != null and orderNo != ''">
+            AND order_no COLLATE Chinese_PRC_CI_AS LIKE CONCAT('%', #{orderNo}, '%')
+        </if>
+        AND doc_type IN (34, 36, 37, 39, 40)
+        AND status IN (1, 2)
+        ORDER BY create_time DESC
+    </select>
 
     <select id="selectOrderMoveStatus" resultMap="BaseResultMap">
         select top 1 *

--
Gitblit v1.9.1