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 | 20 +++++++-------------
1 files changed, 7 insertions(+), 13 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 d95c320..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
@@ -48,10 +48,13 @@
@RequestMapping(value = "/locDetl/forlocNo/auth/v1")
@ManagerAuth
- public R forlocNoV1(@RequestParam String locNo) {
+ public R forlocNoV1(@RequestParam String locNo,@RequestParam String matnr) {
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("鏈煡璇㈠埌搴撳瓨鏁版嵁");
@@ -150,12 +153,6 @@
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
QueryWrapper<LocDetl> wrapper = new QueryWrapper<>();
- Object barcode = null;
- if (!Cools.isEmpty(param.get("barcode"))) {
- barcode = param.get("barcode");
- }
- param.remove("zpallet");
- param.remove("barcode");
if (!Cools.isEmpty(param.get("decrees"))) {
ArrayList<String> mats = new ArrayList<>();
@@ -167,7 +164,6 @@
mats.add(mat.getMatnr());
}
}
-
wrapper.in("matnr", mats);
param.remove("decrees");
}
@@ -183,18 +179,16 @@
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(barcode)) {
- wrapper.eq("zpallet", barcode);
+ if (!Cools.isEmpty(param.get("zpallet"))) {
+ wrapper.like("zpallet", param.get("zpallet"));
}
if (!Cools.isEmpty(orderByField)){
wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
}
-
-
param.remove("locNo");
param.remove("owner");
--
Gitblit v1.9.1