feat(mes): 来料检验与不合格退货闭环优化

gaoluyang

5 天以前 6fa82a1ad7c3ae061ef499f0d0806a16846e122b

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/wm/arrivalnotice/MesWmArrivalNoticeController.java

@@ -12,11 +12,14 @@
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeRespVO;
import cn.iocoder.yudao.module.mes.controller.admin.wm.arrivalnotice.vo.MesWmArrivalNoticeSaveReqVO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalNoticeLineDO;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeLineService;
import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.ErpSupplierApi;
import cn.iocoder.yudao.module.erp.api.purchase.ErpPurchaseOrderApi;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpPurchaseOrderRespDTO;
import cn.iocoder.yudao.module.erp.api.purchase.dto.ErpSupplierRespDTO;
import cn.iocoder.yudao.module.srm.api.supplier.SrmSupplierApi;
import cn.iocoder.yudao.module.srm.api.supplier.dto.SrmSupplierRespDTO;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.tags.Tag;
@@ -45,7 +48,9 @@
    @Resource
    private MesWmArrivalNoticeService arrivalNoticeService;
    @Resource
    private ErpSupplierApi supplierApi;
    private MesWmArrivalNoticeLineService arrivalNoticeLineService;
    @Resource
    private SrmSupplierApi srmSupplierApi;
    @Resource
    private ErpPurchaseOrderApi purchaseOrderApi;

@@ -76,7 +81,6 @@
    @GetMapping("/get")
    @Operation(summary = "获得到货通知单")
    @Parameter(name = "id", description = "编号", required = true, example = "1024")
    @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:query')")
    public CommonResult<MesWmArrivalNoticeRespVO> getArrivalNotice(@RequestParam("id") Long id) {
        MesWmArrivalNoticeDO notice = arrivalNoticeService.getArrivalNotice(id);
        if (notice == null) {
@@ -87,7 +91,6 @@

    @GetMapping("/page")
    @Operation(summary = "获得到货通知单分页")
    @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:query')")
    public CommonResult<PageResult<MesWmArrivalNoticeRespVO>> getArrivalNoticePage(
            @Valid MesWmArrivalNoticePageReqVO pageReqVO) {
        PageResult<MesWmArrivalNoticeDO> pageResult = arrivalNoticeService.getArrivalNoticePage(pageReqVO);
@@ -115,6 +118,14 @@
        return success(true);
    }

    @PostMapping("/create-iqc")
    @Operation(summary = "执行质检：为到货通知单的需检行生成来料检验单")
    @Parameter(name = "id", description = "到货通知单编号", required = true)
    @PreAuthorize("@ss.hasPermission('mes:wm-arrival-notice:update')")
    public CommonResult<Integer> createArrivalNoticeIqc(@RequestParam("id") Long id) {
        return success(arrivalNoticeService.createIqcForArrivalNotice(id));
    }

    @PostMapping("/generate-from-purchase-order")
    @Operation(summary = "根据采购订单生成到货通知单")
    @Parameter(name = "purchaseOrderId", description = "采购订单编号", required = true)
@@ -130,9 +141,9 @@
            return Collections.emptyList();
        }
        // 1. 获得供应商信息（ERP 采购供应商）
        Map<Long, ErpSupplierRespDTO> supplierMap = supplierApi.getSupplierList(
        Map<Long, SrmSupplierRespDTO> supplierMap = srmSupplierApi.getSupplierList(
                convertSet(list, MesWmArrivalNoticeDO::getVendorId)).getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(ErpSupplierRespDTO::getId, v -> v, (a, b) -> a));
                .collect(java.util.stream.Collectors.toMap(SrmSupplierRespDTO::getId, v -> v, (a, b) -> a));
        // 2. 获得采购订单信息
        List<Long> purchaseOrderIds = list.stream()
                .map(MesWmArrivalNoticeDO::getPurchaseOrderId)
@@ -142,12 +153,29 @@
        Map<Long, ErpPurchaseOrderRespDTO> purchaseOrderMap = purchaseOrderApi.getPurchaseOrderList(purchaseOrderIds)
                .getCheckedData().stream()
                .collect(java.util.stream.Collectors.toMap(ErpPurchaseOrderRespDTO::getId, v -> v, (a, b) -> a));
        // 3. 构建结果
        // 3. 获得质检进度：需检行 / 已生成检验单行 / 已完成检验行
        Map<Long, List<MesWmArrivalNoticeLineDO>> lineMap = arrivalNoticeLineService
                .getArrivalNoticeLineListByNoticeIds(convertSet(list, MesWmArrivalNoticeDO::getId))
                .stream().collect(java.util.stream.Collectors.groupingBy(MesWmArrivalNoticeLineDO::getNoticeId));
        // 4. 构建结果
        return BeanUtils.toBean(list, MesWmArrivalNoticeRespVO.class, vo -> {
            MapUtils.findAndThen(supplierMap, vo.getVendorId(), supplier ->
                    vo.setVendorName(supplier.getName()));
            MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder ->
                    vo.setPurchaseOrderNo(purchaseOrder.getNo()));
            MapUtils.findAndThen(purchaseOrderMap, vo.getPurchaseOrderId(), purchaseOrder -> {
                vo.setPurchaseOrderNo(purchaseOrder.getNo());
                // 历史单据未快照合同号时，回填采购订单上的合同号
                if (cn.hutool.core.util.StrUtil.isBlank(vo.getContractNo())) {
                    vo.setContractNo(purchaseOrder.getContractNo());
                }
            });
            List<MesWmArrivalNoticeLineDO> lines = lineMap.getOrDefault(vo.getId(), Collections.emptyList());
            List<MesWmArrivalNoticeLineDO> needCheckLines = lines.stream()
                    .filter(line -> Boolean.TRUE.equals(line.getIqcCheckFlag())).toList();
            vo.setIqcNeedCount(needCheckLines.size());
            vo.setIqcCreatedCount((int) needCheckLines.stream()
                    .filter(line -> line.getIqcId() != null).count());
            vo.setIqcInspectedCount((int) needCheckLines.stream()
                    .filter(line -> line.getIqcCheckResult() != null).count());
        });
    }