From 51889b97a85b070cbb80a5bb2893149c80448d5d Mon Sep 17 00:00:00 2001
From: 1 <1>
Date: 星期二, 30 十二月 2025 16:31:15 +0800
Subject: [PATCH] #导出优化
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 281 +++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 237 insertions(+), 44 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index 553be70..ad44284 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -12,15 +12,22 @@
import com.core.common.Cools;
import com.core.common.DateUtils;
import com.core.common.R;
+import com.zy.asrs.entity.FrozenParam;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocOwner;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.param.AbnormalLocDetlParam;
+import com.zy.asrs.entity.param.ExportParam;
+import com.zy.asrs.entity.result.LocDetlAll;
+import com.zy.asrs.entity.result.LocDetlDTO;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.LocOwnerService;
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.*;
-
+import org.springframework.util.StringUtils;
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.net.URLEncoder;
@@ -31,10 +38,14 @@
@Autowired
private LocDetlService locDetlService;
+
@Autowired
private LocDetlMapper locDetlMapper;
@Autowired
private MatService matService;
+
+ @Autowired
+ private LocOwnerService locOwnerService;
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -42,6 +53,77 @@
return R.error();
}
return R.ok();
+ }
+
+ @RequestMapping(value = "/locDetl/groupLocList/auth")
+ @ManagerAuth
+ public R groupLocList(@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) {
+
+// List<LocDetl> result = new ArrayList<>();
+ List<AbnormalLocDetlParam> result = new ArrayList<>();
+// excludeTrash(param);
+ param.put("curr", curr);
+ param.put("limit", limit);
+ Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(toPage(1, 10000, param, LocDetl.class));
+// List<LocDetl> groupLocDetl = locDetlService.selectGroupPage(param, curr, limit);
+ for (LocDetl locDetl : groupLocDetl.getRecords()) {
+ AbnormalLocDetlParam abnormalLocDetlParam = new AbnormalLocDetlParam();
+ Mat mat = matService.selectOne(new EntityWrapper<Mat>()
+ .eq("matnr", locDetl.getMatnr()));
+ if (Cools.isEmpty(mat)) {
+ continue;
+ }
+
+
+ if (!Cools.isEmpty(mat.getStoreMax()) || !Cools.isEmpty(mat.getStoreMin())) {
+ abnormalLocDetlParam.setStoreMax(mat.getStoreMax());
+ abnormalLocDetlParam.setStoreMaxDate(mat.getStoreMaxDate());
+ abnormalLocDetlParam.setStoreMin(mat.getStoreMin());
+ abnormalLocDetlParam.setAnfme(locDetl.getAnfme());
+ abnormalLocDetlParam.setMaktx(mat.getMaktx());
+ abnormalLocDetlParam.setMatnr(mat.getMatnr());
+ abnormalLocDetlParam.setSpecs(mat.getSpecs());
+ abnormalLocDetlParam.setBatch(locDetl.getBatch());
+
+// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
+// Date maxDate = simple.parse(locDetl.getBatch());
+// long time = maxDate.getTime();
+// Date now = new Date();
+// long time1 = now.getTime();
+// abnormalLocDetlParam.setNowTime((int) ((time1 - time) / (1000 * 60 * 60 * 24)));
+
+ if (!Cools.isEmpty(mat.getStoreMax()) && locDetl.getAnfme() > mat.getStoreMax()) {
+ result.add(abnormalLocDetlParam);
+ } else if (!Cools.isEmpty(mat.getStoreMin()) && locDetl.getAnfme() < mat.getStoreMin()) {
+ result.add(abnormalLocDetlParam);
+ }
+ }
+ }
+
+ Page<AbnormalLocDetlParam> locDetlPage = new Page<>();
+ locDetlPage.setRecords(paging(result, curr, limit));
+ locDetlPage.setTotal(result.size());
+ locDetlPage.setCurrent(curr);
+ locDetlPage.setSize(limit);
+ return R.ok(locDetlPage);
+ }
+
+ private List<AbnormalLocDetlParam> paging(List<AbnormalLocDetlParam> result, Integer curr, Integer limit) {
+ List<AbnormalLocDetlParam> pageRecord = new ArrayList<AbnormalLocDetlParam>();
+ int minIndex = (curr - 1) * limit;
+ int maxIndex = (curr * limit) - 1;
+ if (result.size() < maxIndex) {
+ maxIndex = result.size();
+ }
+ for (int i = minIndex; i < maxIndex; i++) {
+ pageRecord.add(result.get(i));
+ }
+ return pageRecord;
}
@RequestMapping(value = "/locDetl/{id}/auth")
@@ -80,48 +162,44 @@
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");
- String row = "";
+ @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");
- }
- }
+// 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 +"%'");
- }
-
+// if (!row.equals("")){
+// wrapper.and()
+// .where("loc_no like '" +row +"%'");
+// }
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()){
@@ -176,6 +254,26 @@
return R.ok();
}
+ @PostMapping(value = "/locDetl/frozenInventory")
+ @ManagerAuth(memo = "搴撳瓨鍐荤粨")
+ public R frozen(@RequestBody List<FrozenParam> param){
+ if (param.size() == 0) {
+ return R.parse("鏈敹鍒版暟鎹�");
+ }
+
+ return locDetlService.frozenInventory(param);
+ }
+
+ @PostMapping(value = "/locDetl/unfreezeInventory")
+ @ManagerAuth(memo = "搴撳瓨瑙ｅ喕")
+ public R unfreeze(@RequestBody List<FrozenParam> param){
+ if (param.size() == 0) {
+ return R.parse("鏈敹鍒版暟鎹�");
+ }
+
+ return locDetlService.unfreezeInventory(param);
+ }
+
@RequestMapping(value = "/locDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
public R export(@RequestBody JSONObject param){
@@ -188,18 +286,85 @@
if (chooseRow.length() == 1) {
row = "0" + chooseRow;
map.remove("row");
- }else {
+ } else {
row = chooseRow;
map.remove("row");
}
}
convert(map, wrapper);
- if (!row.equals("")){
+ if (!row.equals("")) {
wrapper.and()
- .where("loc_no like '" +row +"%'");
+ .where("loc_no like '" + row + "%'");
}
List<LocDetl> list = locDetlService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
+ List<LocDetl> result = new ArrayList<>();
+ for (LocDetl locDetl : list) {
+ result.add(locDetl);
+ }
+ return R.ok(exportSupport(result, fields));
+ }
+//
+// @RequestMapping(value = "/locDetl/statis/export/auth")
+// @ManagerAuth(memo = "搴撳瓨缁熻瀵煎嚭锛堝綋鍓嶇瓫閫夋潯浠讹級")
+// public R statisExport(@RequestBody JSONObject json) {
+// // 鑾峰彇鍓嶇浼犵殑瀛楁鍒楄〃
+// List<String> fields = JSONObject.parseArray(json.getJSONArray("fields").toJSONString(), String.class);
+//
+// // 鑾峰彇鎼滅储鍙傛暟锛岃浆鎴� DTO
+// ExportParam param = json.getJSONObject("locDetl").toJavaObject(ExportParam.class);
+//
+// // 鐩存帴璋冪敤 Mapper 鏂规硶锛堝叏閲忔暟鎹紝涓嶅垎椤碉級
+// List<LocDetl> list = locDetlMapper.selectStatisForExport(param);
+//
+// // 瀵煎嚭
+// return R.ok(exportSupport(list, fields));
+// }
+
+ @RequestMapping(value = "/locDetl/selectOwner/list/auth")
+ @ManagerAuth
+ public R selectOwnerlist(@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){
+ Integer owner = null;
+ if (param.get("owner$") != null && param.get("owner$") != ""){
+ LocOwner locOwner = locOwnerService.selectOne(new EntityWrapper<LocOwner>().like("owner", (String) param.get("owner$")));
+ if(locOwner == null){
+ return R.error("鍙傛暟鏈夎锛�");
+ }
+ param.remove("owner$");
+ owner = locOwner.getId();
+ }
+
+ LocDetlDTO locDetlDTO = new LocDetlDTO();
+ locDetlDTO.setPageSize(limit);
+ locDetlDTO.setPageNumber(curr);
+ String locNo = String.valueOf(param.get("locNo"));
+ String matnr = String.valueOf(param.get("matnr"));
+ if (!Cools.isEmpty(locNo) && !locNo.equals("null")) {
+ locDetlDTO.setLocNo(locNo);
+ }
+ if (!Cools.isEmpty(matnr) && !matnr.equals("null")) {
+ locDetlDTO.setMatnr(matnr);
+ }
+ if (!Cools.isEmpty(owner) && !owner.equals("null")) {
+ locDetlDTO.setOwner(owner);
+ }
+ List<LocDetlAll> list = locDetlService.selectAllOwner(locDetlDTO);
+ int count = locDetlService.selectAllCount(locDetlDTO);
+ Page<LocDetlAll> page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ if (list.size()==0){
+ locDetlDTO.setPageNumber(1);
+ list = locDetlService.selectAllOwner(locDetlDTO);
+ count = locDetlService.selectAllCount(locDetlDTO);
+ page = new Page<>();
+ page.setRecords(list);
+ page.setTotal(count);
+ }
+ return R.ok(page);
}
@RequestMapping(value = "/locDetlQuery/auth")
@@ -242,29 +407,57 @@
}
return R.ok().add(stockStatis);
}
+ @RequestMapping(value = "/locDetl/statis/export/auth")
+ @ManagerAuth(memo = "搴撳瓨缁熻瀵煎嚭")
+ public R statisExport(@RequestBody JSONObject json) {
+ // 鑾峰彇鎼滅储鍙傛暟
+ ExportParam param = json.getJSONObject("locDetl").toJavaObject(ExportParam.class);
- @Autowired
- private LocDetlMapper LocDetlMapper;
+ // 鏌ヨ鍏ㄩ噺姹囨�绘暟鎹�
+ List<LocDetl> list = locDetlMapper.selectStockStatisExport(param);
- @RequestMapping(value = "/locDetl/statis/export")
-// @ManagerAuth
- public void statisExport(HttpServletResponse response) throws IOException {
- List<LocDetl> excel = LocDetlMapper.getStockStatisExcel();
- for (LocDetl locDetl : excel) {
+ // 鍚屾鐗╂枡淇℃伅锛堜繚鎸佸師鏈夐�昏緫锛�
+ for (LocDetl locDetl : list) {
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
locDetl.sync(mat);
}
}
+
+ // 鐩存帴杩斿洖 JSON 鏁版嵁鏁扮粍
+ return R.ok(list); // 鎴� R.ok().put("data", list)
+ }
+ private void exportExcel(HttpServletResponse response, List<LocDetl> list, List<String> fields, String fileName) throws Exception {
response.setContentType("application/vnd.ms-excel");
response.setCharacterEncoding("utf-8");
- String fileName = URLEncoder.encode("搴撳瓨鏄庣粏缁熻鎶ヨ〃", "UTF-8");
- response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode(fileName + ".xlsx", "UTF-8"));
+
EasyExcel.write(response.getOutputStream(), LocDetl.class)
- .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
- .sheet("琛�1")
- .doWrite(excel);
+ .sheet("搴撳瓨缁熻")
+ .doWrite(list);
}
+ @Autowired
+ private LocDetlMapper LocDetlMapper;
+
+// @RequestMapping(value = "/locDetl/statis/export")
+//// @ManagerAuth
+// public void statisExport(HttpServletResponse response) throws IOException {
+// List<LocDetl> excel = LocDetlMapper.getStockStatisExcel();
+// for (LocDetl locDetl : excel) {
+// Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+// if (mat != null) {
+// locDetl.sync(mat);
+// }
+// }
+// response.setContentType("application/vnd.ms-excel");
+// response.setCharacterEncoding("utf-8");
+// String fileName = URLEncoder.encode("搴撳瓨鏄庣粏缁熻鎶ヨ〃", "UTF-8");
+// response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+// EasyExcel.write(response.getOutputStream(), LocDetl.class)
+// .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+// .sheet("琛�1")
+// .doWrite(excel);
+// }
/**
* 鑾峰彇搴撳瓨鎬绘暟
--
Gitblit v1.9.1