From 914a092bc4c21d69641f94b68fecf61b25ddaca1 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期三, 06 九月 2023 13:11:38 +0800
Subject: [PATCH] #拣货单完成、上架规则
---
src/main/java/com/zy/asrs/controller/ManLocDetlController.java | 41 ++++++++++++++++++++++++++++++++++++++---
1 files changed, 38 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
index 61e94e1..49e65f6 100644
--- a/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
+++ b/src/main/java/com/zy/asrs/controller/ManLocDetlController.java
@@ -1,5 +1,7 @@
package com.zy.asrs.controller;
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.write.style.column.LongestMatchColumnWidthStyleStrategy;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
import com.baomidou.mybatisplus.plugins.Page;
import com.core.annotations.ManagerAuth;
@@ -7,9 +9,13 @@
import com.core.common.DateUtils;
import com.core.common.R;
import com.zy.asrs.entity.LocDetl;
+import com.zy.asrs.entity.LocDetlWarningDTO;
import com.zy.asrs.entity.ManLocDetl;
+import com.zy.asrs.entity.Mat;
import com.zy.asrs.entity.param.LocDetlAdjustParam;
+import com.zy.asrs.service.LocDetlService;
import com.zy.asrs.service.ManLocDetlService;
+import com.zy.asrs.service.MatService;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestBody;
@@ -17,6 +23,10 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
import java.util.Map;
@RestController
@@ -24,6 +34,12 @@
@Autowired
private ManLocDetlService manLocDetlService;
+
+ @Autowired
+ private LocDetlService locDetlService;
+
+ @Autowired
+ private MatService matService;
@RequestMapping(value = "/manLocDetl/list/auth")
@ManagerAuth
@@ -55,7 +71,8 @@
param.remove("update_time");
}
}
- return R.ok(manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class)));
+ Page<ManLocDetl> page = manLocDetlService.getPage(toPage(curr, limit, param, ManLocDetl.class));
+ return R.ok(page);
}
@@ -75,7 +92,7 @@
@RequestMapping("/manLocDetl/adjust/start")
@ManagerAuth(memo = "搴撳瓨璋冩暣")
public R locDetlAdjustStart(@RequestBody LocDetlAdjustParam param) {
- manLocDetlService.adjustLocDetl(param, getUserId());
+ manLocDetlService.adjustLocDetl(param, getUserId(),getUser());
return R.ok("搴撳瓨璋冩暣鎴愬姛");
}
@@ -109,5 +126,23 @@
}
}
-
+ @RequestMapping(value = "/manlocDetl/statis/export")
+// @ManagerAuth
+ public void statisExport(HttpServletResponse response) throws IOException {
+ List<LocDetlWarningDTO> list = manLocDetlService.selectAllWarning();
+ for (LocDetlWarningDTO locDetl : list) {
+ Mat mat = matService.selectByMatnr(locDetl.getMatnr());
+ if (mat != null) {
+ locDetl.sync(mat);
+ }
+ }
+ 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(), LocDetlWarningDTO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("琛�1")
+ .doWrite(list);
+ }
}
--
Gitblit v1.9.1