From 728e14723ba5a26f95cf099cac3a0d1853aea34b Mon Sep 17 00:00:00 2001
From: lsh <1>
Date: 星期三, 11 六月 2025 10:46:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 8c5b4e6..1fef104 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -17,6 +17,7 @@
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
+import com.zy.asrs.utils.OrderGiftProofreadingExcelListener;
import com.zy.asrs.utils.OutLocBoxExcelListener;
import com.zy.asrs.utils.OutpandianBoxExeclListener;
import com.zy.common.CodeRes;
@@ -34,6 +35,7 @@
import org.springframework.web.multipart.MultipartFile;
import javax.imageio.ImageIO;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.awt.image.BufferedImage;
import java.io.IOException;
@@ -358,10 +360,14 @@
@PostMapping(value = "/out/loc/box/excel/import/auth")
@ManagerAuth(memo = "瀵煎叆绠卞彿鍑哄簱")
@Transactional
- public R outLocBoxExcelImport(MultipartFile file) throws IOException {
- OutLocBoxExcelListener listener = new OutLocBoxExcelListener(getUserId());
+ public R outLocBoxExcelImport(HttpServletRequest request, MultipartFile file) throws IOException {
+ OutLocBoxExcelListener listener = new OutLocBoxExcelListener(request.getRemoteAddr(),getUserId());
EasyExcel.read(file.getInputStream(), OutLocBoxExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ if (listener.getSign()){
+ return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�."+listener.getErrorMsgOrderLoc());
+ } else {
+ return R.error("鍑哄簱澶辫触锛�"+listener.getErrorMsgOrderLoc());
+ }
}
@@ -386,10 +392,14 @@
@PostMapping(value = "/out/loc/box/excel/import/auth1")
@ManagerAuth(memo = "瀵煎叆绠卞彿鐩樼偣鍑哄簱")
@Transactional
- public R outLocBoxExcelImport1(MultipartFile file) throws IOException {
- OutpandianBoxExeclListener listener = new OutpandianBoxExeclListener(getUserId());
+ public R outLocBoxExcelImport1(HttpServletRequest request,MultipartFile file) throws IOException {
+ OutpandianBoxExeclListener listener = new OutpandianBoxExeclListener(request.getRemoteAddr(),getUserId());
EasyExcel.read(file.getInputStream(), pandianExcel.class, listener).sheet().doRead();
- return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ if (listener.getSign()){
+ return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�."+listener.getErrorMsgOrderLoc());
+ } else {
+ return R.error("鍑哄簱澶辫触锛�"+listener.getErrorMsgOrderLoc());
+ }
}
/*************************************** xm-select ***********************************************/
@@ -417,7 +427,7 @@
@ManagerAuth(memo = "瀵煎叆鏍″璁㈠崟")
@Transactional
public R outLocBoxExcelImport2(MultipartFile file) throws IOException {
- OutpandianBoxExeclListener listener = new OutpandianBoxExeclListener(getUserId());
+ OrderGiftProofreadingExcelListener listener = new OrderGiftProofreadingExcelListener(getUserId());
EasyExcel.read(file.getInputStream(), OrderGiftProofreadingExcel.class, listener).sheet().doRead();
return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉℃牎瀵硅鍗曟槑缁�");
}
--
Gitblit v1.9.1