From 8be136c5e451b623cec21e806bd30e6e2698587d Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期一, 17 二月 2025 16:42:40 +0800
Subject: [PATCH] 新增捡货单excel导出，销售用
---
src/main/webapp/static/js/picking/picking.js | 12 ++++++
src/main/java/com/zy/asrs/entity/result/PakoutExcelVo.java | 53 ++++++++++++++++++++++++++
src/main/webapp/views/picking/picking.html | 1
src/main/java/com/zy/asrs/controller/PakoutController.java | 45 ++++++++++++++++++++++
4 files changed, 111 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/PakoutController.java b/src/main/java/com/zy/asrs/controller/PakoutController.java
index 1e65ee5..fbffdea 100644
--- a/src/main/java/com/zy/asrs/controller/PakoutController.java
+++ b/src/main/java/com/zy/asrs/controller/PakoutController.java
@@ -13,6 +13,7 @@
import com.core.common.R;
import com.zy.asrs.entity.*;
import com.zy.asrs.entity.param.OrderDomainParam;
+import com.zy.asrs.entity.result.PakoutExcelVo;
import com.zy.asrs.entity.result.PakoutVo;
import com.zy.asrs.service.*;
import com.zy.common.web.BaseController;
@@ -25,6 +26,7 @@
import java.io.IOException;
import java.net.URLEncoder;
import java.util.*;
+import java.util.stream.Collectors;
@RestController
public class PakoutController extends BaseController {
@@ -382,4 +384,47 @@
.doWrite(pakoutVos);
}
+ @RequestMapping(value = "/pakOut/exportExcel2/auth")
+ public void exportExcel2(HttpServletResponse response, @RequestParam String orderNo) throws IOException {
+
+ //浠庢暟鎹簱鏌ヨ鏁版嵁
+ List<Pakout> list = pakoutService.selectList(new EntityWrapper<Pakout>().eq("doc_num",orderNo).orderBy("maktx"));
+
+ List<PakoutExcelVo> pakOutExcelVos=new ArrayList<>();
+
+ for (Pakout pakOut: list) {
+ Pla pla = plaService.selectOne(new EntityWrapper<Pla>()
+ .eq("batch", pakOut.getBatch())
+ .eq("package_no", pakOut.getBarcode())
+ .eq("brand", pakOut.getMaktx()));
+ PakoutExcelVo pakOutVo = new PakoutExcelVo();
+ BeanUtils.copyProperties(pla,pakOutVo);
+ BeanUtils.copyProperties(pakOut,pakOutVo);
+ pakOutExcelVos.add(pakOutVo);
+ }
+
+ Map<String, List<PakoutExcelVo>> collect = pakOutExcelVos.stream().collect(Collectors.groupingBy(PakoutExcelVo::getBrand));
+ List<PakoutExcelVo> newPakOutExcelVos=new ArrayList<>();
+
+ for(Map.Entry<String, List<PakoutExcelVo>> entry: collect.entrySet()) {
+ double sum = entry.getValue().stream().mapToDouble(PakoutExcelVo::getAnfme).sum();
+ newPakOutExcelVos.addAll(entry.getValue());
+
+ PakoutExcelVo pakoutExcelVo = new PakoutExcelVo();
+ pakoutExcelVo.setProDate("灏忚锛�");
+ pakoutExcelVo.setAnfme(sum);
+ newPakOutExcelVos.add(pakoutExcelVo);
+ }
+
+ response.setContentType("application/vnd.ms-excel");
+ response.setCharacterEncoding("utf-8");
+ String fileName = URLEncoder.encode("鎷ｈ揣鍗�", "UTF-8");
+ response.setHeader("Content-disposition", "attachment;filename=" + fileName+ orderNo + ".xlsx");
+
+ EasyExcel.write(response.getOutputStream(), PakoutExcelVo.class)
+ .registerWriteHandler(new LongestMatchColumnWidthStyleStrategy())
+ .sheet("琛�1")
+ .doWrite(newPakOutExcelVos);
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/entity/result/PakoutExcelVo.java b/src/main/java/com/zy/asrs/entity/result/PakoutExcelVo.java
new file mode 100644
index 0000000..9fe0c0b
--- /dev/null
+++ b/src/main/java/com/zy/asrs/entity/result/PakoutExcelVo.java
@@ -0,0 +1,53 @@
+package com.zy.asrs.entity.result;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import lombok.Data;
+
+/**
+ * @author pang.jiabao
+ * @description 鎷ｈ揣鍗曪紝閿�鍞彂璐х敤excel瀵煎嚭妯℃澘
+ * @createDate 2025/2/17 15:47
+ */
+@Data
+public class PakoutExcelVo {
+
+ @ExcelProperty(value = "鐗屽彿")
+ private String brand;
+
+ @ExcelProperty(value = "鎵瑰彿")
+ private String batch;
+
+ @ExcelProperty(value = "鍖呰鍙�")
+ private Integer packageNo;
+
+ @ExcelProperty(value = "鐢熶骇鏃ユ湡")
+ private String proDate;
+
+ @ExcelProperty(value = "閲嶉噺KG")
+ private Double anfme;
+
+ @ExcelProperty(value = "鐔旀寚,g/10min")
+ private Double fingerMelting;
+
+ @ExcelProperty(value = "鐔旂偣,鈩�")
+ private Double fusingPoint;
+
+ @ExcelProperty(value = "榛勫害")
+ private Double yellowness;
+
+ @ExcelProperty(value = "涓嶉�忔槑搴�,%")
+ private Double opacity;
+
+ @ExcelProperty(value = "鍖呰绫诲瀷")
+ private String packageType;
+
+ @ExcelProperty(value = "鎵樼洏绫诲瀷")
+ private String zpalletType;
+
+ @ExcelProperty(value = "璐ㄩ噺鐘舵��")
+ private String massState;
+
+ @ExcelProperty(value = "搴撲綅")
+ private String locNo;
+
+}
diff --git a/src/main/webapp/static/js/picking/picking.js b/src/main/webapp/static/js/picking/picking.js
index ba55339..cfac7df 100644
--- a/src/main/webapp/static/js/picking/picking.js
+++ b/src/main/webapp/static/js/picking/picking.js
@@ -109,6 +109,9 @@
case "printExcel":
printExcel(data);
break;
+ case "exportExcel2":
+ exportExcel2(data);
+ break;
case "look":
var $a = $(obj.tr).find('a[lay-event="look"]');
var offset = $a.offset();
@@ -405,6 +408,15 @@
});
}
+ function exportExcel2(data){
+ layer.confirm('纭畾瀵煎嚭Excel鍚�', {shadeClose: true}, function(){
+ layer.closeAll();
+ layer.load(1, {shade: [0.1,'#fff']});
+ location.href = baseUrl+"/pakOut/exportExcel2/auth?orderNo="+data.doc_num;
+ layer.closeAll('loading');
+ });
+ }
+
});
// 鍏抽棴鍔ㄤ綔
diff --git a/src/main/webapp/views/picking/picking.html b/src/main/webapp/views/picking/picking.html
index 16c4665..b47deb0 100644
--- a/src/main/webapp/views/picking/picking.html
+++ b/src/main/webapp/views/picking/picking.html
@@ -77,6 +77,7 @@
<!-- 琛ㄦ牸鎿嶄綔鍒� -->
<script type="text/html" id="operate">
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="printExcel">瀵煎嚭Excel</a>
+ <a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="exportExcel2">鍙戣揣Excel</a>
<a class="layui-btn layui-btn-primary layui-border-blue layui-btn-xs btn-complete" lay-event="btnPrint2">鎵撳嵃</a>
<a class="layui-btn layui-btn-danger layui-btn-xs btn-delete" lay-event="del">鍒犻櫎</a>
<!-- <a class="layui-btn layui-btn-primary layui-btn-xs btn-edit" lay-event="btnPrint"><img src="../../static/image/nav/fn_3.png" alt="浜岀淮鐮�"></a>
--
Gitblit v1.9.1