From 2c49107618d24e630f95213ef5a1d9e5ffe65789 Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期二, 03 九月 2024 12:29:08 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 40 +++++++++++++++++++++-------------------
1 files changed, 21 insertions(+), 19 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index eaa6577..a69fc16 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,9 +13,12 @@
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.entity.StockStatisDTO;
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;
@@ -31,6 +34,7 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
@@ -80,25 +84,21 @@
param.remove("modi_time");
}
}
- return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+ Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ if (stockOut.getRecords().size()==0){
+ stockOut = locDetlService.getStockOut(toPage(1, limit, param, LocDetl.class));
+ }
+ return R.ok(stockOut);
}
- @RequestMapping(value = "/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,
@RequestParam(required = false)String orderByField,
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
- @RequestParam Map<String, Object> param,
- @RequestParam(required = false)Boolean unreason){
- if (unreason) {
-
- return R.ok(locDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<LocDetl>()
- .where(" DATALENGTH( batch ) != 11 or\n" +
- " batch LIKE '%[a-z]%'")));
- }
- param.remove("unreason");
+ @RequestParam Map<String, Object> param){
// String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
// if (param.get("row") != null) {
@@ -111,6 +111,8 @@
// param.remove("row");
// }
// }
+ Object query_date = param.get("query_date");
+ param.remove("query_date");
excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
@@ -119,9 +121,15 @@
// wrapper.and()
// .where("loc_no like '" +row +"%'");
// }
-
+ if (query_date!=null){
+ if (query_date.toString().contains(" - ")) {
+ String[] dates = query_date.toString().split(" - ");
+ wrapper.ge("appe_time", dates[0]).le("appe_time",dates[1]);
+ }
+ }
return R.ok(locDetlService.selectPage(new Page<>(curr, limit), wrapper));
}
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -233,13 +241,7 @@
public R statis(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param) {
- Page<LocDetl> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, LocDetl.class));
- for (LocDetl locDetl : stockStatis.getRecords()) {
- Mat mat = matService.selectByMatnr(locDetl.getMatnr());
- if (mat != null) {
- locDetl.sync(mat);
- }
- }
+ Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class));
return R.ok().add(stockStatis);
}
--
Gitblit v1.9.1