From 8e9971722f3f3ed6afd8b17bf73d260a17819914 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 15 七月 2025 17:51:58 +0800
Subject: [PATCH] 1

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

diff --git a/src/main/java/com/zy/asrs/controller/MatController.java b/src/main/java/com/zy/asrs/controller/MatController.java
index 53e9135..7f6de8b 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;
@@ -102,6 +104,33 @@
         );
 
     }
+
+    @RequestMapping(value = "/boxMat/list/auth")
+    @ManagerAuth
+    public R listBox(@RequestParam(defaultValue = "1") Integer curr,
+                     @RequestParam(defaultValue = "10") Integer limit,
+                     @RequestParam(required = false) String orderByField,
+                     @RequestParam(required = false) String orderByType,
+                     @RequestParam Map<String, Object> param) {
+
+        Object tagIdObj = param.get("tag_id");
+        if (Cools.isEmpty(tagIdObj)) {
+            tagIdObj = getOriginTag().getId();
+        }
+
+        String tagId = String.valueOf(tagIdObj);
+
+
+
+        return R.ok(matService.getPage(
+                new Page<>(curr, limit),
+                tagId,
+                param.get("matnr"),
+                param.get("memo")
+        ));
+    }
+
+
 
     private void convert(Map<String, Object> map, EntityWrapper wrapper){
         for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -331,4 +360,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