From 6b5f7c66fc40d7f6099d561e31a34fbd50dd20d3 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 01 七月 2026 15:54:57 +0800
Subject: [PATCH] 初始化项目
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 106 ++++++++--------------------------------------------
1 files changed, 17 insertions(+), 89 deletions(-)
diff --git a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
index ccd1dd1..28bc81b 100644
--- a/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
+++ b/yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java
@@ -5,8 +5,6 @@
import cn.iocoder.yudao.framework.common.pojo.PageResult;
import cn.iocoder.yudao.framework.common.util.number.MoneyUtils;
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
-import cn.iocoder.yudao.module.bpm.api.task.BpmProcessInstanceApi;
-import cn.iocoder.yudao.module.bpm.api.task.dto.BpmProcessInstanceCreateReqDTO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
@@ -19,16 +17,12 @@
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
import jakarta.annotation.Resource;
-import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import java.math.BigDecimal;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
@@ -37,17 +31,14 @@
/**
* ERP 閲囪喘璁㈠崟 Service 瀹炵幇绫�
*
+ * 娉ㄦ剰锛氶噰璐鍗曚笉闇�瑕� BPM 瀹℃壒锛屽鎵规祦绋嬪湪閲囪喘鐢宠闃舵瀹屾垚銆�
+ * 閲囪喘璁㈠崟鐢遍噰璐敵璇风敓鎴愶紝鎴栫洿鎺ュ垱寤猴紙鐘舵�佷负宸插鏍革級銆�
+ *
* @author 鑺嬮亾婧愮爜
*/
@Service
@Validated
-@Slf4j
public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService {
-
- /**
- * BPM 閲囪喘璁㈠崟瀹℃壒娴佺▼鏍囪瘑
- */
- public static final String BPM_PROCESS_DEFINITION_KEY = "erp-purchase-order-audit";
@Resource
private ErpPurchaseOrderMapper purchaseOrderMapper;
@@ -63,9 +54,6 @@
private ErpSupplierService supplierService;
@Resource
private ErpAccountService accountService;
-
- @Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -84,9 +72,9 @@
throw exception(PURCHASE_ORDER_NO_EXISTS);
}
- // 2.1 鎻掑叆璁㈠崟
+ // 2.1 鎻掑叆璁㈠崟锛堥噰璐鍗曚笉闇�瑕佸鎵癸紝鐩存帴涓哄凡瀹℃牳鐘舵�侊級
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.DRAFT.getStatus()));
+ .setNo(no).setStatus(ErpAuditStatus.APPROVE.getStatus()));
calculateTotalPrice(purchaseOrder, purchaseOrderItems);
purchaseOrderMapper.insert(purchaseOrder);
// 2.2 鎻掑叆璁㈠崟椤�
@@ -100,6 +88,7 @@
public void updatePurchaseOrder(ErpPurchaseOrderSaveReqVO updateReqVO) {
// 1.1 鏍￠獙瀛樺湪
ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(updateReqVO.getId());
+ // 閲囪喘璁㈠崟涓嶅厑璁镐慨鏀癸紙宸插鏍哥姸鎬侊級
if (ErpAuditStatus.APPROVE.getStatus().equals(purchaseOrder.getStatus())) {
throw exception(PURCHASE_ORDER_UPDATE_FAIL_APPROVE, purchaseOrder.getNo());
}
@@ -136,6 +125,8 @@
@Override
@Transactional(rollbackFor = Exception.class)
public void updatePurchaseOrderStatus(Long id, Integer status) {
+ // 閲囪喘璁㈠崟涓嶅啀鏀寔鐘舵�佹祦杞紙涓嶉渶瑕佸鎵癸級
+ // 姝ゆ柟娉曚繚鐣欑敤浜庣壒娈婃儏鍐碉紙濡傚弽瀹℃牳鍚庨噸鏂板鏍革級
boolean approve = ErpAuditStatus.APPROVE.getStatus().equals(status);
// 1.1 鏍￠獙瀛樺湪
ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
@@ -143,12 +134,14 @@
if (purchaseOrder.getStatus().equals(status)) {
throw exception(approve ? PURCHASE_ORDER_APPROVE_FAIL : PURCHASE_ORDER_PROCESS_FAIL);
}
- // 1.3 瀛樺湪閲囪喘鍏ュ崟锛屾棤娉曞弽瀹℃牳
- if (!approve && purchaseOrder.getInCount().compareTo(BigDecimal.ZERO) > 0) {
+ // 1.3 瀛樺湪閲囪喘鍏ュ簱鍗曪紝鏃犳硶鍙嶅鏍�
+ BigDecimal inCount = purchaseOrder.getInCount();
+ if (!approve && inCount != null && inCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(PURCHASE_ORDER_PROCESS_FAIL_EXISTS_IN);
}
// 1.4 瀛樺湪閲囪喘閫�璐у崟锛屾棤娉曞弽瀹℃牳
- if (!approve && purchaseOrder.getReturnCount().compareTo(BigDecimal.ZERO) > 0) {
+ BigDecimal returnCount = purchaseOrder.getReturnCount();
+ if (!approve && returnCount != null && returnCount.compareTo(BigDecimal.ZERO) > 0) {
throw exception(PURCHASE_ORDER_PROCESS_FAIL_EXISTS_RETURN);
}
@@ -181,7 +174,7 @@
private void updatePurchaseOrderItemList(Long id, List<ErpPurchaseOrderItemDO> newList) {
// 绗竴姝ワ紝瀵规瘮鏂拌�佹暟鎹紝鑾峰緱娣诲姞銆佷慨鏀广�佸垹闄ょ殑鍒楄〃
List<ErpPurchaseOrderItemDO> oldList = purchaseOrderItemMapper.selectListByOrderId(id);
- List<List<ErpPurchaseOrderItemDO>> diffList = diffList(oldList, newList, // id 涓嶅悓锛屽氨璁や负鏄笉鍚岀殑璁板綍
+ List<List<ErpPurchaseOrderItemDO>> diffList = diffList(oldList, newList,
(oldVal, newVal) -> oldVal.getId().equals(newVal.getId()));
// 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
@@ -251,11 +244,9 @@
}
});
- // 2. 閬嶅巻鍒犻櫎锛屽苟璁板綍鎿嶄綔鏃ュ織
+ // 2. 閬嶅巻鍒犻櫎
purchaseOrders.forEach(purchaseOrder -> {
- // 2.1 鍒犻櫎璁㈠崟
purchaseOrderMapper.deleteById(purchaseOrder.getId());
- // 2.2 鍒犻櫎璁㈠崟椤�
purchaseOrderItemMapper.deleteByOrderId(purchaseOrder.getId());
});
}
@@ -302,67 +293,4 @@
return purchaseOrderItemMapper.selectListByOrderIds(orderIds);
}
- // ==================== BPM 娴佺▼瀹℃壒 ====================
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void submitPurchaseOrder(Long id, Long userId) {
- // 1. 鏍￠獙閲囪喘璁㈠崟澶勪簬鑽夌鐘舵��
- ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
- if (ObjectUtil.notEqual(purchaseOrder.getStatus(), ErpAuditStatus.DRAFT.getStatus())) {
- throw exception(PURCHASE_ORDER_SUBMIT_FAIL_NOT_DRAFT);
- }
-
- // 2. 鍒涘缓閲囪喘璁㈠崟瀹℃壒娴佺▼瀹炰緥
- String processInstanceId = bpmProcessInstanceApi.createProcessInstance(userId, new BpmProcessInstanceCreateReqDTO()
- .setProcessDefinitionKey(BPM_PROCESS_DEFINITION_KEY)
- .setBusinessKey(String.valueOf(id)));
-
- // 3. 鏇存柊閲囪喘璁㈠崟宸ヤ綔娴佺紪鍙枫�佺姸鎬�
- purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
- .setId(id)
- .setProcessInstanceId(processInstanceId)
- .setStatus(ErpAuditStatus.PROCESS.getStatus()));
- }
-
- @Override
- @Transactional(rollbackFor = Exception.class)
- public void updatePurchaseOrderAuditStatus(Long id, Integer bpmResult) {
- // 1. 鏍￠獙閲囪喘璁㈠崟瀛樺湪
- ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
-
- // 2. 鏍￠獙閲囪喘璁㈠崟澶勪簬瀹℃壒涓�
- if (ObjectUtil.notEqual(purchaseOrder.getStatus(), ErpAuditStatus.PROCESS.getStatus())) {
- log.error("[updatePurchaseOrderAuditStatus][purchaseOrder({}) 涓嶅浜庡鎵逛腑锛屾棤娉曟洿鏂板鎵圭粨鏋�({})]",
- purchaseOrder.getId(), bpmResult);
- throw exception(PURCHASE_ORDER_UPDATE_AUDIT_STATUS_FAIL_NOT_PROCESS);
- }
-
- // 3. 鏇存柊閲囪喘璁㈠崟瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
- purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
- .setId(id)
- .setStatus(auditStatus));
- }
-
- /**
- * 灏� BPM 瀹℃壒缁撴灉杞崲涓� ERP 瀹℃壒鐘舵��
- *
- * @param bpmResult BPM 瀹℃壒缁撴灉
- * @return ERP 瀹℃壒鐘舵��
- */
- private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
- // BPM 瀹℃壒缁撴灉锛�2=閫氳繃锛�3=涓嶉�氳繃锛�4=宸插彇娑�
- if (bpmResult == 2) {
- return ErpAuditStatus.APPROVE.getStatus();
- } else if (bpmResult == 3) {
- return ErpAuditStatus.REJECT.getStatus();
- } else if (bpmResult == 4) {
- return ErpAuditStatus.DRAFT.getStatus();
- } else {
- log.warn("[convertBpmResultToAuditStatus][鏈煡鐨� BPM 瀹℃壒缁撴灉({})]", bpmResult);
- return ErpAuditStatus.PROCESS.getStatus();
- }
- }
-
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3