Merge branch 'dev_business' into fix/hsy/20260811

hsy

6 小时以前 44840942aba889088a86d2b3d93856530bb2dc25

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/purchase/ErpPurchaseOrderServiceImpl.java

@@ -27,6 +27,7 @@
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 cn.iocoder.yudao.module.system.api.storage.StorageAttachmentApi;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.flowable.engine.repository.ProcessDefinition;
@@ -40,12 +41,13 @@

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.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
import static cn.iocoder.yudao.module.erp.enums.ErrorCodeConstants.*;

/**
 * ERP 采购订单 Service 实现类
 *
 * @author 芋道源码
 * @author 超级管理员
 */
@Service
@Validated
@@ -55,7 +57,11 @@
    /**
     * BPM 采购订单审批分类编码
     */
    private static final String PURCHASE_ORDER_APPROVE_CATEGORY_CODE = "purchase_request_approve";
    private static final String PURCHASE_ORDER_APPROVE_CATEGORY_CODE = "purchase_order_approve";
    /**
     * BPM 采购订单审批流程定义 Key（创建订单后自动提交到协同办公审批）
     */
    private static final String PURCHASE_ORDER_APPROVE_PROCESS_DEFINITION_KEY = "purchase_order_approve";

    @Resource
    private ErpPurchaseOrderMapper purchaseOrderMapper;
@@ -86,6 +92,9 @@
    @Resource
    private ErpPurchaseRequestMapper purchaseRequestMapper;

    @Resource
    private StorageAttachmentApi storageAttachmentApi;

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long createPurchaseOrder(ErpPurchaseOrderSaveReqVO createReqVO) {
@@ -112,6 +121,13 @@
        // 2.2 插入订单项
        purchaseOrderItems.forEach(o -> o.setOrderId(purchaseOrder.getId()));
        purchaseOrderItemMapper.insertBatch(purchaseOrderItems);
        // 2.3 绑定附件
        storageAttachmentApi.bindAttachments("file", "erp_purchase_order",
                purchaseOrder.getId(), createReqVO.getBlobIds());

        // 3. 创建后自动提交审批到协同办公（审批在协同办公完成，不在本页面审批）
        submitPurchaseOrder(purchaseOrder.getId(), PURCHASE_ORDER_APPROVE_PROCESS_DEFINITION_KEY, getLoginUserId());

        return purchaseOrder.getId();
    }

@@ -139,6 +155,8 @@
        purchaseOrderMapper.updateById(updateObj);
        // 2.2 更新订单项
        updatePurchaseOrderItemList(updateReqVO.getId(), purchaseOrderItems);
        // 2.3 更新附件
        storageAttachmentApi.updateAttachments("file", "erp_purchase_order", updateReqVO.getId(), updateReqVO.getBlobIds());
    }

    private void calculateTotalPrice(ErpPurchaseOrderDO purchaseOrder, List<ErpPurchaseOrderItemDO> purchaseOrderItems) {
@@ -279,7 +297,7 @@
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
            return ErpAuditStatus.APPROVE.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
            return ErpAuditStatus.PROCESS.getStatus();
            return ErpAuditStatus.REJECT.getStatus();
        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
            return ErpAuditStatus.CANCEL.getStatus();
        }
@@ -374,7 +392,11 @@

        // 2. 遍历删除
        purchaseOrders.forEach(purchaseOrder -> {
            // 2.1 删除附件
            storageAttachmentApi.deleteAttachmentsByRecord("erp_purchase_order", purchaseOrder.getId());
            // 2.2 删除订单
            purchaseOrderMapper.deleteById(purchaseOrder.getId());
            // 2.3 删除订单项
            purchaseOrderItemMapper.deleteByOrderId(purchaseOrder.getId());
        });
    }
@@ -390,6 +412,11 @@
    @Override
    public ErpPurchaseOrderDO getPurchaseOrder(Long id) {
        return purchaseOrderMapper.selectById(id);
    }

    @Override
    public ErpPurchaseOrderDO getPurchaseOrderByProcessInstanceId(String processInstanceId) {
        return purchaseOrderMapper.selectByProcessInstanceId(processInstanceId);
    }

    @Override
@@ -438,6 +465,14 @@
    }

    @Override
    public List<ErpPurchaseOrderDO> getPurchaseOrderListBySource(Integer sourceType, Long sourceId) {
        if (sourceType == null || sourceId == null) {
            return Collections.emptyList();
        }
        return purchaseOrderMapper.selectListBySource(sourceType, sourceId);
    }

    @Override
    public void updatePurchaseOrderInStatus(Long orderId) {
        // 1. 获取采购订单
        ErpPurchaseOrderDO order = validatePurchaseOrderExists(orderId);
@@ -446,17 +481,31 @@
        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 采购订单明细列表