From 0ca20358762c96534dd068cc19a86da1842adff6 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期三, 30 十月 2024 13:37:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/nbncasrs' into nbncasrs
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 30 ++++++++++--------------------
1 files changed, 10 insertions(+), 20 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 1e09cae..e85fac5 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
@@ -49,27 +49,17 @@
@RequestMapping(value = "/locDetl/forlocNo/auth/v1")
@ManagerAuth
public R forlocNoV1(@RequestParam String locNo,@RequestParam String matnr) {
- if(Cools.isEmpty(matnr)){
- LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>()
- .eq(LocDetl::getLocNo, locNo)
- .eq(LocDetl::getHostId, getHostId());
- List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
- if (Cools.isEmpty(detls)){
- return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
- }
- return R.ok(detls);
- }else{
- LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>()
- .eq(LocDetl::getLocNo, locNo)
- .eq(LocDetl::getHostId, getHostId())
- .like(LocDetl::getMatnr,matnr);
- List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
- if (Cools.isEmpty(detls)){
- return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
- }
- return R.ok(detls);
+ LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>()
+ .eq(LocDetl::getLocNo, locNo)
+ .eq(LocDetl::getHostId, getHostId());
+ if (!Cools.isEmpty(matnr)) {
+ locDetlLambdaQueryWrapper.eq(LocDetl::getMatnr, matnr);
}
-
+ List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
+ if (Cools.isEmpty(detls)){
+ return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
+ }
+ return R.ok(detls);
}
@RequestMapping(value = "/locDetl/forlocNo/auth")
--
Gitblit v1.9.1