From 5140e16bd1cb2bdf974d47a4342f9e27ef804655 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 18 七月 2026 15:54:07 +0800
Subject: [PATCH] feat(erp): 增加销售订单MPS集成与发货通知单控制功能
---
yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java | 230 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 223 insertions(+), 7 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 ec5cd18..7e24cea 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,17 +5,32 @@
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.bpm.dal.dataobject.definition.BpmCategoryDO;
+import cn.iocoder.yudao.module.bpm.dal.dataobject.definition.BpmProcessDefinitionInfoDO;
+import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmCategoryService;
+import cn.iocoder.yudao.module.bpm.service.definition.BpmProcessDefinitionService;
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.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.ErpPurchaseRequestItemDO;
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.mysql.purchase.ErpPurchaseRequestItemMapper;
+import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseRequestMapper;
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.mes.api.arrivalnotice.MesArrivalNoticeApi;
import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.flowable.engine.repository.ProcessDefinition;
+import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
@@ -34,7 +49,13 @@
*/
@Service
@Validated
+@Slf4j
public class ErpPurchaseOrderServiceImpl implements ErpPurchaseOrderService {
+
+ /**
+ * BPM 閲囪喘璁㈠崟瀹℃壒鍒嗙被缂栫爜
+ */
+ private static final String PURCHASE_ORDER_APPROVE_CATEGORY_CODE = "purchase_request_approve";
@Resource
private ErpPurchaseOrderMapper purchaseOrderMapper;
@@ -48,6 +69,22 @@
private ErpSupplierService supplierService;
@Resource
private ErpAccountService accountService;
+
+ @Resource
+ private BpmProcessInstanceApi processInstanceApi;
+ @Resource
+ private BpmCategoryService bpmCategoryService;
+ @Resource
+ private BpmProcessDefinitionService bpmProcessDefinitionService;
+
+ @Resource
+ @Lazy
+ private MesArrivalNoticeApi arrivalNoticeApi;
+
+ @Resource
+ private ErpPurchaseRequestItemMapper purchaseRequestItemMapper;
+ @Resource
+ private ErpPurchaseRequestMapper purchaseRequestMapper;
@Override
@Transactional(rollbackFor = Exception.class)
@@ -66,9 +103,10 @@
throw exception(PURCHASE_ORDER_NO_EXISTS);
}
- // 2.1 鎻掑叆璁㈠崟锛堥噰璐鍗曚笉闇�瑕佸鎵癸紝鐩存帴涓哄凡瀹℃牳鐘舵�侊級
+ // 2.1 鎻掑叆璁㈠崟锛堥噰璐鍗曞垱寤哄悗涓烘湭瀹℃牳鐘舵�侊紝闇�瑕佹彁浜ゅ鎵癸級
ErpPurchaseOrderDO purchaseOrder = BeanUtils.toBean(createReqVO, ErpPurchaseOrderDO.class, in -> in
- .setNo(no).setStatus(ErpAuditStatus.APPROVE.getStatus()));
+ .setNo(no).setStatus(ErpAuditStatus.PROCESS.getStatus())
+ .setInCount(BigDecimal.ZERO).setInStatus(ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus()));
calculateTotalPrice(purchaseOrder, purchaseOrderItems);
purchaseOrderMapper.insert(purchaseOrder);
// 2.2 鎻掑叆璁㈠崟椤�
@@ -119,8 +157,6 @@
@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);
@@ -145,6 +181,109 @@
if (updateCount == 0) {
throw exception(approve ? PURCHASE_ORDER_APPROVE_FAIL : PURCHASE_ORDER_PROCESS_FAIL);
}
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void submitPurchaseOrder(Long id, String processDefinitionKey, Long userId) {
+ // 1. 鏍￠獙瀛樺湪 + 鏈鏍哥姸鎬�
+ ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
+ if (!ErpAuditStatus.PROCESS.getStatus().equals(purchaseOrder.getStatus())) {
+ throw exception(PURCHASE_ORDER_SUBMIT_FAIL_STATUS);
+ }
+
+ // 2. 鍒涘缓 BPM 娴佺▼瀹炰緥
+ String processInstanceId = processInstanceApi.createProcessInstance(userId,
+ new BpmProcessInstanceCreateReqDTO()
+ .setProcessDefinitionKey(processDefinitionKey)
+ .setBusinessKey(String.valueOf(id)));
+
+ // 3. 鏇存柊閲囪喘璁㈠崟鐘舵�佷负瀹℃壒涓�
+ purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
+ .setId(id)
+ .setStatus(ErpAuditStatus.APPROVING.getStatus())
+ .setProcessInstanceId(processInstanceId));
+ }
+
+ @Override
+ public List<Map<String, Object>> getPurchaseOrderApproveProcessDefinitionList() {
+ // 1. 鏍￠獙鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
+ validatePurchaseOrderApproveCategoryAndProcessDefinition();
+
+ // 2. 鑾峰彇鍒嗙被涓嬬殑娴佺▼瀹氫箟淇℃伅
+ List<BpmProcessDefinitionInfoDO> definitionInfoList = bpmProcessDefinitionService
+ .getProcessDefinitionInfoListByCategory(PURCHASE_ORDER_APPROVE_CATEGORY_CODE);
+ if (CollUtil.isEmpty(definitionInfoList)) {
+ return Collections.emptyList();
+ }
+
+ // 3. 閬嶅巻鑾峰彇娴佺▼瀹氫箟璇︽儏锛岃繃婊ゆ縺娲荤姸鎬侊紝淇濈暀鏈�鏂扮増鏈�
+ Map<String, ProcessDefinition> latestVersionMap = new HashMap<>();
+ for (BpmProcessDefinitionInfoDO info : definitionInfoList) {
+ ProcessDefinition pd = bpmProcessDefinitionService.getProcessDefinition(info.getProcessDefinitionId());
+ if (pd == null || pd.isSuspended()) {
+ continue;
+ }
+ ProcessDefinition existing = latestVersionMap.get(pd.getKey());
+ if (existing == null || pd.getVersion() > existing.getVersion()) {
+ latestVersionMap.put(pd.getKey(), pd);
+ }
+ }
+
+ // 4. 杩斿洖娴佺▼瀹氫箟鍒楄〃
+ List<Map<String, Object>> result = new ArrayList<>();
+ for (ProcessDefinition pd : latestVersionMap.values()) {
+ Map<String, Object> item = new HashMap<>();
+ item.put("id", pd.getId());
+ item.put("key", pd.getKey());
+ item.put("name", pd.getName());
+ result.add(item);
+ }
+ return result;
+ }
+
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void updatePurchaseOrderAuditStatus(Long id, Integer bpmResult) {
+ // 1. 鏍￠獙瀛樺湪
+ ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrderExists(id);
+ if (!ErpAuditStatus.APPROVING.getStatus().equals(purchaseOrder.getStatus())) {
+ log.warn("[updatePurchaseOrderAuditStatus] 閲囪喘璁㈠崟({}) 涓嶅浜庡鎵逛腑鐘舵��", id);
+ return;
+ }
+
+ // 2. 鏍规嵁瀹℃壒缁撴灉鏇存柊鐘舵��
+ Integer newStatus = convertBpmResultToAuditStatus(bpmResult);
+ if (newStatus != null) {
+ purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
+ .setId(id).setStatus(newStatus));
+ }
+ }
+
+ /**
+ * 鏍￠獙閲囪喘璁㈠崟瀹℃壒鍒嗙被鍜屾祦绋嬪畾涔夋槸鍚﹀瓨鍦�
+ */
+ private void validatePurchaseOrderApproveCategoryAndProcessDefinition() {
+ // 1. 鏍￠獙鍒嗙被鏄惁瀛樺湪
+ List<BpmCategoryDO> categories = bpmCategoryService.getCategoryListByCode(
+ Collections.singletonList(PURCHASE_ORDER_APPROVE_CATEGORY_CODE));
+ if (CollUtil.isEmpty(categories)) {
+ throw exception(PURCHASE_ORDER_BPM_CATEGORY_NOT_EXISTS);
+ }
+ }
+
+ /**
+ * 杞崲 BPM 瀹℃壒缁撴灉涓哄鏍哥姸鎬�
+ */
+ private Integer convertBpmResultToAuditStatus(Integer bpmResult) {
+ if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.APPROVE.getStatus();
+ } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.PROCESS.getStatus();
+ } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
+ return ErpAuditStatus.CANCEL.getStatus();
+ }
+ return null;
}
private List<ErpPurchaseOrderItemDO> validatePurchaseOrderItems(List<ErpPurchaseOrderSaveReqVO.Item> list) {
@@ -307,11 +446,70 @@
if (CollUtil.isEmpty(items)) {
return;
}
- // 3. 璁＄畻鍏ュ簱鐘舵��
+ // 3. 璁＄畻鍏ュ簱鐘舵�佸拰鎬诲叆搴撴暟閲�
int inStatus = calculateInStatus(items);
- // 4. 鏇存柊閲囪喘璁㈠崟鍏ュ簱鐘舵��
+ BigDecimal totalInCount = calculateTotalInCount(items);
+ // 4. 鏇存柊閲囪喘璁㈠崟鍏ュ簱鐘舵�佸拰鍏ュ簱鏁伴噺
purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
- .setId(orderId).setInStatus(inStatus));
+ .setId(orderId).setInStatus(inStatus).setInCount(totalInCount));
+
+ // 5. 鍥炲啓閲囪喘鐢宠鏄庣粏鐨勫叆搴撴暟閲忓拰閲囪喘鐢宠鐨勫叆搴撶姸鎬�
+ updatePurchaseRequestInStatus(items, inStatus);
+ }
+
+ /**
+ * 璁＄畻鎬诲叆搴撴暟閲�
+ */
+ private BigDecimal calculateTotalInCount(List<ErpPurchaseOrderItemDO> items) {
+ BigDecimal total = BigDecimal.ZERO;
+ for (ErpPurchaseOrderItemDO item : items) {
+ if (item.getInCount() != null) {
+ total = total.add(item.getInCount());
+ }
+ }
+ return total;
+ }
+
+ /**
+ * 鍥炲啓閲囪喘鐢宠鍏ュ簱鏁伴噺鍜屽叆搴撶姸鎬�
+ *
+ * @param orderItems 閲囪喘璁㈠崟鏄庣粏鍒楄〃
+ * @param orderInStatus 閲囪喘璁㈠崟鍏ュ簱鐘舵��
+ */
+ private void updatePurchaseRequestInStatus(List<ErpPurchaseOrderItemDO> orderItems, int orderInStatus) {
+ // 鑾峰彇鎵�鏈夊叧鑱旂殑閲囪喘鐢宠鏄庣粏 ID
+ Set<Long> requestItemIds = new HashSet<>();
+ for (ErpPurchaseOrderItemDO item : orderItems) {
+ if (item.getRequestItemId() != null) {
+ requestItemIds.add(item.getRequestItemId());
+ }
+ }
+ if (requestItemIds.isEmpty()) {
+ return;
+ }
+
+ // 鏇存柊閲囪喘鐢宠鏄庣粏鐨勫叆搴撴暟閲�
+ for (ErpPurchaseOrderItemDO orderItem : orderItems) {
+ if (orderItem.getRequestItemId() != null && orderItem.getInCount() != null) {
+ purchaseRequestItemMapper.updateById(new ErpPurchaseRequestItemDO()
+ .setId(orderItem.getRequestItemId())
+ .setInCount(orderItem.getInCount()));
+ }
+ }
+
+ // 鑾峰彇閲囪喘鐢宠鏄庣粏锛屾壘鍒板搴旂殑閲囪喘鐢宠 ID
+ List<ErpPurchaseRequestItemDO> requestItems = purchaseRequestItemMapper.selectBatchIds(requestItemIds);
+ if (CollUtil.isEmpty(requestItems)) {
+ return;
+ }
+ Set<Long> requestIds = convertSet(requestItems, ErpPurchaseRequestItemDO::getRequestId);
+
+ // 鏇存柊閲囪喘鐢宠鐨勫叆搴撶姸鎬�
+ for (Long requestId : requestIds) {
+ purchaseRequestMapper.updateById(new ErpPurchaseRequestDO()
+ .setId(requestId)
+ .setInStatus(orderInStatus));
+ }
}
/**
@@ -345,4 +543,22 @@
}
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public Long confirmReceipt(Long id) {
+ // 1. 鏍￠獙閲囪喘璁㈠崟瀛樺湪涓斿凡瀹℃牳
+ ErpPurchaseOrderDO purchaseOrder = validatePurchaseOrder(id);
+
+ // 2. 鏍￠獙閲囪喘璁㈠崟鏈叏閮ㄥ叆搴�
+ if (ErpPurchaseOrderInStatusEnum.ALL_IN.getStatus().equals(purchaseOrder.getInStatus())) {
+ throw exception(PURCHASE_ORDER_ALL_IN);
+ }
+
+ // 3. 璋冪敤 MES 鎺ュ彛鐢熸垚鍒拌揣閫氱煡鍗�
+ Long arrivalNoticeId = arrivalNoticeApi.generateArrivalNoticeFromPurchaseOrder(id);
+ log.info("[confirmReceipt] 閲囪喘璁㈠崟({}) 纭鏀惰揣锛岀敓鎴愬埌璐ч�氱煡鍗�({})", id, arrivalNoticeId);
+
+ return arrivalNoticeId;
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3