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 | 126 +++++++++++++++++++++++++++--------------
1 files changed, 82 insertions(+), 44 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 19c6e7e..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,15 +3,21 @@
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.erp.enums.ErpPurchaseInvoiceAuditStatusEnum;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -19,10 +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.*;
@@ -44,10 +54,16 @@
private ErpPurchaseInvoiceMapper invoiceMapper;
@Resource
+ private ErpFinancePaymentMapper financePaymentMapper;
+
+ @Resource
private ErpNoRedisDAO noRedisDAO;
@Resource
private ErpPurchaseOrderService purchaseOrderService;
+
+ @Resource
+ private ErpPurchaseOrderMapper purchaseOrderMapper;
@Resource
private StorageAttachmentApi storageAttachmentApi;
@@ -65,9 +81,8 @@
throw exception(PURCHASE_INVOICE_NO_EXISTS);
}
- // 2.1 鎻掑叆鏉ョエ锛堝垱寤哄悗鍗充负鏈鏍哥姸鎬侊級
- ErpPurchaseInvoiceDO invoice = BeanUtils.toBean(createReqVO, ErpPurchaseInvoiceDO.class)
- .setNo(no).setAuditStatus(ErpPurchaseInvoiceAuditStatusEnum.PROCESS.getStatus());
+ // 2.1 鎻掑叆鏉ョエ锛堝垱寤哄悗鍗充负鏈夋晥鐘舵�侊紝鏃犻渶瀹℃牳锛�
+ ErpPurchaseInvoiceDO invoice = BeanUtils.toBean(createReqVO, ErpPurchaseInvoiceDO.class).setNo(no);
invoiceMapper.insert(invoice);
// 2.2 缁戝畾鍙戠エ闄勪欢
@@ -88,12 +103,9 @@
}
private void validatePurchaseInvoicePriceExceedsLimit(ErpPurchaseInvoiceSaveReqVO reqVO) {
- // 1. 璁＄畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩锛堝鎵逛腑涔熷崰鐢ㄩ搴︼紝闃叉绱鏉ョエ瓒呰繃閲囪喘璁㈠崟閲戦锛�
+ // 1. 璁＄畻鍓╀綑鍙紑绁ㄩ噾棰濓紝涓嶅寘鎷� reqVO 鑷韩锛堟墍鏈夋湁鏁堟潵绁ㄩ兘鍗犵敤棰濆害锛岄槻姝㈢疮璁℃潵绁ㄨ秴杩囬噰璐鍗曢噾棰濓級
ErpPurchaseOrderDO purchaseOrder = purchaseOrderService.getPurchaseOrder(reqVO.getPurchaseOrderId());
- List<ErpPurchaseInvoiceDO> invoices = invoiceMapper.selectListByOrderIdAndStatus(reqVO.getPurchaseOrderId(),
- List.of(ErpPurchaseInvoiceAuditStatusEnum.DRAFT.getStatus(),
- ErpPurchaseInvoiceAuditStatusEnum.PROCESS.getStatus(),
- ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus()));
+ List<ErpPurchaseInvoiceDO> invoices = invoiceMapper.selectListByOrderId(reqVO.getPurchaseOrderId());
if (reqVO.getId() != null) {
invoices.removeIf(invoice -> ObjectUtil.equal(invoice.getId(), reqVO.getId()));
}
@@ -110,12 +122,8 @@
public void updatePurchaseInvoice(ErpPurchaseInvoiceSaveReqVO updateReqVO) {
Assert.notNull(updateReqVO.getId(), "鏉ョエ缂栧彿涓嶈兘涓虹┖");
// 1.1 鏍￠獙瀛樺湪
- ErpPurchaseInvoiceDO oldInvoice = validatePurchaseInvoiceExists(updateReqVO.getId());
- // 1.2 鍙湁鏈鏍稿彲浠ョ紪杈�
- if (ObjectUtil.notEqual(oldInvoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.PROCESS.getStatus())) {
- throw exception(PURCHASE_INVOICE_UPDATE_FAIL_EDITING_PROHIBITED, oldInvoice.getNo());
- }
- // 1.3 鏍￠獙鍏宠仈鏁版嵁 + 鍙紑绁ㄩ噾棰�
+ validatePurchaseInvoiceExists(updateReqVO.getId());
+ // 1.2 鏍￠獙鍏宠仈鏁版嵁 + 鍙紑绁ㄩ噾棰�
validateRelationDataExists(updateReqVO);
validatePurchaseInvoicePriceExceedsLimit(updateReqVO);
@@ -131,35 +139,17 @@
@Transactional(rollbackFor = Exception.class)
public void deletePurchaseInvoice(Long id) {
// 1.1 鏍￠獙瀛樺湪
- ErpPurchaseInvoiceDO invoice = validatePurchaseInvoiceExists(id);
- // 1.2 瀹℃壒閫氳繃鏃讹紝涓嶅厑璁稿垹闄�
- if (ObjectUtil.equal(invoice.getAuditStatus(), ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus())) {
- throw exception(PURCHASE_INVOICE_DELETE_FAIL_IS_APPROVE);
+ validatePurchaseInvoiceExists(id);
+ // 1.2 宸叉湁鏈夋晥浠樻鍗曞叧鑱旂殑鏉ョエ锛屼笉鍏佽鍒犻櫎锛堜繚鎸佹潵绁ㄤ笌浠樻鐨勫叧鑱斿畬鏁存�э級
+ Map<Long, BigDecimal> paidMap = financePaymentMapper.selectPaymentPriceMapByInvoiceId(List.of(id));
+ if (paidMap.getOrDefault(id, BigDecimal.ZERO).compareTo(BigDecimal.ZERO) > 0) {
+ throw exception(PURCHASE_INVOICE_DELETE_FAIL_HAS_PAYMENT);
}
// 2.1 鍒犻櫎鍙戠エ闄勪欢
storageAttachmentApi.deleteAttachmentsByRecord(PURCHASE_INVOICE_RECORD_TYPE, id);
// 2.2 鍒犻櫎鏉ョエ
invoiceMapper.deleteById(id);
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updatePurchaseInvoiceStatus(Long id, Integer status) {
- boolean approve = ErpPurchaseInvoiceAuditStatusEnum.APPROVE.getStatus().equals(status);
- // 1.1 鏍￠獙瀛樺湪
- ErpPurchaseInvoiceDO invoice = validatePurchaseInvoiceExists(id);
- // 1.2 鏍￠獙鐘舵��
- if (invoice.getAuditStatus().equals(status)) {
- throw exception(approve ? PURCHASE_INVOICE_APPROVE_FAIL : PURCHASE_INVOICE_PROCESS_FAIL);
- }
-
- // 2. 鏇存柊鐘舵��
- int updateCount = invoiceMapper.updateByIdAndStatus(id, invoice.getAuditStatus(),
- new ErpPurchaseInvoiceDO().setAuditStatus(status));
- if (updateCount == 0) {
- throw exception(approve ? PURCHASE_INVOICE_APPROVE_FAIL : PURCHASE_INVOICE_PROCESS_FAIL);
- }
}
private ErpPurchaseInvoiceDO validatePurchaseInvoiceExists(Long id) {
@@ -189,18 +179,66 @@
}
@Override
- public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListByOrderIdAndStatus(Long orderId, Collection<Integer> auditStatuses) {
- return invoiceMapper.selectListByOrderIdAndStatus(orderId, auditStatuses);
+ public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListByOrderId(Long orderId) {
+ return invoiceMapper.selectListByOrderId(orderId);
}
@Override
- public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListBySupplierIdAndStatus(Long supplierId, Collection<Integer> auditStatuses) {
- return invoiceMapper.selectListBySupplierIdAndStatus(supplierId, auditStatuses);
+ public List<ErpPurchaseInvoiceDO> getPurchaseInvoiceListBySupplierId(Long supplierId) {
+ return invoiceMapper.selectListBySupplierId(supplierId);
}
@Override
- public Long getAuditInvoiceCount() {
- return invoiceMapper.selectCountByAudit();
+ 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