From 21d0e7ab9d5c7316225a3e9eecf465cd37c9bd85 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 05 六月 2025 14:15:07 +0800
Subject: [PATCH] 123
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 323 ++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 293 insertions(+), 30 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/LocDetlController.java b/src/main/java/com/zy/asrs/controller/LocDetlController.java
index b25c818..944a213 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -14,6 +14,7 @@
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
+import com.zy.asrs.entity.param.AbnormalLocDetlParam;
import com.zy.asrs.mapper.LocDetlMapper;
import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.MatService;
@@ -22,8 +23,11 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import javax.xml.crypto.Data;
import java.io.IOException;
import java.net.URLEncoder;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
import java.util.*;
@RestController
@@ -44,7 +48,7 @@
return R.ok();
}
- @RequestMapping(value = "/locDetl/{id}/auth")
+ @RequestMapping(value = "/locDetl/{id}/authv2")
@ManagerAuth
public R get(@PathVariable("id") String id) {
return R.ok(locDetlService.selectById(String.valueOf(id)));
@@ -52,7 +56,7 @@
@RequestMapping(value = "/locDetl/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos){
+ public R stockOutList(@RequestParam(value = "locNos[]") List<String> locNos) {
if (!locNos.isEmpty()) {
List<LocDetl> res = new ArrayList<>();
for (String locNo : new HashSet<>(locNos)) {
@@ -68,10 +72,10 @@
@RequestMapping(value = "/stock/out/list/auth")
@ManagerAuth
- public R stockOutList(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
- @RequestParam Map<String, Object> param){
- if (!Cools.isEmpty(param.get("modi_time"))){
+ public R stockOutList(@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);
@@ -85,24 +89,50 @@
@RequestMapping(value = "/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){
- excludeTrash(param);
+ 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 (!Cools.isEmpty(unreason) && 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 = "";
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 (!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()){
+ private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper) {
+ for (Map.Entry<String, Object> entry : map.entrySet()) {
String val = String.valueOf(entry.getValue());
- if (val.contains(RANGE_TIME_LINK)){
+ if (val.contains(RANGE_TIME_LINK)) {
String[] dates = val.split(RANGE_TIME_LINK);
wrapper.ge(entry.getKey(), DateUtils.convert(dates[0]));
wrapper.le(entry.getKey(), DateUtils.convert(dates[1]));
@@ -127,10 +157,10 @@
return R.ok();
}
- @RequestMapping(value = "/locDetl/update/auth")
- @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
- public R update(LocDetl locDetl){
- if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ @RequestMapping(value = "/locDetl/update/auth")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏淇敼")
+ public R update(LocDetl locDetl) {
+ if (Cools.isEmpty(locDetl) || null == locDetl.getMatnr()) {
return R.error();
}
locDetl.setModiUser(getUserId());
@@ -141,12 +171,12 @@
@RequestMapping(value = "/locDetl/delete/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
- public R delete(@RequestParam String param){
+ public R delete(@RequestParam String param) {
List<LocDetl> list = JSONArray.parseArray(param, LocDetl.class);
- if (Cools.isEmpty(list)){
+ if (Cools.isEmpty(list)) {
return R.error();
}
- for (LocDetl entity : list){
+ for (LocDetl entity : list) {
locDetlService.delete(new EntityWrapper<>(entity));
}
return R.ok();
@@ -154,11 +184,85 @@
@RequestMapping(value = "/locDetl/export/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
- public R export(@RequestBody JSONObject param){
+ public synchronized R export(@RequestBody JSONObject param) {
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);
+ List<AbnormalLocDetlParam> result = new ArrayList<>();
+
+ Page<LocDetl> groupLocDetl = locDetlService.getStockStatis2(toPage(1, 10000, param, LocDetl.class));
+ 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);
+ }
+ }
+ }
+ return R.ok(exportSupport(result, fields));
+ }
+ @RequestMapping(value = "/locDetl/export/auth/v2")
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R exportV2(@RequestBody JSONObject param) {
+ 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));
}
@@ -170,7 +274,7 @@
wrapper.like("matnr", condition);
Page<LocDetl> page = locDetlService.selectPage(new Page<>(0, 10), wrapper);
List<Map<String, Object>> result = new ArrayList<>();
- for (LocDetl locDetl : page.getRecords()){
+ for (LocDetl locDetl : page.getRecords()) {
Map<String, Object> map = new HashMap<>();
map.put("id", locDetl.getMatnr());
map.put("value", locDetl.getMatnr());
@@ -183,7 +287,7 @@
@ManagerAuth
public R query(@RequestBody JSONObject param) {
Wrapper<LocDetl> wrapper = new EntityWrapper<LocDetl>().eq(humpToLine(String.valueOf(param.get("key"))), param.get("val"));
- if (null != locDetlService.selectOne(wrapper)){
+ if (null != locDetlService.selectOne(wrapper)) {
return R.parse(BaseRes.REPEAT).add(getComment(LocDetl.class, String.valueOf(param.get("key"))));
}
return R.ok();
@@ -191,10 +295,25 @@
@RequestMapping(value = "/locDetl/statis/auth")
@ManagerAuth
- public R statis(@RequestParam(defaultValue = "1")Integer curr,
- @RequestParam(defaultValue = "10")Integer limit,
+ 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);
+ }
+
+ @RequestMapping(value = "/locDetl/statis/out/auth")
+ @ManagerAuth
+ public R statisOut(@RequestParam(defaultValue = "1") Integer curr,
+ @RequestParam(defaultValue = "10") Integer limit,
+ @RequestParam Map<String, Object> param) {
+ Page<LocDetl> stockStatis = locDetlService.getStockStatisOut(toPage(curr, limit, param, LocDetl.class));
for (LocDetl locDetl : stockStatis.getRecords()) {
Mat mat = matService.selectByMatnr(locDetl.getMatnr());
if (mat != null) {
@@ -229,12 +348,156 @@
/**
* 鑾峰彇搴撳瓨鎬绘暟
+ *
* @return
*/
@RequestMapping("/locDetl/count")
- public R getAllCount(){
+ public R getAllCount() {
Integer sum = locDetlService.sum();
return R.ok(sum);
}
+
+ /**********************************************************寮傚父搴撳瓨鐩稿叧controller**********************************************************/
+
+ @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);
+ }
+
+ @RequestMapping(value = "/locDetl/groupDateList/auth")
+ @ManagerAuth
+ public R groupDateList(@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.getStockStatisDate(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.getStoreMaxDate())) {
+// if (Cools.isEmpty(locDetl.getBatch())) {
+// continue;
+// } else if (locDetl.getBatch().length() != 8) {
+// continue;
+// }
+ try {
+// SimpleDateFormat simple = new SimpleDateFormat("yyyyMMdd");
+// Date maxDate = simple.parse(locDetl.getBatch());
+ Date maxDate = locDetl.getModiTime();
+ Calendar calendar = new GregorianCalendar();
+ calendar.setTime(maxDate);
+ // 鎶婃棩鏈熷線鍚庡鍔犱竴澶�,鏁存暟 寰�鍚庢帹,璐熸暟寰�鍓嶇Щ鍔�
+ calendar.add(Calendar.DATE, mat.getStoreMaxDate());
+ // 杩欎釜鏃堕棿灏辨槸鏃ユ湡寰�鍚庢帹涓�澶╃殑缁撴灉
+ maxDate = calendar.getTime();
+ Date now = new Date();
+ abnormalLocDetlParam.setLocNo(locDetl.getLocNo());
+ 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());
+ if (now.compareTo(maxDate) > 0) {
+ long difference = (now.getTime() - locDetl.getModiTime().getTime()) / (24 * 60 * 60 * 1000);
+ abnormalLocDetlParam.setNowTime(Integer.parseInt(String.valueOf(difference)));
+ result.add(abnormalLocDetlParam);
+ }
+ } catch (Exception e) {
+ System.out.println(e.getMessage());
+ }
+ }
+ }
+
+ 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;
+ }
+
}
--
Gitblit v1.9.1