From fd1024c200e7aececc559b11032ecda1b3e96288 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期一, 22 一月 2024 16:34:26 +0800
Subject: [PATCH] #检料再入库逻辑修改，定时器检测是否存在在库无资料数据
---
src/main/java/com/zy/asrs/controller/AgvLocDetlController.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 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..61564ce 100644
--- a/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvLocDetlController.java
@@ -10,7 +10,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,6 +19,7 @@
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;
@@ -113,7 +113,7 @@
response.setCharacterEncoding("utf-8");
String fileName = URLEncoder.encode("搴撳瓨鏄庣粏缁熻鎶ヨ〃", "UTF-8");
response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
- EasyExcel.write(response.getOutputStream(), LocDetl.class)
+ EasyExcel.write(response.getOutputStream(), AgvLocDetl.class)
.registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
.sheet("琛�1")
.doWrite(excel);
@@ -145,6 +145,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