Revert "feat(erp): 生产车间可从销售订单直接生成生产计划（结合库存判断）"

tuqin

4 天以前 19af7352b7ef6497f7bbb66d7ae5a248f905c072

Revert "feat(erp): 生产车间可从销售订单直接生成生产计划（结合库存判断）"

This reverts commit f785e619ff7cbe99aa80fc7679a244224ab5024f.

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/ErpSaleOrderController.java

@@ -334,29 +334,4 @@
        item.setTotalPrice(productAmount.add(tax));
    }

    /**
     * èŽ·å¾—待安排生产的销售订单明细
     *
     * ä¾›ç”Ÿäº§è½¦é—´ã€Œä»Žé”€å”®è®¢å•ç”Ÿæˆç”Ÿäº§è®¡åˆ’」使用：
     * è¿”回已审核且尚未安排有效 MPS çš„明细，带当前可用库存与建议生产数量
     */
    @GetMapping("/pending-production-list")
    @Operation(summary = "获得待安排生产的销售订单明细")
    @PreAuthorize("@ss.hasPermission('erp:sale-order:query')")
    public CommonResult<List<cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPendingProductionRespVO>>
            getPendingProductionList() {
        return success(saleOrderService.getPendingProductionList());
    }

    /**
     * ä»Žé”€å”®è®¢å•æ‰¹é‡ç”Ÿæˆç”Ÿäº§è®¡åˆ’（MPS）
     */
    @PostMapping("/generate-mps")
    @Operation(summary = "从销售订单批量生成生产计划")
    @PreAuthorize("@ss.hasPermission('erp:sale-order:update')")
    public CommonResult<Integer> generateMpsFromSaleOrder(
            @Valid @RequestBody cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderGenerateMpsReqVO reqVO) {
        return success(saleOrderService.generateMpsFromSaleOrder(reqVO));
    }

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderGenerateMpsReqVO.java

ÎļþÒÑɾ³ý

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/controller/admin/sale/vo/order/ErpSaleOrderPendingProductionRespVO.java

ÎļþÒÑɾ³ý

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderService.java

@@ -5,8 +5,6 @@
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportExcelVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderImportRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPendingProductionRespVO;
import cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderGenerateMpsReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.sale.ErpSaleOrderItemDO;
import jakarta.validation.Valid;
@@ -154,22 +152,5 @@
     * @param orderId è®¢å•ç¼–号
     */
    void updateSaleOrderOutStatus(Long orderId);

    /**
     * èŽ·å¾—待安排生产的销售订单明细
     *
     * ä¾›ç”Ÿäº§è½¦é—´ã€Œä»Žé”€å”®è®¢å•ç”Ÿæˆç”Ÿäº§è®¡åˆ’」使用：
     * è¿”回已审核（status=20）、且尚未安排有效 MPS çš„销售订单明细，
     * å¹¶å¸¦ä¸Šå½“前可用库存与建议生产数量
     */
    List<ErpSaleOrderPendingProductionRespVO> getPendingProductionList();

    /**
     * ä»Žé”€å”®è®¢å•æ‰¹é‡ç”Ÿæˆç”Ÿäº§è®¡åˆ’（MPS）
     *
     * @param reqVO æ˜Žç»†ä¸Žè®¡åˆ’数量
     * @return æˆåŠŸç”Ÿæˆæ¡æ•°
     */
    int generateMpsFromSaleOrder(ErpSaleOrderGenerateMpsReqVO reqVO);

}

 yudao-module-erp/src/main/java/cn/iocoder/yudao/module/erp/service/sale/ErpSaleOrderServiceImpl.java

@@ -52,13 +52,9 @@
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;

import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*;
@@ -102,9 +98,6 @@
    private CrmContractApi contractApi;
    @Resource
    private ErpAccountService accountService;

    @Resource
    private cn.iocoder.yudao.module.mes.api.wms.MesWmStockApi mesWmStockApi;

    @Resource
    private AdminUserApi adminUserApi;
