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 | 32 +++++++++++++++++++++++++++++---
1 files changed, 29 insertions(+), 3 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 3f188ed..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
@@ -46,6 +46,22 @@
return R.ok(detls);
}
+ @RequestMapping(value = "/locDetl/forlocNo/auth/v1")
+ @ManagerAuth
+ 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("鏈煡璇㈠埌搴撳瓨鏁版嵁");
+ }
+ 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) {
@@ -101,6 +117,8 @@
if(Cools.eq(entry.getKey(),"curr")
|| Cools.eq(entry.getKey(),"limit")
|| Cools.eq(entry.getKey(),"unreason")
+ || Cools.eq(entry.getKey(),"orderByField")
+ || Cools.eq(entry.getKey(),"orderByType")
|| Cools.eq(entry.getKey(),"row")
|| Cools.eq(entry.getKey(),"condition")){
continue;
@@ -129,6 +147,8 @@
@ManagerAuth
public R page(@RequestParam(defaultValue = "1") Integer curr,
@RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false)String orderByField,
+ @RequestParam(required = false)String orderByType,
@RequestParam(required = false) String condition,
@RequestParam(required = false) String timeRange,
@RequestParam Map<String, Object> param) {
@@ -144,7 +164,6 @@
mats.add(mat.getMatnr());
}
}
-
wrapper.in("matnr", mats);
param.remove("decrees");
}
@@ -160,12 +179,19 @@
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)){
+ 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