From a9f4a820c583eb85cec381b6236063256f753652 Mon Sep 17 00:00:00 2001
From: zwl <1051256694@qq.com>
Date: 星期六, 02 八月 2025 14:53:02 +0800
Subject: [PATCH] 完善和新增多次拣料
---
zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
index 93bd2f2..960e9be 100644
--- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
+++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/controller/PriorController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.wms.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -7,6 +9,11 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.zy.asrs.common.domain.dto.SafeStoDo;
import com.zy.asrs.common.domain.dto.SafeStoDto;
+import com.zy.asrs.common.domain.entity.LocInPrintMatExcel;
+import com.zy.asrs.common.domain.entity.MatExcel;
+import com.zy.asrs.common.domain.entity.SafeStoExcel;
+import com.zy.asrs.common.utils.MatExcelListener;
+import com.zy.asrs.common.utils.SafeStoExcelListener;
import com.zy.asrs.common.wms.entity.Mat;
import com.zy.asrs.common.wms.entity.Prior;
import com.zy.asrs.common.wms.service.MatService;
@@ -19,7 +26,11 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
import java.util.*;
@RestController
@@ -177,4 +188,30 @@
return R.ok();
}
+
+ @PostMapping(value = "/safeSto/excel/import/auth")
+ @ManagerAuth(memo = "瀹夊叏搴撳瓨鏁版嵁瀵煎叆")
+ @Transactional
+ public R matExcelImport(MultipartFile file) throws IOException {
+ SafeStoExcelListener listener = new SafeStoExcelListener(getUserId(), getHostId());
+ EasyExcel.read(file.getInputStream(), SafeStoExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛鍚屾"+listener.getTotal()+"鏉″畨鍏ㄥ簱瀛樻暟鎹�");
+ }
+
+
+ /**
+ * excel瀵煎叆妯℃澘涓嬭浇
+ */
+ @RequestMapping(value = "/safeSto/excel/import/mould")
+ public void matExcelImportMould(HttpServletResponse response) throws IOException {
+ List<SafeStoExcel> excels = new ArrayList<>();
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("瀹夊叏搴撳瓨Excel瀵煎叆妯℃澘", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName + ".xlsx");
+ EasyExcel.write(response.getOutputStream(), SafeStoExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("sheet1")
+ .doWrite(excels);
+ }
}
--
Gitblit v1.9.1