From e400c6f84ad6e777ae32597d01eb2d0fd79f5e56 Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 21 十一月 2024 15:58:17 +0800
Subject: [PATCH] 完善
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 27 +++++++++++++++++++++------
1 files changed, 21 insertions(+), 6 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 3d6f303..35c5b2c 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
@@ -46,6 +46,19 @@
return R.ok(detls);
}
+ @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());
+ List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
+ if (Cools.isEmpty(detls)){
+ return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
+ }
+ return R.ok(detls);
+ }
+
@RequestMapping(value = "/locDetl/forlocNo/auth")
@ManagerAuth
public R forlocNo(@RequestParam String orderNo,@RequestParam String locNo,@RequestParam String batch,@RequestParam String matnr) {
@@ -53,9 +66,9 @@
.eq(LocDetl::getLocNo, locNo)
.eq(LocDetl::getHostId, getHostId())
.eq(LocDetl::getMatnr, matnr);
- if (!Cools.isEmpty(batch)){
- locDetlLambdaQueryWrapper.eq(LocDetl::getBatch,batch);
- }
+// if (!Cools.isEmpty(batch)){
+// locDetlLambdaQueryWrapper.eq(LocDetl::getBatch,batch);
+// }
List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
if (Cools.isEmpty(detls)){
return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
@@ -148,7 +161,6 @@
mats.add(mat.getMatnr());
}
}
-
wrapper.in("matnr", mats);
param.remove("decrees");
}
@@ -164,7 +176,11 @@
wrapper.le("appe_time", DateUtils.convert(range[1]));
}
if (!Cools.isEmpty(param.get("locNo"))) {
- wrapper.eq("loc_no", param.get("locNo"));
+ wrapper.like("loc_no", param.get("locNo"));
+ }
+
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
}
if (!Cools.isEmpty(orderByField)){
@@ -173,7 +189,6 @@
param.remove("locNo");
param.remove("owner");
- param.remove("zpallet");
param.remove("matnr");
allLike(LocDetl.class, param.keySet(), wrapper, condition);
return R.ok(locDetlService.page(new Page<>(curr, limit), wrapper));
--
Gitblit v1.9.1