From 88e384da863bb2f7324cb1e1474885df3b7cce91 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 13 七月 2026 11:27:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_business' into dev_business
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 156 ++++++++++++++++++++++++---------------------------
1 files changed, 74 insertions(+), 82 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..80777de 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,30 +5,24 @@
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;
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.mysql.purchase.ErpPurchaseOrderItemMapper;
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.ErpAuditStatus;
+import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
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.context.annotation.Lazy;
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;
@@ -58,14 +49,13 @@
private ErpNoRedisDAO noRedisDAO;
@Resource
- private ErpProductService productService;
- @Resource
private ErpSupplierService supplierService;
@Resource
private ErpAccountService accountService;
@Resource
- private BpmProcessInstanceApi bpmProcessInstanceApi;
+ @Lazy
+ private ErpPurchaseRequestService purchaseRequestService;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -84,9 +74,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 +90,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 +127,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 +136,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);
}
@@ -161,13 +156,8 @@
}
private List<ErpPurchaseOrderItemDO> validatePurchaseOrderItems(List<ErpPurchaseOrderSaveReqVO.Item> list) {
- // 1. 鏍￠獙浜у搧瀛樺湪
- List<ErpProductDO> productList = productService.validProductList(
- convertSet(list, ErpPurchaseOrderSaveReqVO.Item::getProductId));
- Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
- // 2. 杞寲涓� ErpPurchaseOrderItemDO 鍒楄〃
+ // 杞寲涓� ErpPurchaseOrderItemDO 鍒楄〃锛堜骇鍝侀獙璇佸凡绉婚櫎锛�
return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseOrderItemDO.class, item -> {
- item.setProductUnitId(productMap.get(item.getProductId()).getUnitId());
item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
if (item.getTotalPrice() == null) {
return;
@@ -181,7 +171,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()));
// 绗簩姝ワ紝鎵归噺娣诲姞銆佷慨鏀广�佸垹闄�
@@ -208,7 +198,7 @@
}
if (inCount.compareTo(item.getCount()) > 0) {
throw exception(PURCHASE_ORDER_ITEM_IN_FAIL_PRODUCT_EXCEED,
- productService.getProduct(item.getProductId()).getName(), item.getCount());
+ "浜у搧ID:" + item.getProductId(), item.getCount());
}
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setInCount(inCount));
});
@@ -228,7 +218,7 @@
}
if (returnCount.compareTo(item.getInCount()) > 0) {
throw exception(PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED,
- productService.getProduct(item.getProductId()).getName(), item.getInCount());
+ "浜у搧ID:" + item.getProductId(), item.getInCount());
}
purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
});
@@ -251,11 +241,9 @@
}
});
- // 2. 閬嶅巻鍒犻櫎锛屽苟璁板綍鎿嶄綔鏃ュ織
+ // 2. 閬嶅巻鍒犻櫎
purchaseOrders.forEach(purchaseOrder -> {
- // 2.1 鍒犻櫎璁㈠崟
purchaseOrderMapper.deleteById(purchaseOrder.getId());
- // 2.2 鍒犻櫎璁㈠崟椤�
purchaseOrderItemMapper.deleteByOrderId(purchaseOrder.getId());
});
}
@@ -302,67 +290,71 @@
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);
+ public List<ErpPurchaseOrderDO> getPurchaseOrderListBySupplierIdAndStatus(Long supplierId, Integer status) {
+ if (supplierId == null) {
+ return Collections.emptyList();
}
-
- // 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()));
+ return purchaseOrderMapper.selectList(supplierId, status);
}
@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);
+ public List<ErpPurchaseOrderDO> getPurchaseOrderList(List<Long> ids) {
+ if (CollUtil.isEmpty(ids)) {
+ return Collections.emptyList();
}
+ return purchaseOrderMapper.selectByIds(ids);
+ }
- // 3. 鏇存柊閲囪喘璁㈠崟瀹℃壒缁撴灉
- Integer auditStatus = convertBpmResultToAuditStatus(bpmResult);
+ @Override
+ public void updatePurchaseOrderInStatus(Long orderId) {
+ // 1. 鑾峰彇閲囪喘璁㈠崟
+ ErpPurchaseOrderDO order = validatePurchaseOrderExists(orderId);
+ // 2. 鑾峰彇閲囪喘璁㈠崟鏄庣粏
+ List<ErpPurchaseOrderItemDO> items = purchaseOrderItemMapper.selectListByOrderId(orderId);
+ if (CollUtil.isEmpty(items)) {
+ return;
+ }
+ // 3. 璁＄畻鍏ュ簱鐘舵��
+ int inStatus = calculateInStatus(items);
+ // 4. 鏇存柊閲囪喘璁㈠崟鍏ュ簱鐘舵��
purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
- .setId(id)
- .setStatus(auditStatus));
+ .setId(orderId).setInStatus(inStatus));
+ // 5. 鍚屾鏇存柊閲囪喘鐢宠鐨勫叆搴撶姸鎬侊紙濡傛灉鏈夊叧鑱旂殑閲囪喘鐢宠锛�
+ if (order.getRequestId() != null) {
+ purchaseRequestService.updatePurchaseRequestInStatus(order.getRequestId(), inStatus);
+ }
}
/**
- * 灏� BPM 瀹℃壒缁撴灉杞崲涓� ERP 瀹℃壒鐘舵��
+ * 璁＄畻鍏ュ簱鐘舵��
*
- * @param bpmResult BPM 瀹℃壒缁撴灉
- * @return ERP 瀹℃壒鐘舵��
+ * @param items 閲囪喘璁㈠崟鏄庣粏鍒楄〃
+ * @return 鍏ュ簱鐘舵��
*/
- 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();
+ private int calculateInStatus(List<ErpPurchaseOrderItemDO> items) {
+ boolean allIn = true;
+ boolean anyIn = false;
+
+ for (ErpPurchaseOrderItemDO item : items) {
+ BigDecimal count = item.getCount() != null ? item.getCount() : BigDecimal.ZERO;
+ BigDecimal inCount = item.getInCount() != null ? item.getInCount() : BigDecimal.ZERO;
+
+ if (inCount.compareTo(BigDecimal.ZERO) > 0) {
+ anyIn = true;
+ }
+ if (inCount.compareTo(count) < 0) {
+ allIn = false;
+ }
+ }
+
+ if (allIn) {
+ return ErpPurchaseOrderInStatusEnum.ALL_IN.getStatus();
+ } else if (anyIn) {
+ return ErpPurchaseOrderInStatusEnum.PART_IN.getStatus();
} else {
- log.warn("[convertBpmResultToAuditStatus][鏈煡鐨� BPM 瀹℃壒缁撴灉({})]", bpmResult);
- return ErpAuditStatus.PROCESS.getStatus();
+ return ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus();
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.3