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 | 124 ++++++++++++++++++++++++++++++++++++++++-
1 files changed, 121 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 3e12304..9c50df9 100644
--- a/src/main/java/com/zy/asrs/controller/MatController.java
+++ b/src/main/java/com/zy/asrs/controller/MatController.java
@@ -13,12 +13,19 @@
import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.MatPrint;
import com.zy.asrs.entity.OrderDetl;
+import com.zy.asrs.entity.param.EmptyPlateOutParam;
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;
@@ -62,7 +69,8 @@
public R pdaSearch(@RequestParam(required = false)String condition){
EntityWrapper<Mat> wrapper = new EntityWrapper<>();
if (!Cools.isEmpty(condition)) {
- wrapper.like("matnr", condition).or().like("maktx", condition);
+// wrapper.like("matnr", condition).or().like("maktx", condition);
+ wrapper.like("matnr", condition).or().like("specs", condition);
}
wrapper.orderBy("create_time", false);
List<Mat> mats = matService.selectList(wrapper);
@@ -92,10 +100,11 @@
if (Cools.isEmpty(tagId)) {
tagId = getOriginTag().getId();
}
- return R.ok(matService.getPage(new Page<>(curr, limit)
+ return R.ok(matService.getPage2(new Page<>(curr, limit)
, String.valueOf(tagId)
, param.get("matnr")
- , param.get("maktx"))
+ , param.get("maktx")
+ , param.get("specs"))
);
}
@@ -156,6 +165,28 @@
}
}
return R.ok();
+ }
+
+ @RequestMapping(value = "/mat/turn/over/list/auth")
+ @ManagerAuth
+ public R turnOverList(@RequestParam(defaultValue = "1")Integer curr,
+ @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/take/site")
+ @ManagerAuth()
+ public R availableTakeSite(@RequestParam(required = false) String matnr){
+ List<Map<String, Object>> result = new ArrayList<>();
+ List<Mat> mats = matService.selectByMatnrLink(matnr);
+ for (Mat mat : mats) {
+ Map<String, Object> map = new HashMap<>();
+ map.put("siteId", mat.getId());
+ map.put("desc", mat.getMatnr());
+ result.add(map);
+ }
+ return R.ok().add(result);
}
@RequestMapping(value = "/mat/export/auth")
@@ -306,4 +337,91 @@
}
+ /*************************************** 鏁版嵁鐩稿叧 ***********************************************/
+
+ /**
+ * 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()+"鏉″晢鍝佹暟鎹�");
+ }
+
+
+ /*********************************************鐩樼偣瀵煎叆瀵煎嚭****************************************************************/
+ /**
+ * 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(MultipartFile file) throws IOException {
+ 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