From 8c14b50773a1e582b652c03f5a63bb2233d069b8 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 13 七月 2026 08:55:20 +0800
Subject: [PATCH] 1.仓储物流-采购模块联动 2.仓储物流-销售模块联动 3.清理表数据
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java | 48 +++++++++---------------------------------------
1 files changed, 9 insertions(+), 39 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
index 20fb4ae..7c84c15 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/finance/ErpFinanceReceiptServiceImpl.java
@@ -1,25 +1,17 @@
package cn.iocoder.yudao.module.erp.service.finance;
import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.lang.Assert;
-import cn.hutool.core.util.ObjectUtil;
import cn.iocoder.yudao.framework.common.pojo.PageResult;
-import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.receipt.ErpFinanceReceiptPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.finance.vo.receipt.ErpFinanceReceiptSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinanceReceiptDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.finance.ErpFinanceReceiptItemDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOutDO;
-import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleReturnDO;
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinanceReceiptItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.finance.ErpFinanceReceiptMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
-import cn.iocoder.yudao.module.erp.enums.common.ErpBizTypeEnum;
-import cn.iocoder.yudao.module.erp.service.sale.ErpSaleOutService;
-import cn.iocoder.yudao.module.erp.service.sale.ErpSaleReturnService;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import jakarta.annotation.Resource;
import org.springframework.stereotype.Service;
@@ -34,8 +26,6 @@
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;
-
-// TODO 鑺嬭壙锛氳褰曟搷浣滄棩蹇�
/**
* ERP 鏀舵鍗� Service 瀹炵幇绫�
@@ -58,10 +48,6 @@
private CrmCustomerApi customerApi;
@Resource
private ErpAccountService accountService;
- @Resource
- private ErpSaleOutService saleOutService;
- @Resource
- private ErpSaleReturnService saleReturnService;
@Resource
private AdminUserApi adminUserApi;
@@ -159,17 +145,14 @@
private List<ErpFinanceReceiptItemDO> validateFinanceReceiptItems(
Long customerId,
List<ErpFinanceReceiptSaveReqVO.Item> list) {
+ // 閿�鍞嚭搴�/閫�璐у姛鑳藉凡绉婚櫎锛屾殏鏃跺彧鏀寔鎵嬪姩褰曞叆鏀舵鏄庣粏
return convertList(list, o -> BeanUtils.toBean(o, ErpFinanceReceiptItemDO.class, item -> {
- if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.SALE_OUT.getType())) {
- ErpSaleOutDO saleOut = saleOutService.validateSaleOut(item.getBizId());
- Assert.equals(saleOut.getCustomerId(), customerId, "瀹㈡埛蹇呴』鐩稿悓");
- item.setTotalPrice(saleOut.getTotalPrice()).setBizNo(saleOut.getNo());
- } else if (ObjectUtil.equal(item.getBizType(), ErpBizTypeEnum.SALE_RETURN.getType())) {
- ErpSaleReturnDO saleReturn = saleReturnService.validateSaleReturn(item.getBizId());
- Assert.equals(saleReturn.getCustomerId(), customerId, "瀹㈡埛蹇呴』鐩稿悓");
- item.setTotalPrice(saleReturn.getTotalPrice().negate()).setBizNo(saleReturn.getNo());
- } else {
- throw new IllegalArgumentException("涓氬姟绫诲瀷涓嶆纭細" + item.getBizType());
+ // 涓氬姟绫诲瀷鏍￠獙宸茬Щ闄わ紝鐩存帴浣跨敤浼犲叆鐨勬暟鎹�
+ if (item.getReceiptPrice() == null) {
+ item.setReceiptPrice(BigDecimal.ZERO);
+ }
+ if (item.getTotalPrice() == null) {
+ item.setTotalPrice(BigDecimal.ZERO);
}
}));
}
@@ -177,7 +160,7 @@
private void updateFinanceReceiptItemList(Long id, List<ErpFinanceReceiptItemDO> newList) {
// 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
List<ErpFinanceReceiptItemDO> oldList = financeReceiptItemMapper.selectListByReceiptId(id);
- List<List<ErpFinanceReceiptItemDO>> diffList = diffList(oldList, newList, // id 涓嶅悓锛屽氨璁や负鏄笉鍚岀殑璁板綍
+ List<List<ErpFinanceReceiptItemDO>> diffList = diffList(oldList, newList,
(oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
// 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
@@ -191,23 +174,10 @@
if (CollUtil.isNotEmpty(diffList.get(2))) {
financeReceiptItemMapper.deleteByIds(convertList(diffList.get(2), ErpFinanceReceiptItemDO::getId));
}
-
- // 绗笁姝ワ紝鏇存柊閿�鍞嚭搴撱�侀��璐х殑鏀舵閲戦鎯呭喌
- updateSalePrice(CollectionUtils.newArrayList(diffList));
}
private void updateSalePrice(List<ErpFinanceReceiptItemDO> receiptItems) {
- receiptItems.forEach(receiptItem -> {
- BigDecimal totalReceiptPrice = financeReceiptItemMapper.selectReceiptPriceSumByBizIdAndBizType(
- receiptItem.getBizId(), receiptItem.getBizType());
- if (ErpBizTypeEnum.SALE_OUT.getType().equals(receiptItem.getBizType())) {
- saleOutService.updateSaleInReceiptPrice(receiptItem.getBizId(), totalReceiptPrice);
- } else if (ErpBizTypeEnum.SALE_RETURN.getType().equals(receiptItem.getBizType())) {
- saleReturnService.updateSaleReturnRefundPrice(receiptItem.getBizId(), totalReceiptPrice.negate());
- } else {
- throw new IllegalArgumentException("涓氬姟绫诲瀷涓嶆纭細" + receiptItem.getBizType());
- }
- });
+ // 閿�鍞嚭搴�/閫�璐у姛鑳藉凡绉婚櫎锛屼笉鍐嶆洿鏂板叧鑱斾笟鍔￠噾棰�
}
@Override
--
Gitblit v1.9.3