追溯+分类接口

liyong

9 天以前 1ab2b329a40decba8ff7eefbeb158ff259aceb6d

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImpl.java

@@ -16,16 +16,25 @@
import cn.iocoder.yudao.module.mes.enums.MesBizTypeConstants;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmItemReceiptStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmTransactionTypeEnum;
import cn.iocoder.yudao.module.bpm.enums.task.BpmTaskStatusEnum;
import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService;
import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeLineService;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService;
import cn.iocoder.yudao.module.mes.service.wm.transaction.dto.MesWmTransactionSaveReqDTO;
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.api.purchase.ErpPurchaseOrderApi;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import jakarta.annotation.Resource;
import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.validation.annotation.Validated;
import lombok.extern.slf4j.Slf4j;

import java.math.BigDecimal;
import java.util.Collection;
@@ -40,6 +49,7 @@
 */
@Service
@Validated
@Slf4j
public class MesWmItemReceiptServiceImpl implements MesWmItemReceiptService {

    @Resource
@@ -59,6 +69,15 @@
    private MesQcIqcService iqcService;
    @Resource
    private MesWmTransactionService wmTransactionService;

    @Resource
    private MesWmArrivalNoticeLineService arrivalNoticeLineService;

    @Resource
    private BpmProcessInstanceApi processInstanceApi;

    @Resource
    private ErpPurchaseOrderApi purchaseOrderApi;

    @Override
    public Long createItemReceipt(MesWmItemReceiptSaveReqVO createReqVO) {
@@ -188,6 +207,40 @@
        if (receipt.getNoticeId() != null) {
            arrivalNoticeService.finishArrivalNotice(receipt.getNoticeId());
        }

        // 5. 回写 ERP 采购订单的入库数量
        updateErpPurchaseOrderInCount(receipt);
    }

    /**
     * 回写 ERP 采购订单的入库数量
     */
    private void updateErpPurchaseOrderInCount(MesWmItemReceiptDO receipt) {
        // 获取入库单行
        List<MesWmItemReceiptLineDO> lines = itemReceiptLineService.getItemReceiptLineListByReceiptId(receipt.getId());
        if (CollUtil.isEmpty(lines)) {
            return;
        }
        // 用于存储采购订单 ID，避免重复更新
        Long purchaseOrderId = null;
        // 遍历行，按 purchaseOrderItemId 更新入库数量
        for (MesWmItemReceiptLineDO line : lines) {
            if (line.getPurchaseOrderItemId() != null && line.getReceivedQuantity() != null) {
                purchaseOrderApi.updateOrderItemInCount(line.getPurchaseOrderItemId(), line.getReceivedQuantity());
                // 获取采购订单 ID（从第一个有效的明细项获取）
                if (purchaseOrderId == null) {
                    cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderItemRespDTO itemDTO =
                            purchaseOrderApi.getPurchaseOrderItem(line.getPurchaseOrderItemId()).getCheckedData();
                    if (itemDTO != null && itemDTO.getOrderId() != null) {
                        purchaseOrderId = itemDTO.getOrderId();
                    }
                }
            }
        }
        // 更新采购订单的入库状态
        if (purchaseOrderId != null) {
            purchaseOrderApi.updateOrderInStatus(purchaseOrderId);
        }
    }

