From 469d41fe09ceec3dc5259d01a4060aac1448e09f Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期三, 03 九月 2025 09:59:34 +0800
Subject: [PATCH] 完善订单组托可用数据显示功能
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/LocDetlController.java | 19 +++++++++++++------
1 files changed, 13 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 0677f79..574073c 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,14 @@
@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());
+ public R forlocNoV1(@RequestParam String locNo ,@RequestParam(required = false) String matnr) {
+
+ LambdaQueryWrapper<LocDetl> locDetlLambdaQueryWrapper = new LambdaQueryWrapper<LocDetl>();
+ locDetlLambdaQueryWrapper.eq(LocDetl::getLocNo, locNo);
+ locDetlLambdaQueryWrapper.eq(LocDetl::getHostId, getHostId());
+ if(!Cools.isEmpty(matnr)){
+ locDetlLambdaQueryWrapper.like(LocDetl::getMatnr, matnr);
+ }
List<LocDetl> detls = locDetlService.list(locDetlLambdaQueryWrapper);
if (Cools.isEmpty(detls)){
return R.error("鏈煡璇㈠埌搴撳瓨鏁版嵁");
@@ -109,8 +113,11 @@
List<LocDetl> locDetls=new ArrayList<>();
for (LocDetl l:list
) {
- String new_String = l.getMatnr().replace("\"","");
- l.setMatnr(new_String);
+ if(Cools.isEmpty(l.getMaktx())){
+ continue;
+ }
+ String new_String = l.getMaktx().replace("\"","");
+ l.setMaktx(new_String);
locDetls.add(l);
}
return R.ok(exportSupport(locDetls, fields));
--
Gitblit v1.9.1