From a0d55bcc8bfebd408d16166b27b7e05b3e4c9f4a Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期一, 02 十一月 2026 16:51:50 +0800
Subject: [PATCH] feat(erp): 采购/销售明细按含税单价口径拆税，供应商合同补供应商名称与附件
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseRequestServiceImpl.java | 53 ++++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 44 insertions(+), 9 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 96eb059..20965c5 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
@@ -18,9 +18,11 @@
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestImportRespVO;
+import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.request.ErpPurchaseRequestDeptStatisticsRespVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDO;
+import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestDeptStatisticsDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseRequestItemDO;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
@@ -34,6 +36,7 @@
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import cn.iocoder.yudao.module.system.api.dept.DeptApi;
+import cn.iocoder.yudao.module.system.api.dept.dto.DeptRespDTO;
import cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import cn.iocoder.yudao.module.system.api.user.AdminUserApi;
import cn.iocoder.yudao.module.system.api.user.dto.AdminUserRespDTO;
@@ -119,10 +122,12 @@
throw exception(PURCHASE_REQUEST_NO_EXISTS);
}
- // 4. 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
- Long userId = Long.parseLong(getCurrentUserId());
+ // 4. 瑙ｆ瀽鐢宠浜� / 鐢宠閮ㄩ棬锛氭湭鎸囧畾鏃跺彇褰撳墠鐧诲綍鐢ㄦ埛鍙婂叾鎵�灞為儴闂�
+ Long userId = createReqVO.getRequestUserId() != null
+ ? createReqVO.getRequestUserId() : Long.parseLong(getCurrentUserId());
AdminUserRespDTO user = adminUserApi.getUser(userId);
- Long deptId = user != null ? user.getDeptId() : null;
+ Long deptId = createReqVO.getRequestDeptId() != null
+ ? createReqVO.getRequestDeptId() : (user != null ? user.getDeptId() : null);
// 5. 鎻掑叆鐢宠鍗�
ErpPurchaseRequestDO purchaseRequest = BeanUtils.toBean(createReqVO, ErpPurchaseRequestDO.class, req -> req
@@ -358,9 +363,12 @@
private void calculateTotalPrice(ErpPurchaseRequestDO purchaseRequest, List<ErpPurchaseRequestItemDO> requestItems) {
purchaseRequest.setTotalCount(getSumValue(requestItems, ErpPurchaseRequestItemDO::getCount, BigDecimal::add));
- purchaseRequest.setTotalProductPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalTaxPrice(getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO));
- purchaseRequest.setTotalPrice(purchaseRequest.getTotalProductPrice().add(purchaseRequest.getTotalTaxPrice()));
+ // 鏄庣粏鐨� totalPrice 鏄�屾暟閲� 脳 鍚◣鍗曚环銆嶏紝鍗冲惈绋庢�讳环锛涗笉鍚◣閲戦 = 鍚◣鎬讳环 鈭� 绋庨
+ BigDecimal totalPriceWithTax = getSumValue(requestItems, ErpPurchaseRequestItemDO::getTotalPrice, BigDecimal::add, BigDecimal.ZERO);
+ BigDecimal totalTaxPrice = getSumValue(requestItems, ErpPurchaseRequestItemDO::getTaxPrice, BigDecimal::add, BigDecimal.ZERO);
+ purchaseRequest.setTotalTaxPrice(totalTaxPrice);
+ purchaseRequest.setTotalPrice(totalPriceWithTax);
+ purchaseRequest.setTotalProductPrice(totalPriceWithTax.subtract(totalTaxPrice));
// 璁＄畻浼樻儬浠锋牸
if (purchaseRequest.getDiscountPercent() == null) {
purchaseRequest.setDiscountPercent(BigDecimal.ZERO);
@@ -372,10 +380,9 @@
private List<ErpPurchaseRequestItemDO> validatePurchaseRequestItems(List<ErpPurchaseRequestSaveReqVO.Item> list) {
return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseRequestItemDO.class, item -> {
if (item.getProductPrice() != null && item.getCount() != null) {
+ // 浜у搧鍗曚环涓哄惈绋庡崟浠凤細琛屾�讳环 = 鏁伴噺 脳 鍚◣鍗曚环锛岀◣棰濆啀浠庡惈绋庢�讳环閲屽�掔畻
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
- if (item.getTaxPercent() != null) {
- item.setTaxPrice(MoneyUtils.priceMultiplyPercent(item.getTotalPrice(), item.getTaxPercent()));
- }
+ item.setTaxPrice(MoneyUtils.priceCalculateTaxIncluded(item.getTotalPrice(), item.getTaxPercent()));
}
}));
}
@@ -463,6 +470,16 @@
}
// 3. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ // 鍏ㄥ眬鍏嶅鎵癸細涓氬姟鏍￠獙閫氳繃鍚庣洿鎺ユ墽琛屽鎵归�氳繃閫昏緫锛屾棤闇�娴佺▼妯″瀷銆�
+ if (processInstanceApi.isGlobalAutoApprove()) {
+ purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+ .setId(id)
+ .setStatus(ErpPurchaseRequestStatusEnum.PROCESS.getStatus())
+ .setProcessInstanceId(""));
+ updatePurchaseRequestAuditStatus(id, cn.iocoder.yudao.module.bpm.enums.task.BpmProcessInstanceStatusEnum.APPROVE.getStatus());
+ return;
+ }
+
String processInstanceId = processInstanceApi.createProcessInstance(userId,
new BpmProcessInstanceCreateReqDTO()
.setProcessDefinitionKey(processDefinitionKey)
@@ -630,6 +647,24 @@
return purchaseOrder.getId();
}
+ @Override
+ public List<ErpPurchaseRequestDeptStatisticsRespVO> getDeptStatistics(LocalDateTime beginTime, LocalDateTime endTime) {
+ List<ErpPurchaseRequestDeptStatisticsDO> statisticsList = purchaseRequestMapper.selectDeptStatistics(beginTime, endTime);
+ if (CollUtil.isEmpty(statisticsList)) {
+ return Collections.emptyList();
+ }
+ Map<Long, DeptRespDTO> deptMap = deptApi.getDeptMap(convertSet(statisticsList, ErpPurchaseRequestDeptStatisticsDO::getDeptId));
+ return BeanUtils.toBean(statisticsList, ErpPurchaseRequestDeptStatisticsRespVO.class, vo -> {
+ if (vo.getDeptId() == null) {
+ vo.setDeptName("鏈寚瀹氶儴闂�");
+ return;
+ }
+ DeptRespDTO dept = deptMap.get(vo.getDeptId());
+ // 閮ㄩ棬宸插垹闄ゆ椂鍥為��涓哄彲璇荤紪鍙凤紝閬垮厤鍑虹幇绌虹櫧鐨勯儴闂ㄥ垪
+ vo.setDeptName(dept != null ? dept.getName() : "閮ㄩ棬(ID=" + vo.getDeptId() + ")");
+ });
+ }
+
/**
* 鏍￠獙閲囪喘鐢宠瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
*/
--
Gitblit v1.9.3