From 33f4541719f5bf8f98616e3bcfcae1c416c69551 Mon Sep 17 00:00:00 2001
From: futian.liu <liufutianyoo@163.com>
Date: 星期四, 30 十一月 2023 13:29:32 +0800
Subject: [PATCH] 调拨出入库导出
---
consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java | 28 ++++++++++++++++++----------
1 files changed, 18 insertions(+), 10 deletions(-)
diff --git a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
index dab1821..af3e13f 100644
--- a/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
+++ b/consum-base/src/main/java/com/consum/base/controller/LWhFormTransferController.java
@@ -21,7 +21,6 @@
import com.consum.base.pojo.response.FromTransferTemplateInfoVO;
import com.consum.base.pojo.response.LWHFromTransferExtendVO;
import com.consum.base.pojo.response.TransferInfoVO;
-import com.consum.base.service.BaseGoodsModelsServiceImpl;
import com.consum.base.service.BaseWarehouseServiceImpl;
import com.consum.base.service.LWhFormTransferCoreService;
import com.consum.base.service.LWhFormTransferServiceImpl;
@@ -47,6 +46,7 @@
import java.lang.reflect.Field;
import java.net.URLEncoder;
import java.util.ArrayList;
+import java.util.Comparator;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -82,8 +82,6 @@
private LWhProcureModelUserServiceImpl lWhProcureModelUserService;
@Autowired
private LWhProcureModelUserRecordServiceImpl lWhProcureModelUserRecordService;
- @Autowired
- private BaseGoodsModelsServiceImpl baseGoodsModelsService;
@Autowired
private BaseWarehouseServiceImpl baseWarehouseService;
@@ -308,16 +306,21 @@
* @Author 鍗㈠簡闃�
* @Date 2023/10/31
*/
- @GetMapping("/export")
- public void export(Long id, HttpServletResponse response) throws IOException {
+ @GetMapping("/list/export")
+ public void export(Long id, Integer type, HttpServletResponse response) throws IOException {
- TemplateExportParams params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xlsx");
- Map<String, Object> map = this.lWhFormTransferService.export(id);
+ TemplateExportParams params;
+ if (type == 1) {
+ params = new TemplateExportParams("import/璋冩嫧鍏ュ簱鍗�.xls");
+ } else {
+ params = new TemplateExportParams("import/璋冩嫧鍑哄簱鍗�.xls");
+ }
+ Map<String, Object> map = this.lWhFormTransferService.export(id, type);
Workbook workbook = ExcelExportUtil.exportExcel(params, map);
try (OutputStream outputStream = response.getOutputStream()) {
response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;charset=utf-8");
- response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("璋冩嫧鍏ュ簱鍗�.xlsx", "utf-8"));
+ response.setHeader("Content-disposition", "attachment;filename=" + URLEncoder.encode("璋冩嫧鍏ュ簱鍗�.xls", "utf-8"));
workbook.write(outputStream);
workbook.close();
}
@@ -432,7 +435,7 @@
if (CollectionUtils.isEmpty(useRecordDTOList)) {
return ResponseValue.error("鏈煡璇㈠埌浣跨敤璁板綍");
}
- List<GoodsUseRecordVO> result = Lists.newArrayList();
+ List<GoodsUseRecordVO> goodsUseRecordList = Lists.newArrayList();
//鍒嗙粍
Map<Long, Map<Long, List<UseRecordDTO>>> collect = useRecordDTOList.stream()
.collect(Collectors.groupingBy(UseRecordDTO::getId, Collectors.groupingBy(UseRecordDTO::getBaseGoodsModelsId)));
@@ -466,10 +469,15 @@
useRecordSkuVO.setRecordUserInfos(recordUserInfoList);
useRecordSkuList.add(useRecordSkuVO);
goodsUseRecordVO.setRecordSkuDtoList(useRecordSkuList);
- result.add(goodsUseRecordVO);
+ goodsUseRecordList.add(goodsUseRecordVO);
}
}
}
+ //鍒嗙粍涔嬪悗閲嶆柊鎺掑簭
+ List<GoodsUseRecordVO> result = goodsUseRecordList.stream()
+ .sorted(Comparator.comparing(GoodsUseRecordVO::getUpdateTime
+ , Comparator.nullsFirst(Long::compareTo)).reversed())
+ .collect(Collectors.toList());
return ResponseValue.success(result);
}
--
Gitblit v1.9.1