From 3d083e6b0799a075481323a57a67e6a9f6c56ed7 Mon Sep 17 00:00:00 2001
From: ZY <zc857179121@qq.com>
Date: 星期五, 23 八月 2024 10:17:44 +0800
Subject: [PATCH] 12
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 88 ++++++++++++++++++++++++++++++++++----------
1 files changed, 68 insertions(+), 20 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 9b722b2..a69fc16 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -13,11 +13,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
-import com.zy.asrs.entity.MatCode;
+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.MatCodeService;
-import com.zy.asrs.utils.VersionUtils;
+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;
import org.springframework.web.bind.annotation.*;
@@ -32,8 +34,11 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -79,10 +84,14 @@
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,
@@ -90,13 +99,37 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param){
- excludeTrash(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");
+// }
+// }
+ Object query_date = param.get("query_date");
+ param.remove("query_date");
+ 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 +"%'");
+// }
+ 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()){
@@ -157,7 +190,22 @@
List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
Map<String, Object> map = excludeTrash(param.getJSONObject("locDetl"));
+ String row = "";
+ if (map.get("row") != null) {
+ String chooseRow = (String) map.get("row");
+ if (chooseRow.length() == 1) {
+ row = "0" + chooseRow;
+ map.remove("row");
+ }else {
+ row = chooseRow;
+ map.remove("row");
+ }
+ }
convert(map, wrapper);
+ if (!row.equals("")){
+ wrapper.and()
+ .where("loc_no like '" +row +"%'");
+ }
List<LocDetl> list = locDetlService.selectList(wrapper);
return R.ok(exportSupport(list, fields));
}
@@ -188,22 +236,12 @@
return R.ok();
}
-
- @Autowired
- private MatCodeService matCodeService;
-
@RequestMapping(value = "/locDetl/statis/auth")
@ManagerAuth
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()) {
- MatCode matCode = matCodeService.selectById(locDetl.getMatnr());
- if (matCode != null) {
- VersionUtils.setLocDetl(locDetl, matCode);
- }
- }
+ Page<StockStatisDTO> stockStatis = locDetlService.getStockStatis(toPage(curr, limit, param, StockStatisDTO.class));
return R.ok().add(stockStatis);
}
@@ -215,9 +253,9 @@
public void statisExport(HttpServletResponse response) throws IOException {
List<LocDetl> excel = LocDetlMapper.getStockStatisExcel();
for (LocDetl locDetl : excel) {
- MatCode matCode = matCodeService.selectById(locDetl.getMatnr());
- if (matCode != null) {
- VersionUtils.setLocDetl(locDetl, matCode);
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
}
}
response.setContentType("application/vnd.ms-excel");
@@ -230,4 +268,14 @@
.doWrite(excel);
}
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/count")
+ public R getAllCount(){
+ Integer sum = locDetlService.sum();
+ return R.ok(sum);
+ }
+
}
--
Gitblit v1.9.1