From 2feeab89a8c715b245b421a364713e3cc041a150 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 12 十一月 2024 14:21:50 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 162 +++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 159 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index bfc5113..5cb0385 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -11,11 +13,18 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.Mat;
+import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
+import com.zy.asrs.service.MatService;
+import com.zy.common.utils.RoleUtils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -23,6 +32,11 @@
@Autowired
private LocDetlService locDetlService;
+
+ @Autowired
+ private LocDetlMapper locDetlMapper;
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/locDetl/update")
public R update1() {
@@ -68,10 +82,71 @@
param.remove("modi_time");
}
}
- return R.ok(locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class)));
+ param.remove("curr");
+ param.remove("limit");
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ if (!Cools.isEmpty(param.get("crnNo"))) {
+ switch ((String) param.get("crnNo")) {
+ case "1": wrapper.le("SUBSTRING(loc_no, 1, 2)",4);
+ break;
+ case "2":wrapper.ge("SUBSTRING(loc_no, 1, 2)",5).le("SUBSTRING(loc_no, 1, 2)",8);
+ break;
+ case "3":wrapper.ge("SUBSTRING(loc_no, 1, 2)",9).le("SUBSTRING(loc_no, 1, 2)",12);
+ break;
+ case "4":wrapper.ge("SUBSTRING(loc_no, 1, 2)",13).le("SUBSTRING(loc_no, 1, 2)",16);
+ break;
+ case "5":
+ break;
+ case "6":
+ break;
+ case "7":wrapper.ge("SUBSTRING(loc_no, 1, 2)",17).le("SUBSTRING(loc_no, 1, 2)",37);
+ break;
+ case "8":wrapper.ge("SUBSTRING(loc_no, 1, 2)",38).le("SUBSTRING(loc_no, 1, 2)",45);
+ break;
+ case "9":wrapper.ge("SUBSTRING(loc_no, 1, 2)",46).le("SUBSTRING(loc_no, 1, 2)",53);
+ break;
+ default:
+ }
+ param.remove("crnNo");
+ }
+ convert(param, wrapper);
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+ RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
+ Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ if (locDetlPage.getRecords().size()==0){
+ locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
+ }
+ return R.ok(locDetlPage);
}
- @RequestMapping(value = "/locDetl/list/auth")
+ @RequestMapping(value = "/stock/out/crn/list/auth")
+ @ManagerAuth
+ public R crnStockOutList(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param){
+ if (!Cools.isEmpty(param.get("modi_time"))){
+ String val = String.valueOf(param.get("modi_time"));
+ if (val.contains(RANGE_TIME_LINK)) {
+ String[] dates = val.split(RANGE_TIME_LINK);
+ param.put("startTime", DateUtils.convert(dates[0]));
+ param.put("endTime", DateUtils.convert(dates[1]));
+ param.remove("modi_time");
+ }
+ }
+ param.remove("curr");
+ param.remove("limit");
+ EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
+ convert(param, wrapper);
+ wrapper.addFilter("LEFT(loc_no,2)>=1 and LEFT(loc_no,2)<=16");
+// Page<LocDetl> stockOut = locDetlService.getStockOut(toPage(curr, limit, param, LocDetl.class));
+ Page<LocDetl> locDetlPage = locDetlService.selectPage(new Page<>(curr, limit), wrapper);
+ if (locDetlPage.getRecords().size()==0){
+ locDetlPage = locDetlService.selectPage(new Page<>(1, limit), wrapper);
+ }
+ return R.ok(locDetlPage);
+ }
+
+ @RequestMapping(value = "/locDetl/list/auth")// /locDetl/list/auth 鎺ュ彛闂
@ManagerAuth
public R list(@RequestParam(defaultValue = "1")Integer curr,
@RequestParam(defaultValue = "10")Integer limit,
@@ -79,13 +154,31 @@
@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");
+// }
+// }
+ excludeTrash(param);
convert(param, wrapper);
allLike(LocDetl.class, param.keySet(), wrapper, condition);
+ // 涓嶅悓缁ф壙瑙掕壊鏄剧ず涓嶅悓搴撲俊鎭�
+ RoleUtils.addRoleWrapperByLocNo(getUserId(),wrapper);
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));
}
+
private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -146,7 +239,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));
}
@@ -177,4 +285,52 @@
return R.ok();
}
+ @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()) {
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
+ }
+ }
+ return R.ok().add(stockStatis);
+ }
+
+ @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);
+ }
+
+ /**
+ * 鑾峰彇搴撳瓨鎬绘暟
+ * @return
+ */
+ @RequestMapping("/locDetl/count")
+ public R getAllCount(){
+ Integer sum = locDetlService.sum();
+ return R.ok(sum);
+ }
+
}
--
Gitblit v1.9.1