    private void createTransactionList(MesWmItemReceiptDO receipt) {
@@ -272,4 +325,115 @@
        return itemReceiptMapper.selectByIds(ids);
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long generateItemReceiptFromArrivalNotice(Long arrivalNoticeId) {
        // 1. 校验到货通知单存在且状态为待入库
        MesWmArrivalNoticeDO notice = arrivalNoticeService.validateArrivalNoticeReadyForReceipt(arrivalNoticeId);

        // 2. 获取到货通知单行
        List<MesWmArrivalNoticeLineDO> lines = arrivalNoticeLineService.getArrivalNoticeLineListByNoticeId(arrivalNoticeId);
        if (CollUtil.isEmpty(lines)) {
            throw exception(WM_ARRIVAL_NOTICE_NO_LINE);
        }

        // 3. 生成入库单编码
        String code = generateItemReceiptCode();

        // 4. 创建入库单主表
        MesWmItemReceiptDO receipt = new MesWmItemReceiptDO();
        receipt.setCode(code);
        receipt.setName(notice.getName() + "入库单");
        receipt.setNoticeId(arrivalNoticeId);
        receipt.setPurchaseOrderCode(notice.getPurchaseOrderCode());
        receipt.setVendorId(notice.getVendorId());
        receipt.setStatus(MesWmItemReceiptStatusEnum.PREPARE.getStatus());
        itemReceiptMapper.insert(receipt);

        // 5. 遍历行创建入库单行
        for (MesWmArrivalNoticeLineDO noticeLine : lines) {
            MesWmItemReceiptLineDO receiptLine = new MesWmItemReceiptLineDO();
            receiptLine.setReceiptId(receipt.getId());
            receiptLine.setArrivalNoticeLineId(noticeLine.getId());
            receiptLine.setPurchaseOrderItemId(noticeLine.getPurchaseOrderItemId());
            receiptLine.setItemId(noticeLine.getItemId());
            // 使用合格数量（如果有 IQC 则是合格数量，否则是到货数量）
            receiptLine.setReceivedQuantity(noticeLine.getQualifiedQuantity() != null ? noticeLine.getQualifiedQuantity() : noticeLine.getArrivalQuantity());
            itemReceiptLineService.createItemReceiptLineFromArrivalNoticeLine(receiptLine);
        }

        return receipt.getId();
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void submitItemReceiptApproval(Long id, String processDefinitionKey) {
        // 1. 校验存在 + 草稿状态
        validateItemReceiptExistsAndDraft(id);

        // 2. 创建 BPM 流程实例
        Long userId = getCurrentUserId();
        String processInstanceId = processInstanceApi.createProcessInstance(userId,
                new BpmProcessInstanceCreateReqDTO()
                        .setProcessDefinitionKey(processDefinitionKey)
                        .setBusinessKey(String.valueOf(id)));

        // 3. 更新入库单状态为审批中
        itemReceiptMapper.updateById(new MesWmItemReceiptDO()
                .setId(id)
                .setStatus(MesWmItemReceiptStatusEnum.APPROVING.getStatus())
                .setProcessInstanceId(processInstanceId));
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public void updateItemReceiptAuditStatus(Long id, Integer bpmResult) {
        // 1. 校验存在
        MesWmItemReceiptDO receipt = validateItemReceiptExists(id);
        if (!MesWmItemReceiptStatusEnum.APPROVING.getStatus().equals(receipt.getStatus())) {
            log.warn("[updateItemReceiptAuditStatus] 入库单({}) 不处于审批中状态", id);
            return;
        }

        // 2. 根据审批结果更新状态
        Integer newStatus = convertBpmResultToReceiptStatus(bpmResult);
        if (newStatus != null) {
            itemReceiptMapper.updateById(new MesWmItemReceiptDO()
                    .setId(id).setStatus(newStatus));
        }
    }

    /**
     * 转换 BPM 审批结果为入库单状态
     */
    private Integer convertBpmResultToReceiptStatus(Integer bpmResult) {
        if (BpmTaskStatusEnum.APPROVE.getStatus().equals(bpmResult)) {
            return MesWmItemReceiptStatusEnum.APPROVED.getStatus();
        } else if (BpmTaskStatusEnum.REJECT.getStatus().equals(bpmResult)) {
            return MesWmItemReceiptStatusEnum.PREPARE.getStatus();
        } else if (BpmTaskStatusEnum.CANCEL.getStatus().equals(bpmResult)) {
            return MesWmItemReceiptStatusEnum.CANCELED.getStatus();
        }
        return null;
    }

    /**
     * 获取当前用户 ID
     */
    private Long getCurrentUserId() {
        Authentication authentication = SecurityContextHolder.getContext().getAuthentication();
        if (authentication != null && authentication.getPrincipal() instanceof Long) {
            return (Long) authentication.getPrincipal();
        }
        return 1L; // 默认用户
    }

    /**
     * 生成入库单编码
     */
    private String generateItemReceiptCode() {
        // TODO: 使用编码规则服务生成编码
        return "IR" + System.currentTimeMillis();
    }

}