From dbc2514aad6b2b70b08e81f33d45f64aae175ccf Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期二, 19 十一月 2024 16:31:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MatController.java | 46 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 36 insertions(+), 10 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index e79b7e8..9595f3b 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -17,9 +17,11 @@
import com.zy.asrs.entity.result.KeyValueVo;
import com.zy.asrs.service.MatService;
import com.zy.asrs.utils.MatExcelListener;
+import com.zy.asrs.utils.OutLocBoxExcelListener;
import com.zy.common.CodeRes;
import com.zy.common.config.AdminInterceptor;
import com.zy.common.entity.MatExcel;
+import com.zy.common.entity.OutLocBoxExcel;
import com.zy.common.utils.BarcodeUtils;
import com.zy.common.utils.QrCode;
import com.zy.common.web.BaseController;
@@ -117,7 +119,7 @@
}
@RequestMapping(value = "/mat/add/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鏂板鍟嗗搧妗ｆ")
public R add(Mat mat) {
if (null != matService.selectByMatnr(mat.getMatnr())) {
return R.error("缂栧彿宸插瓨鍦�");
@@ -135,7 +137,7 @@
}
@RequestMapping(value = "/mat/update/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "淇敼鍟嗗搧妗ｆ")
public R update(Mat mat){
if (Cools.isEmpty(mat) || null==mat.getId()){
return R.error();
@@ -147,7 +149,7 @@
}
@RequestMapping(value = "/mat/delete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "鍒犻櫎鍟嗗搧妗ｆ")
public R delete(@RequestParam String param){
List<Mat> list = JSONArray.parseArray(param, Mat.class);
if (Cools.isEmpty(list)){
@@ -167,13 +169,6 @@
@RequestParam(defaultValue = "10")Integer limit,
@RequestParam Map<String, Object> param){
return R.ok(matService.getMatTurnPage(toPage(curr, limit, param, Mat.class)));
- }
-
- @RequestMapping("/mat/turn/over/out/start")
- @ManagerAuth(memo = "鍝佸彿绉讳氦")
- public R turnOverOutStart(@RequestBody EmptyPlateOutParam param) {
-
- return R.ok("鍝佸彿绉讳氦鎴愬姛");
}
@RequestMapping("/mat/turn/over/take/site")
@@ -338,4 +333,35 @@
}
+ /*************************************** 鏁版嵁鐩稿叧 ***********************************************/
+
+ /**
+ * excel瀵煎叆妯℃澘涓嬭浇
+ */
+ @RequestMapping(value = "/out/loc/box/excel/import/mould")
+ public void outLocBoxExcelImportMould(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(), OutLocBoxExcel.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("鍑哄簱妯℃澘")
+ .doWrite(excels);
+ }
+
+ // excel瀵煎叆
+ @PostMapping(value = "/out/loc/box/excel/import/auth")
+ @ManagerAuth(memo = "瀵煎叆绠卞彿鍑哄簱")
+ @Transactional
+ public R outLocBoxExcelImport(MultipartFile file) throws IOException {
+ OutLocBoxExcelListener listener = new OutLocBoxExcelListener(getUserId());
+ EasyExcel.read(file.getInputStream(), OutLocBoxExcel.class, listener).sheet().doRead();
+ return R.ok("鎴愬姛鍑哄簱"+listener.getTotal()+"鏉″晢鍝佹暟鎹�");
+ }
+
+ /*************************************** xm-select ***********************************************/
+
+
}
--
Gitblit v1.9.1