From a9f4a820c583eb85cec381b6236063256f753652 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 02 八月 2025 14:53:02 +0800
Subject: [PATCH] 完善和新增多次拣料
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java | 2 +-
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 12 ++++++++----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
index 34d0e0c..574073c 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java
@@ -48,10 +48,14 @@
@RequestMapping(value = "/locDetl/forlocNo/auth/v1")
@ManagerAuth
- public R forlocNoV1(@RequestParam String locNo) {
- LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>()
- .eq(LocDetl::getLocNo, locNo)
- .eq(LocDetl::getHostId, getHostId());
+ public R forlocNoV1(@RequestParam String locNo ,@RequestParam(required = false) String matnr) {
+
+ LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>();
+ locDetlLambdaQueryWrapper.eq(LocDetl::getLocNo, locNo);
+ locDetlLambdaQueryWrapper.eq(LocDetl::getHostId, getHostId());
+ if(!Cools.isEmpty(matnr)){
+ locDetlLambdaQueryWrapper.like(LocDetl::getMatnr, matnr);
+ }
List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
if (Cools.isEmpty(detls)){
return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
index 10d6f7c..29de0a6 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/MobileController.java
@@ -761,7 +761,7 @@
@RequestMapping("/barcode/list/pick")
@ManagerAuth(memo = "鎷ｆ枡鍏ュ簱閫斾腑骞舵澘")
@Transactional
- public R orderOutListOrderPick(@RequestBody String barcode) {
+ public R orderOutListOrderPick(@RequestBody(required = false) String barcode) {
ArrayList<WrkMast> wrkMastArrayList = new ArrayList<>();
if (Cools.isEmpty(barcode) || barcode.isEmpty()) {
List<WrkMast> wrkMasts = wrkMastService.list(new LambdaQueryWrapper<WrkMast>()
--
Gitblit v1.9.1