feat: 打通销售采购财务闭环并完成累计业务优化

gaoluyang

3 天以前 d39e4f7d839167c16425086dfa2f8747bccfdff9

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImpl.java

@@ -78,6 +78,7 @@

        // 插入
        MesWmArrivalNoticeDO notice = BeanUtils.toBean(createReqVO, MesWmArrivalNoticeDO.class);
        fillContractNoFromPurchaseOrder(notice);
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PREPARE.getStatus());
        arrivalNoticeMapper.insert(notice);
        return notice.getId();
@@ -92,7 +93,21 @@

        // 更新
        MesWmArrivalNoticeDO updateObj = BeanUtils.toBean(updateReqVO, MesWmArrivalNoticeDO.class);
        fillContractNoFromPurchaseOrder(updateObj);
        arrivalNoticeMapper.updateById(updateObj);
    }

    /**
     * 采购合同号未显式传入时，从关联的采购订单带入（换货到货必须能追溯到原采购合同）
     */
    private void fillContractNoFromPurchaseOrder(MesWmArrivalNoticeDO notice) {
        if (notice.getPurchaseOrderId() == null || cn.hutool.core.util.StrUtil.isNotBlank(notice.getContractNo())) {
            return;
        }
        ErpPurchaseOrderRespDTO purchaseOrder = purchaseOrderApi.getPurchaseOrder(notice.getPurchaseOrderId()).getCheckedData();
        if (purchaseOrder != null) {
            notice.setContractNo(purchaseOrder.getContractNo());
        }
    }

    private void validateArrivalNoticeSaveData(MesWmArrivalNoticeSaveReqVO reqVO) {
@@ -336,6 +351,7 @@
        notice.setName(purchaseOrder.getNo() + "到货通知");
        notice.setPurchaseOrderId(purchaseOrderId);
        notice.setPurchaseOrderCode(purchaseOrder.getNo());
        notice.setContractNo(purchaseOrder.getContractNo());
        notice.setVendorId(purchaseOrder.getSupplierId());
        notice.setArrivalDate(java.time.LocalDateTime.now()); // 到货时间为当前时间
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_RECEIPT.getStatus());
@@ -414,6 +430,9 @@
        notice.setName(returnVendor.getCode() + "换货到货");
        notice.setPurchaseOrderId(returnVendor.getPurchaseOrderId());
        notice.setPurchaseOrderCode(returnVendor.getPurchaseOrderCode());
        // 换货重新关联原采购合同号：优先取退货单快照，退货单未快照时回填采购订单合同号
        notice.setContractNo(returnVendor.getContractNo());
        fillContractNoFromPurchaseOrder(notice);
        notice.setVendorId(returnVendor.getVendorId());
        notice.setArrivalDate(java.time.LocalDateTime.now());
        notice.setStatus(MesWmArrivalNoticeStatusEnum.PENDING_QC.getStatus());