From 8b9bc3962f02f2739b20b1772f92a1f8e3072b06 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期二, 28 十月 2025 17:18:06 +0800
Subject: [PATCH] *30===>10

---
 src/main/java/com/zy/asrs/controller/MatController.java |   75 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 72 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 9c53503..1fef104 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -17,11 +17,15 @@
 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;
 import com.zy.common.config.AdminInterceptor;
 import com.zy.common.entity.MatExcel;
+import com.zy.common.entity.OrderGiftProofreadingExcel;
 import com.zy.common.entity.OutLocBoxExcel;
+import com.zy.common.entity.pandianExcel;
 import com.zy.common.utils.BarcodeUtils;
 import com.zy.common.utils.QrCode;
 import com.zy.common.web.BaseController;
@@ -31,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;
@@ -355,13 +360,77 @@
     @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());
+        }
+    }
+
+
+    /*********************************************鐩樼偣瀵煎叆瀵煎嚭****************************************************************/
+    /**
+     * excel瀵煎叆妯℃澘涓嬭浇
+     */
+    @RequestMapping(value = "/out/loc/box/excel/import/mould1")
+    public void outLocBoxExcelImportMould1(HttpServletResponse response) throws IOException {
+        List<OutLocBoxExcel> excels = new ArrayList<>();
+        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(), pandianExcel.class)
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .sheet("鐩樼偣妯℃澘")
+                .doWrite(excels);
+    }
+
+    // excel瀵煎叆
+    @PostMapping(value = "/out/loc/box/excel/import/auth1")
+    @ManagerAuth(memo = "瀵煎叆绠卞彿鐩樼偣鍑哄簱")
+    @Transactional
+    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();
+        if (listener.getSign()){
+            return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�."+listener.getErrorMsgOrderLoc());
+        } else {
+            return R.error("鍑哄簱澶辫触锛�"+listener.getErrorMsgOrderLoc());
+        }
     }
 
     /*************************************** xm-select ***********************************************/
 
 
+    /*********************************************鏍稿瀵煎叆瀵煎嚭****************************************************************/
+    /**
+     * excel瀵煎叆妯℃澘涓嬭浇
+     */
+    @RequestMapping(value = "/out/order/gift/excel/import/mould")
+    public void outLocBoxExcelImportMould2(HttpServletResponse response) throws IOException {
+        List<OrderGiftProofreadingExcel> excels = new ArrayList<>();
+        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(), OrderGiftProofreadingExcel.class)
+                .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+                .sheet("鏍″妯℃澘")
+                .doWrite(excels);
+    }
+
+    // excel瀵煎叆
+    @PostMapping(value = "/out/order/gift/excel/import/auth")
+    @ManagerAuth(memo = "瀵煎叆鏍″璁㈠崟")
+    @Transactional
+    public R outLocBoxExcelImport2(MultipartFile file) throws IOException {
+        OrderGiftProofreadingExcelListener listener = new OrderGiftProofreadingExcelListener(getUserId());
+        EasyExcel.read(file.getInputStream(), OrderGiftProofreadingExcel.class, listener).sheet().doRead();
+        return R.ok("鎴愬姛瀵煎叆"+listener.getTotal()+"鏉℃牎瀵硅鍗曟槑缁�");
+    }
+
+    /*************************************** xm-select ***********************************************/
 }

--
Gitblit v1.9.1