From 43efe016c156158b9fc3a8b647810f612fb126e6 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期二, 02 九月 2025 11:39:52 +0800
Subject: [PATCH] 自动补货单新增 1.订单中只能生成两笔自动补货单 2.CTU库是否有足够的空库位，空库位数需要大于100才会生成自动补货单 3.在补货时加上订单明细的数量进行判断
---
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 67 ++++++++++++++++++++++-----------
1 files changed, 45 insertions(+), 22 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
index c909439..c5d0391 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.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.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
@@ -10,7 +8,6 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.AgvLocDetl;
-import com.zy.asrs.entity.LocDetl;
import com.zy.asrs.entity.Mat;
import com.zy.asrs.service.AgvLocDetlService;
import com.zy.asrs.service.MatService;
@@ -20,10 +17,10 @@
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.multipart.MultipartFile;
-import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
-import java.net.URLEncoder;
+import java.time.LocalDate;
import java.util.List;
import java.util.Map;
@@ -44,14 +41,23 @@
@RequestParam(required = false)String orderByType,
@RequestParam(required = false)String condition,
@RequestParam Map<String, Object> param,
- @RequestParam(required = false)Boolean unreason){
+ @RequestParam(required = false)Boolean unreason,
+ @RequestParam(required = false)Boolean expired){
if (!Cools.isEmpty(unreason) && unreason) {
return R.ok(agvLocDetlService.selectPage(new Page<>(curr, limit), new EntityWrapper<AgvLocDetl>()
.where(" DATALENGTH( batch ) != 11 or\n" +
" batch LIKE '%[a-z]%'")));
}
+ if (!Cools.isEmpty(expired) && expired) {
+ return R.ok(agvLocDetlService.selectPage(
+ new Page<>(curr, limit),
+ new EntityWrapper<AgvLocDetl>()
+ .where("deadline < {0}", LocalDate.now()) // 鏂板鐨勮繃鏈熷垽鏂�
+ ));
+ }
param.remove("unreason");
+ param.remove("expired");
String row = "";
EntityWrapper<AgvLocDetl> wrapper = new EntityWrapper<>();
if (param.get("row") != null) {
@@ -100,23 +106,32 @@
return R.ok(sum);
}
+// @RequestMapping(value = "/locDetl/statis/export")
+// public void statisExport(HttpServletResponse response) throws IOException {
+// List<AgvLocDetl> excel = agvLocDetlService.getStockStatisExcel();
+// for (AgvLocDetl 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(), AgvLocDetl.class)
+// .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+// .sheet("琛�1")
+// .doWrite(excel);
+// }
+
+
@RequestMapping(value = "/locDetl/statis/export")
- public void statisExport(HttpServletResponse response) throws IOException {
- List<AgvLocDetl> excel = agvLocDetlService.getStockStatisExcel();
- for (AgvLocDetl 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<AgvLocDetl> stockStatisExcel = agvLocDetlService.getStockStatisExcel();
+ return R.ok(exportSupport(stockStatisExcel, fields));
}
@RequestMapping(value = "/locDetl/export/auth")
@@ -145,6 +160,14 @@
return R.ok(exportSupport(list, fields));
}
+ @RequestMapping(value = "/locDetl/compare/auth")
+ @ManagerAuth(memo = "搴撳瓨鏄庣粏姣斿")
+ public R compareLocDetl(MultipartFile file) throws IOException {
+ agvLocDetlService.compareToEss(file);
+
+ return R.ok();
+ }
+
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());
--
Gitblit v1.9.1