From 6494d25e5677f2e81c898006b3aada6260511f33 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期四, 24 七月 2025 09:41:32 +0800
Subject: [PATCH] #

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

diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index c540ab9..5a3ffde 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -138,10 +138,13 @@
                         combMat.setAnfme(orderDetl.getAnfme() - orderDetl.getWorkQty());
                         combMat.setMaktx(orderDetl.getMaktx());
                         combMat.setSpecs(orderDetl.getSpecs());
+                        combMat.setDetId(orderDetl.getDetId());
+                        combMat.setDetlId(orderDetl.getId());
                         combMats.add(combMat);
                     }
                     combParam.setCombMats(combMats);
                 }
+                combParam.setBillNo(order.getOrderNo());
                 combParam.setOrderNo(order.getOrderNo());
                 combParams.add(combParam);
             }
@@ -165,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="鐩樼偣鍏ュ簱")

--
Gitblit v1.9.1