From 9d38f2354b3a7267a2486d937bb7d256fcb949c1 Mon Sep 17 00:00:00 2001
From: lty <876263681@qq.com>
Date: 星期五, 13 六月 2025 08:15:48 +0800
Subject: [PATCH] #增加生产日期，到期日期字段，增加库存明细超期库存检索
---
src/main/java/com/zy/asrs/controller/LocDetlController.java | 81 ++++++++++++++++++++++++++--------------
1 files changed, 52 insertions(+), 29 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..be58971 100644
--- a/src/main/java/com/zy/asrs/controller/LocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/LocDetlController.java
@@ -1,7 +1,5 @@
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;
@@ -21,9 +19,7 @@
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.time.LocalDate;
import java.util.*;
@RestController
@@ -91,14 +87,23 @@
@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]%'")));
+ @RequestParam(required = false)Boolean unreason,
+ @RequestParam(required = false)Boolean expired){
+ if (!Cools.isEmpty(unreason) && unreason) {
+ return R.ok(locDetlService.selectPage(
+ new Page<>(curr, limit),
+ new EntityWrapper<LocDetl>()
+ .where(" DATALENGTH(batch) != 11 OR batch LIKE '%[a-z]%'")));
+ }
+ if (!Cools.isEmpty(expired) && expired) {
+ return R.ok(locDetlService.selectPage(
+ new Page<>(curr, limit),
+ new EntityWrapper<LocDetl>()
+ .where("deadline < {0}", LocalDate.now()) // 鏂板鐨勮繃鏈熷垽鏂�
+ ));
}
param.remove("unreason");
+ param.remove("expired");
String row = "";
EntityWrapper<LocDetl> wrapper = new EntityWrapper<>();
if (param.get("row") != null) {
@@ -163,6 +168,16 @@
return R.ok();
}
+ @RequestMapping(value = "/locDetl/updateStockFreeze/auth")
+ @ManagerAuth(memo = "搴撲綅鍐荤粨")
+ public R updateStockFreeze(LocDetl locDetl){
+ if (Cools.isEmpty(locDetl) || null==locDetl.getMatnr()){
+ return R.error();
+ }
+ locDetlService.updateStockFreeze(locDetl.getMatnr(), locDetl.getLocNo(), locDetl.getStockFreeze());
+ return R.ok();
+ }
+
@RequestMapping(value = "/locDetl/delete/auth")
@ManagerAuth(memo = "搴撲綅鏄庣粏鍒犻櫎")
public R delete(@RequestParam String param){
@@ -178,7 +193,7 @@
@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"));
@@ -246,24 +261,32 @@
@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);
+// }
+
@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);
+ @ManagerAuth(memo = "搴撲綅鏄庣粏瀵煎嚭")
+ public synchronized R statisExport(@RequestBody JSONObject param){
+ List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
+ List<LocDetl> stockStatisExcel = LocDetlMapper.getStockStatisExcel();
+ return R.ok(exportSupport(stockStatisExcel, fields));
}
/**
--
Gitblit v1.9.1