From ff3f9231a3f06023b6d7768233f9016a7f08661e Mon Sep 17 00:00:00 2001
From: cp <513960435@qq.com>
Date: 星期四, 19 九月 2024 13:45:47 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 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..d95c320 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) {
@@ -137,6 +150,12 @@
@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,13 +186,18 @@
wrapper.eq("loc_no", param.get("locNo"));
}
+ if (!Cools.isEmpty(barcode)) {
+ wrapper.eq("zpallet", barcode);
+ }
+
if (!Cools.isEmpty(orderByField)){
wrapper.orderBy(true, "asc".equals(orderByType), humpToLine(orderByField));
}
+
+
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