From 64d6948806c3dd7d657c359354212fa3eadfaa8e Mon Sep 17 00:00:00 2001
From: zhou zhou <3272660260@qq.com>
Date: 星期五, 21 十一月 2025 20:01:07 +0800
Subject: [PATCH] #盘点
---
src/main/java/com/zy/asrs/controller/CheckOrderController.java | 80 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/CheckOrderController.java b/src/main/java/com/zy/asrs/controller/CheckOrderController.java
index c677b88..0212f1d 100644
--- a/src/main/java/com/zy/asrs/controller/CheckOrderController.java
+++ b/src/main/java/com/zy/asrs/controller/CheckOrderController.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.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.mapper.EntityWrapper;
@@ -8,15 +10,21 @@
import com.core.common.*;
import com.core.exception.CoolException;
import com.zy.asrs.entity.*;
+import com.zy.asrs.entity.param.CheckTaskListParam;
import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.result.CheckOrderExportDTO;
import com.zy.asrs.service.*;
import com.core.annotations.ManagerAuth;
+import com.zy.common.entity.NodeExcel;
import com.zy.common.model.DetlDto;
+import com.zy.common.model.LocDto;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
import java.math.BigDecimal;
import java.util.*;
@@ -33,22 +41,29 @@
@Autowired
private DocTypeService docTypeService;
-
-
- @PostMapping(value = "/checkOrder/createTask/auth")
- @ManagerAuth
- public R checkOrderCreateTask(@RequestParam("orderId") Long orderId) {
- CheckOrder checkOrder = checkOrderService.selectById(orderId);
- if (Cools.isEmpty(checkOrder)) {
- throw new CoolException("鏁版嵁閿欒");
- }
- checkOrder.setSettle(11L);
- checkOrderService.updateById(checkOrder);
+ @PostMapping(value = "/checkOrder/pdaComplete/auth")
+ @ManagerAuth(memo = "pda锛氬畬鎴愮洏鐐�")
+ public R checkOrderPdaComplete(@RequestBody CheckTaskListParam checkTaskListParam) {
+ checkOrderService.pdaComplete(checkTaskListParam);
return R.ok();
}
+
+ @PostMapping(value = "/checkOrder/preview/auth")
+ @ManagerAuth(memo = "鐩樼偣鍗曞嚭搴撻瑙�")
+ public R checkOrderPreview(@RequestParam("orderId") Long orderId) {
+ List<LocDto> locDtos = checkOrderService.preview(orderId);
+ return R.ok(locDtos);
+ }
+ @PostMapping(value = "/checkOrder/getTaskList/auth")
+ @ManagerAuth(memo = "pda锛氳幏鍙栫洏鐐逛换鍔″垪琛�")
+ public R checkOrderGetTaskList(@RequestBody CheckTaskListParam checkTaskListParam) {
+ List<CheckOrderDetl> list = checkOrderService.getTaskList(checkTaskListParam.getBarcode());
+ return R.ok(list);
+ }
+
@PostMapping(value = "/checkOrder/complete/auth")
- @ManagerAuth
+ @ManagerAuth(memo = "瀹屾垚鐩樼偣鍗�")
public R checkOrderComplete(@RequestParam("orderId") Long orderId) {
CheckOrder checkOrder = checkOrderService.selectById(orderId);
if (Cools.isEmpty(checkOrder)) {
@@ -238,15 +253,38 @@
// return R.ok();
// }
- @RequestMapping(value = "/checkOrder/export/auth")
- @ManagerAuth
- public R export(@RequestBody JSONObject param){
- EntityWrapper<CheckOrder> wrapper = new EntityWrapper<>();
- List<String> fields = JSONObject.parseArray(param.getJSONArray("fields").toJSONString(), String.class);
- Map<String, Object> map = excludeTrash(param.getJSONObject("checkOrder"));
- convert(map, wrapper);
- List<CheckOrder> list = checkOrderService.selectList(wrapper);
- return R.ok(exportSupport(list, fields));
+
+
+ @PostMapping(value = "/checkOrder/export/auth")
+ @ManagerAuth(memo = "鐩樼偣鍗曞鍑�")
+ public void export(@RequestParam("orderId") Long orderId, HttpServletResponse response) throws IOException {
+ CheckOrder checkOrder = checkOrderService.selectById(orderId);
+ if (Cools.isEmpty(checkOrder)) {
+ throw new CoolException("鏁版嵁閿欒");
+ }
+ List<CheckOrderDetl> checkOrderDetls = checkOrderDetlService.selectList(new EntityWrapper<CheckOrderDetl>().eq("order_id", orderId));
+
+ ArrayList<CheckOrderExportDTO> checkOrderExportDTOS = new ArrayList<>();
+ for (CheckOrderDetl checkOrderDetl : checkOrderDetls) {
+ CheckOrderExportDTO checkOrderExportDTO = new CheckOrderExportDTO();
+ checkOrderExportDTO.sync(checkOrderDetl);
+ checkOrderExportDTOS.add(checkOrderExportDTO);
+ }
+
+ String fileName = "鐩樼偣宸紓鍗昣"+checkOrder.getOrderNo() + ".xlsx";
+
+ // 璁剧疆鍝嶅簲澶达紝鎸囧畾鏂囦欢鍚�
+ response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
+ response.setCharacterEncoding("utf-8");
+ // 闃叉涓枃涔辩爜
+ fileName = java.net.URLEncoder.encode(fileName, "UTF-8").replaceAll("\\+", "%20");
+ response.setHeader("Content-Disposition", "attachment;filename*=" + fileName);
+
+ EasyExcel.write(response.getOutputStream(), CheckOrderExportDTO.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("sheet1")
+ .doWrite(checkOrderExportDTOS);
+
}
@RequestMapping(value = "/checkOrderQuery/auth")
--
Gitblit v1.9.1