From d54fbc9d4f8981fa0f7f613b33a28a8cd4f764ea Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期日, 25 十月 2026 16:29:53 +0800
Subject: [PATCH] feat(system): 优化用户搜索功能并完善ERP和MES模块验证逻辑
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java | 65 ++++++++++++++++++++++++++++++++
1 files changed, 65 insertions(+), 0 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
index ab24aed..4056ea7 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseInvoiceServiceImpl.java
@@ -3,14 +3,20 @@
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.lang.Assert;
import cn.hutool.core.util.ObjectUtil;
+import cn.hutool.core.util.StrUtil;
+import cn.iocoder.yudao.framework.common.exception.ServiceException;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceImportExcelVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceImportReqVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoicePageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.invoice.ErpPurchaseInvoiceSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseInvoiceDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinancePaymentMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseInvoiceMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import jakarta.annotation.Resource;
@@ -19,11 +25,14 @@
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collection;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.filterList;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.getSumValue;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
@@ -52,6 +61,9 @@
@Resource
private ErpPurchaseOrderService purchaseOrderService;
+
+ @Resource
+ private ErpPurchaseOrderMapper purchaseOrderMapper;
@Resource
private StorageAttachmentApi storageAttachmentApi;
@@ -176,4 +188,57 @@
return invoiceMapper.selectListBySupplierId(supplierId);
}
+ @Override
+ public ErpPurchaseInvoiceImportRespVO importPurchaseInvoiceList(List<ErpPurchaseInvoiceImportExcelVO> importInvoices,
+ ErpPurchaseInvoiceImportReqVO importReqVO) {
+ // 1. 鏍￠獙闈炵┖锛堣繃婊ゅ畬鍏ㄧ┖鐧界殑琛岋級
+ importInvoices = filterList(importInvoices, item -> StrUtil.isNotBlank(item.getPurchaseOrderNo()));
+ if (CollUtil.isEmpty(importInvoices)) {
+ throw exception(PURCHASE_INVOICE_IMPORT_LIST_IS_EMPTY);
+ }
+ // 2. 閫愯鍒涘缓鏉ョエ锛堜竴琛屼竴寮狅紝鏉ョエ鍙风敱绯荤粺鐢熸垚锛�
+ ErpPurchaseInvoiceImportRespVO respVO = ErpPurchaseInvoiceImportRespVO.builder()
+ .createPurchaseInvoiceNos(new ArrayList<>())
+ .failurePurchaseInvoiceNos(new LinkedHashMap<>())
+ .build();
+ for (int i = 0; i < importInvoices.size(); i++) {
+ ErpPurchaseInvoiceImportExcelVO row = importInvoices.get(i);
+ String rowKey = StrUtil.isNotBlank(row.getInvoiceNo()) ? row.getInvoiceNo() : ("绗�" + (i + 1) + "琛�");
+ try {
+ ErpPurchaseInvoiceSaveReqVO createReqVO = buildPurchaseInvoiceImportSaveReqVO(row);
+ Long invoiceId = createPurchaseInvoice(createReqVO);
+ respVO.getCreatePurchaseInvoiceNos().add(invoiceMapper.selectById(invoiceId).getNo());
+ } catch (ServiceException ex) {
+ respVO.getFailurePurchaseInvoiceNos().put(rowKey, ex.getMessage());
+ }
+ }
+ return respVO;
+ }
+
+ /**
+ * 灏嗕竴琛屾潵绁ㄨ浆鎹㈡垚鍒涘缓 Request VO
+ */
+ private ErpPurchaseInvoiceSaveReqVO buildPurchaseInvoiceImportSaveReqVO(ErpPurchaseInvoiceImportExcelVO row) {
+ // 1. 鏍￠獙鏉ョエ鏃ユ湡涓庨噾棰�
+ if (row.getInvoiceTime() == null) {
+ throw exception(PURCHASE_INVOICE_IMPORT_INVOICE_TIME_REQUIRED);
+ }
+ if (row.getPrice() == null) {
+ throw exception(PURCHASE_INVOICE_IMPORT_PRICE_REQUIRED);
+ }
+ // 2. 鎸夐噰璐鍗曞彿瑙ｆ瀽閲囪喘璁㈠崟锛堜緵搴斿晢鐢� createPurchaseInvoice 浠ヨ鍗曚负鍑嗗洖濉級
+ ErpPurchaseOrderDO purchaseOrder = purchaseOrderMapper.selectByNo(row.getPurchaseOrderNo());
+ if (purchaseOrder == null) {
+ throw exception(PURCHASE_INVOICE_IMPORT_ORDER_NOT_EXISTS, row.getPurchaseOrderNo());
+ }
+ // 3. 缁勮淇濆瓨 VO
+ return new ErpPurchaseInvoiceSaveReqVO()
+ .setPurchaseOrderId(purchaseOrder.getId())
+ .setInvoiceNo(row.getInvoiceNo())
+ .setInvoiceTitle(row.getInvoiceTitle())
+ .setPrice(row.getPrice())
+ .setInvoiceTime(row.getInvoiceTime())
+ .setRemark(row.getRemark());
+ }
+
}
--
Gitblit v1.9.3