@@ -566,195 +559,6 @@
        Long mpsId = mpsApi.createMps(createReqDTO);
        log.info("[createMpsForSaleOrderItem] MPS åˆ›å»ºæˆåŠŸï¼ŒmpsId={}, saleOrderItemId={}", mpsId, item.getId());
        return mpsId;
    }

    // ==================== ä»Žé”€å”®è®¢å•ç”Ÿæˆç”Ÿäº§è®¡åˆ’（生产车间视角） ====================

    @Override
    public List<cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPendingProductionRespVO>
            getPendingProductionList() {
        // 1. å–全部已审核的销售订单
        List<ErpSaleOrderDO> orders = saleOrderMapper.selectList(
                new cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX<ErpSaleOrderDO>()
                        .eq(ErpSaleOrderDO::getStatus, ErpAuditStatus.APPROVE.getStatus())
                        .orderByDesc(ErpSaleOrderDO::getId));
        if (CollUtil.isEmpty(orders)) {
            return Collections.emptyList();
        }
        Map<Long, ErpSaleOrderDO> orderMap = orders.stream()
                .collect(Collectors.toMap(ErpSaleOrderDO::getId, o -> o, (a, b) -> a));

        // 2. å–订单明细
        List<ErpSaleOrderItemDO> items = saleOrderItemMapper.selectListByOrderIds(orderMap.keySet());
        if (CollUtil.isEmpty(items)) {
            return Collections.emptyList();
        }

        // 3. å·²æœ‰æœ‰æ•ˆ MPS çš„明细要排除，避免重复安排生产
        Set<Long> plannedItemIds = new HashSet<>();
        List<Long> allItemIds = items.stream().map(ErpSaleOrderItemDO::getId).collect(Collectors.toList());
        try {
            // æ³¨æ„ï¼šè¯¥ API ç›´æŽ¥è¿”回 List，不是 CommonResult
            List<cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO> existMps =
                    mpsApi.getMpsListBySaleOrderItemIds(allItemIds);
            if (CollUtil.isNotEmpty(existMps)) {
                existMps.stream()
                        .filter(m -> ObjectUtil.notEqual(m.getStatus(), MPS_STATUS_CANCELED))
                        .map(cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO::getSaleOrderItemId)
                        .filter(Objects::nonNull)
                        .forEach(plannedItemIds::add);
            }
        } catch (Exception e) {
            log.warn("[getPendingProductionList] æŸ¥è¯¢å·²æœ‰ MPS å¤±è´¥ï¼ŒæŒ‰å…¨éƒ¨å¯å®‰æŽ’处理", e);
        }

        // 4. ç»„装：带出可用库存与建议生产数量
        List<cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPendingProductionRespVO> result
                = new ArrayList<>();
        for (ErpSaleOrderItemDO item : items) {
            if (plannedItemIds.contains(item.getId())) {
                continue;
            }
            ErpSaleOrderDO order = orderMap.get(item.getOrderId());
            if (order == null) {
                continue;
            }
            cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPendingProductionRespVO vo
                    = new cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderPendingProductionRespVO();
            vo.setSaleOrderId(order.getId());
            vo.setSaleOrderNo(order.getNo());
            vo.setSaleOrderItemId(item.getId());
            vo.setCustomerId(order.getCustomerId());
            vo.setCustomerName(getCustomerName(order.getCustomerId()));
            vo.setProductId(item.getProductId());
            // æ˜Žç»†è¡¨åªå­˜ productId，产品编码/名称/规格从 MDM å–
            try {
                MdmItemRespDTO mdmItem = mdmItemApi.getItem(item.getProductId()).getCheckedData();
                if (mdmItem != null) {
                    vo.setProductCode(mdmItem.getCode());
                    vo.setProductName(mdmItem.getName());
                    vo.setProductSpecification(mdmItem.getSpecification());
                }
            } catch (Exception e) {
                log.warn("[getPendingProductionList] èŽ·å–物料信息失败，productId={}", item.getProductId(), e);
            }
            vo.setOrderCount(item.getCount());
            vo.setOrderTime(order.getOrderTime());

            // å½“前可用库存
            BigDecimal stock = BigDecimal.ZERO;
            try {
                BigDecimal qty = mesWmStockApi.getStockQuantity(item.getProductId());
                if (qty != null) {
                    stock = qty;
                }
            } catch (Exception e) {
                log.warn("[getPendingProductionList] æŸ¥è¯¢åº“存失败，productId={}", item.getProductId(), e);
            }
            vo.setStockQuantity(stock);

            // å»ºè®®ç”Ÿäº§æ•°é‡ = è®¢è´­æ•°é‡ - å¯ç”¨åº“存，不足 0 åˆ™å– 0
            BigDecimal count = item.getCount() == null ? BigDecimal.ZERO : item.getCount();
            BigDecimal suggest = count.subtract(stock);
            vo.setSuggestQuantity(suggest.compareTo(BigDecimal.ZERO) > 0 ? suggest : BigDecimal.ZERO);

            result.add(vo);
        }
        // æŒ‰å»ºè®®ç”Ÿäº§æ•°é‡é™åºï¼Œæ€¥éœ€ç”Ÿäº§çš„排前面
        result.sort((a, b) -> b.getSuggestQuantity().compareTo(a.getSuggestQuantity()));
        return result;
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public int generateMpsFromSaleOrder(
            cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderGenerateMpsReqVO reqVO) {
        if (reqVO.getItems() == null || reqVO.getItems().isEmpty()) {
            return 0;
        }
        int success = 0;
        for (cn.iocoder.yudao.module.erp.controller.admin.sale.vo.order.ErpSaleOrderGenerateMpsReqVO.Item reqItem
                : reqVO.getItems()) {
            ErpSaleOrderItemDO item = saleOrderItemMapper.selectById(reqItem.getSaleOrderItemId());
            if (item == null) {
                log.warn("[generateMpsFromSaleOrder] é”€å”®è®¢å•æ˜Žç»†ä¸å­˜åœ¨ï¼Œid={}", reqItem.getSaleOrderItemId());
                continue;
            }
            ErpSaleOrderDO order = saleOrderMapper.selectById(item.getOrderId());
            if (order == null || !ErpAuditStatus.APPROVE.getStatus().equals(order.getStatus())) {
                log.warn("[generateMpsFromSaleOrder] é”€å”®è®¢å•æœªå®¡æ ¸ï¼Œè·³è¿‡ï¼ŒitemId={}", item.getId());
                continue;
            }
            // å¹‚等保护：已有有效 MPS åˆ™è·³è¿‡ï¼Œé¿å…é‡å¤å®‰æŽ’
            try {
                List<cn.iocoder.yudao.module.mes.api.mps.dto.MesProMpsRespDTO> existMps =
                        mpsApi.getMpsListBySaleOrderItemIds(Collections.singletonList(item.getId()));
                if (CollUtil.isNotEmpty(existMps)
                        && existMps.stream().anyMatch(m -> ObjectUtil.notEqual(m.getStatus(), MPS_STATUS_CANCELED))) {
                    log.info("[generateMpsFromSaleOrder] æ˜Žç»†({}) å·²å­˜åœ¨æœ‰æ•ˆ MPS，跳过", item.getId());
                    continue;
                }
            } catch (Exception e) {
                log.warn("[generateMpsFromSaleOrder] å¹‚等校验失败，继续生成，itemId={}", item.getId(), e);
            }
            try {
                createMpsForSaleOrderItemWithQuantity(order, item, reqItem.getQuantity());
                success++;
            } catch (Exception e) {
                log.error("[generateMpsFromSaleOrder] ç”Ÿæˆ MPS å¤±è´¥ï¼ŒitemId={}", item.getId(), e);
            }
        }
        log.info("[generateMpsFromSaleOrder] å…±ç”Ÿæˆ MPS {} æ¡", success);
        return success;
    }

    /**
     * æŒ‰æŒ‡å®šæ•°é‡ä¸ºé”€å”®è®¢å•æ˜Žç»†åˆ›å»º MPS
     *
     * ä¸Ž createMpsForSaleOrderItem çš„差别：数量由车间自行指定（通常是 è®¢è´­æ•°é‡ - å¯ç”¨åº“存），
     * è€Œä¸æ˜¯ç›´æŽ¥ç”¨è®¢å•æ•°é‡
     */
    private Long createMpsForSaleOrderItemWithQuantity(ErpSaleOrderDO saleOrder, ErpSaleOrderItemDO item,
                                                       BigDecimal quantity) {
        String productName = null;
        try {
            MdmItemRespDTO mdmItem = mdmItemApi.getItem(item.getProductId()).getCheckedData();
            if (mdmItem != null) {
                productName = mdmItem.getName();
            }
        } catch (Exception e) {
            log.warn("[createMpsForSaleOrderItemWithQuantity] èŽ·å–物料信息失败，productId={}", item.getProductId(), e);
        }

        MesProMpsCreateReqDTO createReqDTO = new MesProMpsCreateReqDTO();
        createReqDTO.setSaleOrderId(saleOrder.getId());
        createReqDTO.setSaleOrderNo(saleOrder.getNo());
        createReqDTO.setSaleOrderItemId(item.getId());
        createReqDTO.setMdmItemId(item.getProductId());
        createReqDTO.setProductName(productName);
        createReqDTO.setQuantity(quantity);
        createReqDTO.setClientId(saleOrder.getCustomerId());
        createReqDTO.setRequestDate(formatRequestDate(saleOrder.getOrderTime()));
        createReqDTO.setRemark("由生产车间从销售订单生成：" + saleOrder.getNo());
        return mpsApi.createMps(createReqDTO);
    }

    /**
     * å–客户名称，失败时返回 null ä¸å½±å“ä¸»æµç¨‹
     */
    private String getCustomerName(Long customerId) {
        if (customerId == null) {
            return null;
        }
        try {
            // è¯¥ API ç›´æŽ¥è¿”回 DTO，不是 CommonResult
            cn.iocoder.yudao.module.crm.api.customer.dto.CrmCustomerRespDTO customer =
                    customerApi.getCustomer(customerId);
            return customer == null ? null : customer.getName();
        } catch (Exception e) {
            log.warn("[getCustomerName] èŽ·å–客户失败，customerId={}", customerId, e);
            return null;
        }
    }

    /**