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/enums/ErrorCodeConstants.java | 3
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/apikey/AiApiKeyImportReqVO.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/salesTarget/vo/CrmSalesTargetImportReqVO.java | 3
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigImportReqVO.java | 3
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportReqVO.java | 3
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/vo/knowledge/AiKnowledgeImportReqVO.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportReqVO.java | 3
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigImportReqVO.java | 3
yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/model/AiModelImportReqVO.java | 3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuImportReqVO.java | 3
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormImportReqVO.java | 3
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerImportReqVO.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/vo/CrmCreditRatingImportReqVO.java | 3
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupImportReqVO.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportReqVO.java | 3
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/attach/vo/attach/BpmBusinessAttachImportReqVO.java | 3
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportReqVO.java | 3
yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportReqVO.java | 3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleImportReqVO.java | 3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeImportReqVO.java | 3
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountImportReqVO.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueImportReqVO.java | 3
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactImportReqVO.java | 3
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiChartConfigImportReqVO.java | 3
yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 107 ++++++++++++++++++---
yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java | 8 +
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionImportReqVO.java | 3
yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/category/BpmCategoryImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportReqVO.java | 5
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiDataSourceConfigImportReqVO.java | 3
yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportRespVO.java | 17 +++
yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java | 3
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionKpiDefinitionImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceImportReqVO.java | 3
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierImportReqVO.java | 3
yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionAlertRuleImportReqVO.java | 3
43 files changed, 155 insertions(+), 99 deletions(-)
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/vo/knowledge/AiKnowledgeImportReqVO.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/vo/knowledge/AiKnowledgeImportReqVO.java
index ae70074..d23174d 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/vo/knowledge/AiKnowledgeImportReqVO.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/knowledge/vo/knowledge/AiKnowledgeImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/apikey/AiApiKeyImportReqVO.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/apikey/AiApiKeyImportReqVO.java
index 91e3da0..47b72cb 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/apikey/AiApiKeyImportReqVO.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/apikey/AiApiKeyImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/model/AiModelImportReqVO.java b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/model/AiModelImportReqVO.java
index 047221c..dd330fb 100644
--- a/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/model/AiModelImportReqVO.java
+++ b/yudao-module-ai/src/main/java/cn/iocoder/yudao/module/ai/controller/admin/model/vo/model/AiModelImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiChartConfigImportReqVO.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiChartConfigImportReqVO.java
index 2282252..f69c696 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiChartConfigImportReqVO.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiChartConfigImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiDataSourceConfigImportReqVO.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiDataSourceConfigImportReqVO.java
index baaaf5b..44ffbd4 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiDataSourceConfigImportReqVO.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/config/vo/BiDataSourceConfigImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionAlertRuleImportReqVO.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionAlertRuleImportReqVO.java
index 062d064..c586eeb 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionAlertRuleImportReqVO.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionAlertRuleImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionKpiDefinitionImportReqVO.java b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionKpiDefinitionImportReqVO.java
index 8f72716..231a394 100644
--- a/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionKpiDefinitionImportReqVO.java
+++ b/yudao-module-bi/src/main/java/cn/iocoder/yudao/module/bi/controller/admin/decision/vo/DecisionKpiDefinitionImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/attach/vo/attach/BpmBusinessAttachImportReqVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/attach/vo/attach/BpmBusinessAttachImportReqVO.java
index 7f17825..7d04c37 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/attach/vo/attach/BpmBusinessAttachImportReqVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/attach/vo/attach/BpmBusinessAttachImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/category/BpmCategoryImportReqVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/category/BpmCategoryImportReqVO.java
index 202b263..d3324de 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/category/BpmCategoryImportReqVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/category/BpmCategoryImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionImportReqVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionImportReqVO.java
index 7ea18b9..6f9e5fd 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionImportReqVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/expression/BpmProcessExpressionImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormImportReqVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormImportReqVO.java
index bc2539a..0d161a2 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormImportReqVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/form/BpmFormImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupImportReqVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupImportReqVO.java
index f7309cd..f6b1829 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupImportReqVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/group/BpmUserGroupImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerImportReqVO.java b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerImportReqVO.java
index 403e66a..aa57b3c 100644
--- a/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerImportReqVO.java
+++ b/yudao-module-bpm/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/definition/vo/listener/BpmProcessListenerImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessImportReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessImportReqVO.java
index d6c093b..d485dce 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessImportReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/business/vo/business/CrmBusinessImportReqVO.java
@@ -16,10 +16,9 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
@Schema(description = "璐熻矗浜�", example = "1")
private Long ownerUserId; // 涓� null 鍒欓粯璁や负褰撳墠鎿嶄綔浜�
-}
+}
\ No newline at end of file
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueImportReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueImportReqVO.java
index 6c527e4..a06867f 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueImportReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/clue/vo/CrmClueImportReqVO.java
@@ -16,10 +16,9 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
@Schema(description = "璐熻矗浜�", example = "1")
private Long ownerUserId; // 涓� null 鍒欓粯璁や负褰撳墠鎿嶄綔浜�
-}
+}
\ No newline at end of file
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactImportReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactImportReqVO.java
index 095ea9c..661c3b9 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactImportReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contact/vo/CrmContactImportReqVO.java
@@ -16,10 +16,9 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
@Schema(description = "璐熻矗浜�", example = "1")
private Long ownerUserId; // 涓� null 鍒欓粯璁や负褰撳墠鎿嶄綔浜�
-}
+}
\ No newline at end of file
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportReqVO.java
index 665e2b4..3a9e812 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/contract/vo/contract/CrmContractImportReqVO.java
@@ -16,10 +16,9 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
@Schema(description = "璐熻矗浜�", example = "1")
private Long ownerUserId; // 涓� null 鍒欓粯璁や负褰撳墠鎿嶄綔浜�
-}
+}
\ No newline at end of file
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/vo/CrmCreditRatingImportReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/vo/CrmCreditRatingImportReqVO.java
index 6a1ee95..9fbb5be 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/vo/CrmCreditRatingImportReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/credit/vo/CrmCreditRatingImportReqVO.java
@@ -16,10 +16,9 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
@Schema(description = "鎿嶄綔浜�", example = "1")
private Long operatorId; // 涓� null 鍒欓粯璁や负褰撳墠鎿嶄綔浜�
-}
+}
\ No newline at end of file
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java
index 3f31b97..b2af679 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/customer/vo/customer/CrmCustomerImportReqVO.java
@@ -16,10 +16,9 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
@Schema(description = "璐熻矗浜�", example = "1")
private Long ownerUserId; // 涓� null 鍒欏鎴疯繘鍏ュ叕娴�
-}
+}
\ No newline at end of file
diff --git a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/salesTarget/vo/CrmSalesTargetImportReqVO.java b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/salesTarget/vo/CrmSalesTargetImportReqVO.java
index 8fd4596..8109d09 100644
--- a/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/salesTarget/vo/CrmSalesTargetImportReqVO.java
+++ b/yudao-module-crm/src/main/java/cn/iocoder/yudao/module/crm/controller/admin/salesTarget/vo/CrmSalesTargetImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountImportReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountImportReqVO.java
index c8a4d0d..ed1ad6f 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountImportReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/finance/vo/account/ErpAccountImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
index 15ca0e7..4571401 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/ErpPurchaseRequestController.java
@@ -40,6 +40,7 @@
import org.springframework.web.bind.annotation.*;
import java.io.IOException;
+import java.time.LocalDateTime;
import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -142,9 +143,12 @@
@Operation(summary = "鑾峰緱瀵煎叆閲囪喘鐢宠妯℃澘")
public void importTemplate(HttpServletResponse response) throws IOException {
// 鎵嬪姩鍒涘缓瀵煎嚭 demo
+ // 娉ㄦ剰锛歳equestTime 鏄鍏ユ椂鐨勫繀濉牎楠岄」锛屾ā鏉块噷蹇呴』缁欏嚭绀轰緥鍊硷紝
+ // 鍚﹀垯鐢ㄦ埛鐓х潃妯℃澘濉畬瀵煎叆蹇呯劧鎶ャ�岀敵璇锋椂闂翠笉鑳戒负绌恒�嶃��
List<ErpPurchaseRequestImportExcelVO> list = Arrays.asList(
- ErpPurchaseRequestImportExcelVO.builder().no("CGSQ-绀轰緥-001").requestTime(null)
- .requestReason("").supplierName("").discountPercent(null).depositPrice(null)
+ ErpPurchaseRequestImportExcelVO.builder().no("CGSQ-绀轰緥-001")
+ .requestTime(LocalDateTime.now().withNano(0))
+ .requestReason("闇�姹傝鏄�").supplierName("").discountPercent(null).depositPrice(null)
.remark("").productCode("").productUnitCode("").productPrice(null)
.count(null).taxPercent(null).demandTime(null).qcCheckFlag(false)
.itemRemark("").build()
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceImportReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceImportReqVO.java
index 7f48a63..2d4e769 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceImportReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/invoice/ErpPurchaseInvoiceImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊锛堝崟鎹鍏ヤ负鏂板缓锛屾殏涓嶈鐩栧凡鏈夊崟鎹級", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportReqVO.java
index 21a09f4..39c12b5 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/order/ErpPurchaseOrderImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊锛堝崟鎹鍏ヤ负鏂板缓锛屾殏涓嶈鐩栧凡鏈夊崟鎹級", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanImportReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanImportReqVO.java
index b7959c4..c09228a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanImportReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/plan/ErpPurchasePlanImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊锛堝崟鎹鍏ヤ负鏂板缓锛屾殏涓嶈鐩栧凡鏈夊崟鎹級", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportReqVO.java
index 91bffa7..f6b9bd5 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportReqVO.java
@@ -15,8 +15,7 @@
@NotNull(message = "Excel 鏂囦欢涓嶈兘涓虹┖")
private MultipartFile file;
- @Schema(description = "鏄惁鏀寔鏇存柊锛堝崟鎹鍏ヤ负鏂板缓锛屾殏涓嶈鐩栧凡鏈夊崟鎹級", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
+ @Schema(description = "鏄惁鏀寔鏇存柊锛堝崟鎹鍏ヤ负鏂板缓锛屾殏涓嶈鐩栧凡鏈夊崟鎹紱璇ュ瓧娈靛綋鍓嶆湭鍙備笌涓氬姟閫昏緫锛屽彲浼犲彲涓嶄紶锛�", example = "true")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportRespVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportRespVO.java
index c7dc6de..784e92a 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportRespVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/request/ErpPurchaseRequestImportRespVO.java
@@ -15,7 +15,22 @@
@Schema(description = "鍒涘缓鎴愬姛鐨勯噰璐敵璇峰彿鏁扮粍", requiredMode = Schema.RequiredMode.REQUIRED)
private List<String> createPurchaseRequestNos;
- @Schema(description = "瀵煎叆澶辫触鐨勯噰璐敵璇烽泦鍚堬紝key 涓哄崟鍙凤紝value 涓哄け璐ュ師鍥�", requiredMode = Schema.RequiredMode.REQUIRED)
+ @Schema(description = "瀵煎叆澶辫触鐨勯噰璐敵璇烽泦鍚堬紝key 涓哄崟鍙锋垨琛屽彿锛寁alue 涓哄け璐ュ師鍥�", requiredMode = Schema.RequiredMode.REQUIRED)
private Map<String, String> failurePurchaseRequestNos;
+ /**
+ * 琚烦杩囩殑琛岋紝key 涓� Excel 涓殑瀹為檯琛屽彿锛堝銆岀3琛屻�嶏級锛寁alue 涓鸿烦杩囧師鍥犮��
+ *
+ * 鍘嗗彶瀹炵幇浼氬洜銆岀墿鏂欑紪鐮佷负绌恒�嶉潤榛樹涪寮冭繖浜涜锛屽鑷寸敤鎴风湅鍒般�屽鍏ユ垚鍔熴�嶄絾鏁版嵁涓㈠け銆�
+ * 杩欓噷鏄惧紡杩斿洖锛屽墠绔繀椤诲睍绀猴紝閬垮厤鏁版嵁鏃犲0娑堝け銆�
+ */
+ @Schema(description = "琚烦杩囩殑琛岋紙鏈鍏ワ級锛宬ey 涓� Excel 琛屽彿锛寁alue 涓鸿烦杩囧師鍥�")
+ private Map<String, String> skippedRows;
+
+ @Schema(description = "Excel 涓疄闄呮湁鏁版嵁鐨勮鏁帮紙涓嶅惈琛ㄥご涓庡畬鍏ㄧ┖鐧借锛�")
+ private Integer totalRows;
+
+ @Schema(description = "鎴愬姛瀵煎叆鐨勮鏁�")
+ private Integer successRows;
+
}
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierImportReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierImportReqVO.java
index 83412fa..cddb972 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierImportReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/purchase/vo/supplier/ErpSupplierImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportReqVO.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportReqVO.java
index f1fb5ba..e8aada4 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportReqVO.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊锛堝崟鎹鍏ヤ负鏂板缓锛屾殏涓嶈鐩栧凡鏈夊崟鎹級", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
index 5d01db5..5e6de54 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/enums/ErrorCodeConstants.java
@@ -98,6 +98,7 @@
ErrorCode PURCHASE_REQUEST_IMPORT_SUPPLIER_NOT_EXISTS = new ErrorCode(1_030_104_042, "渚涘簲鍟嗐�恵}銆戜笉瀛樺湪锛�");
ErrorCode PURCHASE_REQUEST_IMPORT_PRODUCT_NOT_EXISTS = new ErrorCode(1_030_104_043, "鐗╂枡缂栫爜銆恵}銆戜笉瀛樺湪锛�");
ErrorCode PURCHASE_REQUEST_IMPORT_UNIT_NOT_EXISTS = new ErrorCode(1_030_104_044, "鍗曚綅缂栫爜銆恵}銆戜笉瀛樺湪锛�");
+ ErrorCode PURCHASE_REQUEST_IMPORT_ALL_ROWS_SKIPPED = new ErrorCode(1_030_104_045, "鎵�鏈夎鍧囨湭瀵煎叆锛岃璺宠繃鐨勮锛歿}銆傝妫�鏌ョ墿鏂欑紪鐮佹槸鍚﹀~鍐欍��");
// ========== ERP 閲囪喘鏉ョエ锛�1-030-105-000锛� ==========
ErrorCode PURCHASE_INVOICE_NOT_EXISTS = new ErrorCode(1_030_105_000, "鏉ョエ涓嶅瓨鍦�");
@@ -268,4 +269,4 @@
ErrorCode WAREHOUSE_MAPPING_NOT_EXISTS = new ErrorCode(1_030_700_000, "浠撳簱鏄犲皠涓嶅瓨鍦�");
ErrorCode WAREHOUSE_MAPPING_EXISTS = new ErrorCode(1_030_700_001, "璇RP浠撳簱宸插瓨鍦ㄦ槧灏勯厤缃�");
-}
+}
\ No newline at end of file
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 闈欓粯涓㈠純銆岀墿鏂欑紪鐮佷负绌恒�嶇殑琛� 鈥斺�� 閭d細璁╃敤鎴风湅鍒般�屽鍏ユ垚鍔熴��
+ // 浣嗘暟鎹棤澹版秷澶便�傝璺宠繃鐨勮蹇呴』甯� 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 ? "鏁版嵁瑙f瀽寮傚父锛岃妫�鏌ョ墿鏂�/鍗曚綅缂栫爜" : 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
diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigImportReqVO.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigImportReqVO.java
index e88cfb6..d10aa7d 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigImportReqVO.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/config/vo/ConfigImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigImportReqVO.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigImportReqVO.java
index fe5058d..b63c154 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigImportReqVO.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/db/vo/DataSourceConfigImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobImportReqVO.java b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobImportReqVO.java
index 3592058..fd66a60 100644
--- a/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobImportReqVO.java
+++ b/yudao-module-infra/src/main/java/cn/iocoder/yudao/module/infra/controller/admin/job/vo/job/JobImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportReqVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportReqVO.java
index 09739d1..b9bd8d2 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportReqVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/item/vo/MdmItemImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportReqVO.java b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportReqVO.java
index 49342d2..eea2594 100644
--- a/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportReqVO.java
+++ b/yudao-module-mdm/src/main/java/cn/iocoder/yudao/module/mdm/controller/admin/unit/vo/MdmUnitMeasureImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateImportReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateImportReqVO.java
index 29a5ce8..397a112 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateImportReqVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/certificate/vo/SrmSupplierCertificateImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportReqVO.java b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportReqVO.java
index caaba3b..f69d0ac 100644
--- a/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportReqVO.java
+++ b/yudao-module-srm/src/main/java/cn/iocoder/yudao/module/srm/controller/admin/supplier/vo/SrmSupplierImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataImportReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataImportReqVO.java
index c0089a5..50dbbec 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataImportReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/data/DictDataImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeImportReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeImportReqVO.java
index 6f06264..31246ac 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeImportReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dict/vo/type/DictTypeImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeImportReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeImportReqVO.java
index 7a7cb60..1f41e0f 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeImportReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notice/vo/NoticeImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuImportReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuImportReqVO.java
index 8d3452f..429a8f5 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuImportReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/menu/MenuImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
diff --git a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleImportReqVO.java b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleImportReqVO.java
index 2c5fa0f..5d51eb3 100644
--- a/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleImportReqVO.java
+++ b/yudao-module-system/src/main/java/cn/iocoder/yudao/module/system/controller/admin/permission/vo/role/RoleImportReqVO.java
@@ -16,7 +16,6 @@
private MultipartFile file;
@Schema(description = "鏄惁鏀寔鏇存柊", requiredMode = Schema.RequiredMode.REQUIRED, example = "true")
- @NotNull(message = "鏄惁鏀寔鏇存柊涓嶈兘涓虹┖")
private Boolean updateSupport;
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3