From c8ffad2a1b5d278824aa2650a4ff461ec738af9f Mon Sep 17 00:00:00 2001
From: 李天宇 <876263681@qq.com>
Date: 星期四, 07 十一月 2024 22:00:31 +0800
Subject: [PATCH] #update
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 31 +++++++++++++------------------
1 files changed, 13 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 32c72fd..c49612c 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,11 +13,9 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.ManLocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
-import com.zy.asrs.service.ManLocDetlService;
import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
@@ -69,6 +67,18 @@
return R.parse(BaseRes.EMPTY);
}
+ @GetMapping (value = "/locDetl/pageList/auth")
+ @ManagerAuth(memo = "鍒嗛〉鏌ヨ搴撳瓨鏄庣粏")
+ public R pageList(@RequestParam Map<String,Object> param){
+ if (Cools.isEmpty(param.get("locNo"))){
+ return new R(201,"");
+ }
+ Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(Integer.parseInt((String) param.get("curr"))
+ , Integer.parseInt((String) param.get("limit"))), new EntityWrapper<LocDetl>().eq("loc_no", param.get("locNo")));
+
+ return R.ok(locDetlPage);
+ }
+
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
@@ -86,7 +96,7 @@
return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
}
- @RequestMapping(value = "/error/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
+ @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -94,26 +104,11 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
-// String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
-// if (param.get("row") != null) {
-// String chooseRow = (String) param.get("row");
-// if (chooseRow.length() == 1) {
-// row = "0" + chooseRow;
-// param.remove("row");
-// }else {
-// row = chooseRow;
-// param.remove("row");
-// }
-// }
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
if (!Cools.isEmpty(orderByField)){wrapper.orderBy(humpToLine(orderByField), "asc".equals(orderByType));}
-// if (!row.equals("")){
-// wrapper.and()
-// .where("loc_no like '" +row +"%'");
-// }
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
--
Gitblit v1.9.1