From 7abf9f290c39dd20f865be53dbecee7fab6de140 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 26 十月 2026 19:12:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business_新高电力' into dev_business_新高电力
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 91 insertions(+), 16 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
index 5b86be8..730e53d 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java
@@ -522,18 +522,51 @@
@Override
public ErpPurchaseRequestImportRespVO importPurchaseRequestList(List<ErpPurchaseRequestImportExcelVO> importRequests,
ErpPurchaseRequestImportReqVO importReqVO) {
- // 1. 鏍￠獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
- importRequests = filterList(importRequests, item -> StrUtil.isNotBlank(item.getProductCode()));
if (CollUtil.isEmpty(importRequests)) {
throw exception(PURCHASE_REQUEST_IMPORT_LIST_IS_EMPTY);
}
+
+ // 1. 閫愯鍒嗙被锛氭湁鏁堣 / 琚烦杩囩殑琛屻��
+ // 杩欓噷涓嶅啀鐢� filterList 闈欓粯涓㈠純銆岀墿鏂欑紪鐮佷负绌恒�嶇殑琛� 鈥斺�� 閭ｄ細璁╃敤鎴风湅鍒般�屽鍏ユ垚鍔熴��
+ // 浣嗘暟鎹棤澹版秷澶便�傝璺宠繃鐨勮蹇呴』甯� Excel 鍘熷琛屽彿杩斿洖缁欏墠绔��
+ ErpPurchaseRequestImportRespVO respVO = ErpPurchaseRequestImportRespVO.builder()
+ .createPurchaseRequestNos(new ArrayList<>())
+ .failurePurchaseRequestNos(new LinkedHashMap<>())
+ .skippedRows(new LinkedHashMap<>())
+ .build();
+ List<ImportRow> validRows = new ArrayList<>();
+ for (int i = 0; i < importRequests.size(); i++) {
+ ErpPurchaseRequestImportExcelVO row = importRequests.get(i);
+ int excelRowNo = i + 2; // +1 杞� 1 鍩猴紝+1 璺宠繃琛ㄥご
+ String rowLabel = "绗�" + excelRowNo + "琛�";
+ // 1.1 瀹屽叏绌虹櫧鐨勮锛堟墍鏈夊垪閮芥病鏈夊�硷級锛欵xcel 甯稿湪鏈熬鐣欑┖琛岋紝闈欓粯璺宠繃鍗冲彲
+ if (isBlankRow(row)) {
+ continue;
+ }
+ // 1.2 鐗╂枡缂栫爜涓虹┖锛氫笟鍔′笂鏃犳硶瀹氫綅鐗╂枡锛岃烦杩囧苟鏄庣‘鍛婄煡鐢ㄦ埛
+ if (StrUtil.isBlank(row.getProductCode())) {
+ respVO.getSkippedRows().put(rowLabel, "鐗╂枡缂栫爜涓虹┖锛岃琛屾湭瀵煎叆");
+ continue;
+ }
+ validRows.add(new ImportRow(excelRowNo, row));
+ }
+ respVO.setTotalRows(validRows.size() + respVO.getSkippedRows().size());
+ if (CollUtil.isEmpty(validRows)) {
+ // 娌℃湁浠讳綍涓�琛屽彲瀵煎叆锛氱洿鎺ユ姤閿欍��
+ // 鑻ユ槸鏈夎鍥犮�岀墿鏂欑紪鐮佷负绌恒�嶈璺宠繃锛屽紓甯镐俊鎭噷甯︿笂琛屽彿锛屽府鍔╃敤鎴峰畾浣嶃��
+ if (CollUtil.isNotEmpty(respVO.getSkippedRows())) {
+ throw exception(PURCHASE_REQUEST_IMPORT_ALL_ROWS_SKIPPED,
+ String.join("銆�", respVO.getSkippedRows().keySet()));
+ }
+ throw exception(PURCHASE_REQUEST_IMPORT_LIST_IS_EMPTY);
+ }
+
// 2. 鎸夈�屽崟鍙枫�嶅垎缁勶細鐩稿悓鍗曞彿鐨勫琛屽悎骞舵垚涓�寮犻噰璐敵璇凤紱鍗曞彿涓虹┖鏃舵瘡琛屽悇鑷垚涓�寮犵敵璇�
- List<List<ErpPurchaseRequestImportExcelVO>> groups = new ArrayList<>();
+ List<List<ImportRow>> groups = new ArrayList<>();
Map<String, Integer> groupIndexMap = new LinkedHashMap<>();
- int rowIndex = 0;
- for (ErpPurchaseRequestImportExcelVO row : importRequests) {
- rowIndex++;
- String groupKey = StrUtil.isNotBlank(row.getNo()) ? row.getNo() : ("__row_" + rowIndex);
+ for (ImportRow row : validRows) {
+ String no = row.data.getNo();
+ String groupKey = StrUtil.isNotBlank(no) ? no : ("__row_" + row.excelRowNo);
Integer index = groupIndexMap.get(groupKey);
if (index == null) {
index = groups.size();
@@ -542,23 +575,65 @@
}
groups.get(index).add(row);
}
+
// 3. 閫愮粍鍚堝苟鍒涘缓閲囪喘鐢宠
- ErpPurchaseRequestImportRespVO respVO = ErpPurchaseRequestImportRespVO.builder()
- .createPurchaseRequestNos(new ArrayList<>())
- .failurePurchaseRequestNos(new LinkedHashMap<>())
- .build();
- for (List<ErpPurchaseRequestImportExcelVO> group : groups) {
- String groupKey = StrUtil.isNotBlank(group.get(0).getNo()) ? group.get(0).getNo()
- : "绗�" + (importRequests.indexOf(group.get(0)) + 1) + "琛�";
+ for (List<ImportRow> group : groups) {
+ ImportRow firstRow = group.get(0);
+ // 澶辫触/璺宠繃鐨勬爣璇嗕紭鍏堢敤鍗曞彿锛屾病鏈夊崟鍙峰垯鐢� Excel 閲岀殑鐪熷疄琛屽彿
+ String groupKey = StrUtil.isNotBlank(firstRow.data.getNo())
+ ? firstRow.data.getNo() : "绗�" + firstRow.excelRowNo + "琛�";
try {
- ErpPurchaseRequestSaveReqVO createReqVO = buildPurchaseRequestImportSaveReqVO(group);
+ ErpPurchaseRequestSaveReqVO createReqVO = buildPurchaseRequestImportSaveReqVO(
+ convertList(group, ImportRow::getData));
Long requestId = createPurchaseRequest(createReqVO);
respVO.getCreatePurchaseRequestNos().add(purchaseRequestMapper.selectById(requestId).getNo());
+ respVO.setSuccessRows(respVO.getSuccessRows() == null
+ ? group.size() : respVO.getSuccessRows() + group.size());
} catch (ServiceException ex) {
+ // 涓氬姟鏍￠獙澶辫触锛氳褰曞師鍥狅紝缁х画澶勭悊涓嬩竴缁�
respVO.getFailurePurchaseRequestNos().put(groupKey, ex.getMessage());
+ } catch (Exception ex) {
+ // 闈炰笟鍔″紓甯革紙濡傝繙绋嬭皟鐢� NPE銆佹暟鎹В鏋愬け璐ワ級锛氫笉鑳借鏁翠釜瀵煎叆 500锛�
+ // 璁板綍涓哄け璐ュ苟缁х画锛屼繚璇佸叾瀹冭兘瀵肩殑琛屾甯稿叆搴�
+ log.error("[importPurchaseRequestList] 瀵煎叆琛�({}) 鍙戠敓闈炰笟鍔″紓甯�", groupKey, ex);
+ respVO.getFailurePurchaseRequestNos().put(groupKey,
+ "瀵煎叆澶辫触锛�" + (ex instanceof NullPointerException ? "鏁版嵁瑙ｆ瀽寮傚父锛岃妫�鏌ョ墿鏂�/鍗曚綅缂栫爜" : ex.getMessage()));
}
}
return respVO;
+ }
+
+ /**
+ * 鍒ゆ柇涓�琛屾槸鍚﹀畬鍏ㄧ┖鐧斤紙鎵�鏈変笟鍔″垪閮芥病鏈夊�硷級
+ */
+ private boolean isBlankRow(ErpPurchaseRequestImportExcelVO row) {
+ return StrUtil.isBlank(row.getNo())
+ && StrUtil.isBlank(row.getProductCode())
+ && StrUtil.isBlank(row.getProductUnitCode())
+ && row.getRequestTime() == null
+ && row.getCount() == null
+ && row.getProductPrice() == null
+ && StrUtil.isBlank(row.getSupplierName())
+ && StrUtil.isBlank(row.getRequestReason())
+ && StrUtil.isBlank(row.getRemark())
+ && StrUtil.isBlank(row.getItemRemark());
+ }
+
+ /**
+ * 瀵煎叆琛屽寘瑁咃細鎼哄甫 Excel 涓殑鐪熷疄琛屽彿锛岀敤浜庨敊璇彁绀哄畾浣嶃��
+ */
+ private static class ImportRow {
+ private final int excelRowNo;
+ private final ErpPurchaseRequestImportExcelVO data;
+
+ private ImportRow(int excelRowNo, ErpPurchaseRequestImportExcelVO data) {
+ this.excelRowNo = excelRowNo;
+ this.data = data;
+ }
+
+ private ErpPurchaseRequestImportExcelVO getData() {
+ return data;
+ }
}
/**
@@ -612,4 +687,4 @@
.setItems(items);
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3