From 8d90833250abee5951572659e9a192f2487cd704 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 03 十一月 2025 09:30:52 +0800
Subject: [PATCH] 标准wms2.0
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 54 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 43 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 4e377e6..25c6f50 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -1,5 +1,6 @@
package com.zy.asrs.controller;
+import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
import com.core.common.Cools;
@@ -25,11 +26,11 @@
@RequestMapping(value = "/manLocDetl/list/auth")
@ManagerAuth
- public R list(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R list(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
Long hostId = getHostId();
if (hostId != null) {
param.put("host_id", hostId);
@@ -44,7 +45,7 @@
tagId = getOriginTag().getId();
param.put("tag_id", String.valueOf(tagId));
}
- if (!Cools.isEmpty(param.get("update_time"))){
+ if (!Cools.isEmpty(param.get("update_time"))) {
String val = String.valueOf(param.get("update_time"));
if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
@@ -58,11 +59,11 @@
@RequestMapping("/manLocDetl/list")
- public R outList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam(required = false)String orderByField,
- @RequestParam(required = false)String orderByType,
- @RequestParam Map<String, Object> param){
+ public R outList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam(required = false) String orderByField,
+ @RequestParam(required = false) String orderByType,
+ @RequestParam Map<String, Object> param) {
Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
Page<ManLocDetl> outPage = manLocDetlService.getOutPage(manLocDetlPage);
@@ -77,5 +78,36 @@
return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
+ @RequestMapping(value = "/manLocDetl/asrsAndSaas/list")
+ @ManagerAuth
+ public R list(@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 Map<String, Object> param) {
+
+ Page<ManLocDetl> manLocDetlPage = toPage(curr, limit, param, ManLocDetl.class);
+ Page<ManLocDetl> all = manLocDetlService.selectAllPage(manLocDetlPage);
+ return R.ok().add(all);
+ }
+
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
+ String val = String.valueOf(entry.getValue());
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
+ wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
+ } else {
+ if (entry.getKey().equals("locNo")) {
+ wrapper.eq("loc_no", String.valueOf(entry.getValue()));
+ } else {
+ wrapper.like(entry.getKey(), String.valueOf(entry.getValue()));
+ }
+ }
+ }
+ }
+
}
--
Gitblit v1.9.1