From d7bb8c43b17253b46c6a466cff5545e8b4bcaad3 Mon Sep 17 00:00:00 2001
From: skyouc
Date: 星期二, 10 六月 2025 11:10:46 +0800
Subject: [PATCH] Merge branch 'devlop' of http://47.97.1.152:5880/r/wms-master into devlop
---
rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
index 963e330..e7707b9 100644
--- a/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
+++ b/rsf-server/src/main/java/com/vincent/rsf/server/manager/service/impl/OutStockItemServiceImpl.java
@@ -10,6 +10,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.vincent.rsf.framework.common.R;
import com.vincent.rsf.framework.exception.CoolException;
+import com.vincent.rsf.server.manager.entity.excel.OutStockTemplate;
import com.vincent.rsf.server.manager.enums.OrderType;
import com.vincent.rsf.server.manager.enums.OrderWorkType;
import com.vincent.rsf.server.common.domain.BaseParam;
@@ -98,17 +99,17 @@
@Override
@Transactional(rollbackFor = Exception.class)
public R excelImport(MultipartFile file, HashMap<String, Object> hashMap, Long loginUserId) throws Exception {
- ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), AsnOrderTemplate.class, ExcelUtil.getDefaultImportParams());
+ ExcelImportResult result = ExcelImportUtil.importExcelMore(file.getInputStream(), OutStockTemplate.class, ExcelUtil.getDefaultImportParams());
if (result.getList().isEmpty()) {
throw new CoolException("鐗╂枡瀵煎叆澶辫触锛侊紒");
}
if (result.getList().isEmpty()) {
throw new CoolException("琛ㄦ牸鍐呭涓嶈兘涓虹┖锛侊紒");
}
- List<AsnOrderTemplate> resultList = result.getList();
- Map<String, List<AsnOrderTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(AsnOrderTemplate::getCode));
+ List<OutStockTemplate> resultList = result.getList();
+ Map<String, List<OutStockTemplate>> listMap = resultList.stream().collect(Collectors.groupingBy(OutStockTemplate::getCode));
for (String key : listMap.keySet()) {
- AsnOrderTemplate template = listMap.get(key).stream().findFirst().get();
+ OutStockTemplate template = listMap.get(key).stream().findFirst().get();
AsnOrder asnOrder = outStockService.getOne(new LambdaQueryWrapper<AsnOrder>().eq(AsnOrder::getCode, template.getCode()));
if (Objects.isNull(asnOrder)) {
continue;
@@ -125,7 +126,7 @@
throw new CoolException("鍗曟嵁淇濆瓨澶辫触锛侊紒");
}
List<AsnOrderItem> items = new ArrayList<>();
- for (AsnOrderTemplate orderTemplate : listMap.get(key)) {
+ for (OutStockTemplate orderTemplate : listMap.get(key)) {
AsnOrderItem orderItem = new AsnOrderItem();
Matnr matnr = null;
if (!Objects.isNull(orderTemplate.getMatnrCode()) || StringUtils.isNotBlank(orderTemplate.getMatnrCode())) {
--
Gitblit v1.9.1