From dfdd7980577e12e32fc9571f46f49385ac5edcdd Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期五, 14 二月 2025 12:51:29 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 35 +++++++++++++++++++++++++++++++++--
1 files changed, 33 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 63aa249..9c50df9 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -17,10 +17,13 @@
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;
@@ -385,12 +388,40 @@
@ManagerAuth(memo = "瀵煎叆绠卞彿鐩樼偣鍑哄簱")
@Transactional
public R outLocBoxExcelImport1(MultipartFile file) throws IOException {
- OutLocBoxExcelListener listener = new OutLocBoxExcelListener(getUserId());
- EasyExcel.read(file.getInputStream(), OutLocBoxExcel.class, listener).sheet().doRead();
+ OutpandianBoxExeclListener listener = new OutpandianBoxExeclListener(getUserId());
+ EasyExcel.read(file.getInputStream(), pandianExcel.class, listener).sheet().doRead();
return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
}
/*************************************** 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