From 6162f31a3145d875ea2187a9c8c1476ae053dad0 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 17 四月 2025 10:49:38 +0800
Subject: [PATCH] 获取最新冻结状态修复
---
src/main/java/com/zy/asrs/controller/PakoutController.java | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 55 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 fbffdea..812c050 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.param.PakOutExcelExportParam;
import com.zy.asrs.entity.result.PakoutExcelVo;
import com.zy.asrs.entity.result.PakoutVo;
import com.zy.asrs.service.*;
@@ -427,4 +428,58 @@
.doWrite(newPakOutExcelVos);
}
+ @PostMapping (value = "/pakOut/excelExport3/auth")
+ @ManagerAuth
+ public void export(HttpServletResponse response, @RequestBody PakOutExcelExportParam pakOutExcelExportParam) throws IOException {
+
+ EntityWrapper<Pakout> entityWrapper = new EntityWrapper<>();
+
+ if ("all".equals(pakOutExcelExportParam.getType())) {
+ PakOutExcelExportParam.QueryWhere queryWhere = pakOutExcelExportParam.getQueryWhere();
+ if (!Cools.isEmpty(queryWhere.getCust_name())) {
+ entityWrapper.eq("cust_name", queryWhere.getCust_name());
+ }
+ if (!Cools.isEmpty(queryWhere.getDoc_num())) {
+ entityWrapper.eq("doc_num", queryWhere.getDoc_num());
+ }
+ if (queryWhere.getCreate_time().contains(RANGE_TIME_LINK)) {
+ String[] dates = queryWhere.getCreate_time().split(RANGE_TIME_LINK);
+ entityWrapper.ge("create_time", DateUtils.convert(dates[0]));
+ entityWrapper.le("create_time", DateUtils.convert(dates[1]));
+ }
+
+ // 闄愬埗閿�鍞鑹插彧鑳界湅鑷繁鍒涘缓鐨勫崟瀛愶紙閿�鍞鑹瞚d鍥哄畾21锛屼笉鑳介殢鎰忎慨鏀癸級
+ User user = getUser();
+ if (user.getRoleId() != 2 && user.getRoleId() != 24) {
+ entityWrapper.eq("create_by", user.getId());
+ }
+ } else {
+ entityWrapper.in("doc_num", pakOutExcelExportParam.getDocNumList());
+ }
+
+ List<Pakout> list = pakoutService.selectList(entityWrapper);
+ List<PakoutVo> pakOutVoList = 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()));
+ if (pla != null) {
+ PakoutVo pakOutVo = new PakoutVo();
+ BeanUtils.copyProperties(pla, pakOutVo);
+ BeanUtils.copyProperties(pakOut, pakOutVo);
+ pakOutVoList.add(pakOutVo);
+ }
+ }
+
+ 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(), PakoutVo.class)
+ .sheet("琛�1")
+ .doWrite(pakOutVoList);
+ }
+
}
--
Gitblit v1.9.1