From a15ad9309f383153d4f5a95a044fb19e882fff55 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期五, 18 七月 2025 15:19:52 +0800
Subject: [PATCH] 平库组库功能优化
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java | 19 +++++++++++++------
1 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
index 7c05460..bd1e650 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/controller/LocDetlController.java
@@ -22,6 +22,7 @@
import com.zy.asrs.wms.asrs.service.LocDetlService;
import com.zy.asrs.wms.system.controller.BaseController;
import com.zy.asrs.wms.utils.ExcelUtil;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
@@ -46,10 +47,16 @@
@PostMapping("/locDetl/page")
@CacheData(tableName = {"man_loc_detl"})
public R page(@RequestBody Map<String, Object> map) {
+// String orderType = null;
+// if (Objects.isNull(map.get("orderType"))) {
+// orderType = map.get("orderType").toString();
+// map.remove("orderType");
+// }
BaseParam baseParam = buildParam(map, BaseParam.class);
PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);
PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, pageParam.buildWrapper(true));
- return R.ok().add(data);
+
+ return R.ok(data);
}
@PreAuthorize("hasAuthority('asrs:locDetl:list')")
@@ -60,11 +67,11 @@
PageParam<ViewLocDetl, BaseParam> pageParam = new PageParam<>(baseParam, ViewLocDetl.class);
QueryWrapper<ViewLocDetl> queryWrapper = pageParam.buildWrapper(true);
- List<Long> locIds = locService.listBySts(LocStsType.F.val());
- if (locIds.isEmpty()) {
- locIds.add(-1L);
- }
- queryWrapper.in("loc_id", locIds);
+// List<Long> locIds = locService.listBySts(LocStsType.F.val());
+// if (locIds.isEmpty()) {
+// locIds.add(-1L);
+// }
+// queryWrapper.in("loc_id", locIds);
PageParam<ViewLocDetl, BaseParam> data = locDetlService.getPage(pageParam, queryWrapper);
return R.ok().add(data);
}
--
Gitblit v1.9.1