Merge remote-tracking branch 'origin/dev_business' into dev_business

liyong

9 天以前 88e384da863bb2f7324cb1e1474885df3b7cce91

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

@@ -7,16 +7,16 @@
import cn.iocoder.yudao.framework.common.util.object.BeanUtils;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderPageReqVO;
import cn.iocoder.yudao.module.erp.controller.admin.purchase.vo.order.ErpPurchaseOrderSaveReqVO;
import cn.iocoder.yudao.module.erp.dal.dataobject.product.ErpProductDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderDO;
import cn.iocoder.yudao.module.erp.dal.dataobject.purchase.ErpPurchaseOrderItemDO;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderItemMapper;
import cn.iocoder.yudao.module.erp.dal.mysql.purchase.ErpPurchaseOrderMapper;
import cn.iocoder.yudao.module.erp.dal.redis.no.ErpNoRedisDAO;
import cn.iocoder.yudao.module.erp.enums.ErpAuditStatus;
import cn.iocoder.yudao.module.erp.enums.ErpPurchaseOrderInStatusEnum;
import cn.iocoder.yudao.module.erp.service.finance.ErpAccountService;
import cn.iocoder.yudao.module.erp.service.product.ErpProductService;
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;
@@ -49,11 +49,13 @@
    private ErpNoRedisDAO noRedisDAO;

    @Resource
    private ErpProductService productService;
    @Resource
    private ErpSupplierService supplierService;
    @Resource
    private ErpAccountService accountService;

    @Resource
    @Lazy
    private ErpPurchaseRequestService purchaseRequestService;

    @Override
    @Transactional(rollbackFor = Exception.class)
@@ -154,13 +156,8 @@
    }

    private List<ErpPurchaseOrderItemDO> validatePurchaseOrderItems(List<ErpPurchaseOrderSaveReqVO.Item> list) {
        // 1. 校验产品存在
        List<ErpProductDO> productList = productService.validProductList(
                convertSet(list, ErpPurchaseOrderSaveReqVO.Item::getProductId));
        Map<Long, ErpProductDO> productMap = convertMap(productList, ErpProductDO::getId);
        // 2. 转化为 ErpPurchaseOrderItemDO 列表
        // 转化为 ErpPurchaseOrderItemDO 列表（产品验证已移除）
        return convertList(list, o -> BeanUtils.toBean(o, ErpPurchaseOrderItemDO.class, item -> {
            item.setProductUnitId(productMap.get(item.getProductId()).getUnitId());
            item.setTotalPrice(MoneyUtils.priceMultiply(item.getProductPrice(), item.getCount()));
            if (item.getTotalPrice() == null) {
                return;
@@ -201,7 +198,7 @@
            }
            if (inCount.compareTo(item.getCount()) > 0) {
                throw exception(PURCHASE_ORDER_ITEM_IN_FAIL_PRODUCT_EXCEED,
                        productService.getProduct(item.getProductId()).getName(), item.getCount());
                        "产品ID:" + item.getProductId(), item.getCount());
            }
            purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setInCount(inCount));
        });
@@ -221,7 +218,7 @@
            }
            if (returnCount.compareTo(item.getInCount()) > 0) {
                throw exception(PURCHASE_ORDER_ITEM_RETURN_FAIL_IN_EXCEED,
                        productService.getProduct(item.getProductId()).getName(), item.getInCount());
                        "产品ID:" + item.getProductId(), item.getInCount());
            }
            purchaseOrderItemMapper.updateById(new ErpPurchaseOrderItemDO().setId(item.getId()).setReturnCount(returnCount));
        });
@@ -309,4 +306,55 @@
        return purchaseOrderMapper.selectByIds(ids);
    }

    @Override
    public void updatePurchaseOrderInStatus(Long orderId) {
        // 1. 获取采购订单
        ErpPurchaseOrderDO order = validatePurchaseOrderExists(orderId);
        // 2. 获取采购订单明细
        List<ErpPurchaseOrderItemDO> items = purchaseOrderItemMapper.selectListByOrderId(orderId);
        if (CollUtil.isEmpty(items)) {
            return;
        }
        // 3. 计算入库状态
        int inStatus = calculateInStatus(items);
        // 4. 更新采购订单入库状态
        purchaseOrderMapper.updateById(new ErpPurchaseOrderDO()
                .setId(orderId).setInStatus(inStatus));
        // 5. 同步更新采购申请的入库状态（如果有关联的采购申请）
        if (order.getRequestId() != null) {
            purchaseRequestService.updatePurchaseRequestInStatus(order.getRequestId(), inStatus);
        }
    }

    /**
     * 计算入库状态
     *
     * @param items 采购订单明细列表
     * @return 入库状态
     */
    private int calculateInStatus(List<ErpPurchaseOrderItemDO> items) {
        boolean allIn = true;
        boolean anyIn = false;

        for (ErpPurchaseOrderItemDO item : items) {
            BigDecimal count = item.getCount() != null ? item.getCount() : BigDecimal.ZERO;
            BigDecimal inCount = item.getInCount() != null ? item.getInCount() : BigDecimal.ZERO;

            if (inCount.compareTo(BigDecimal.ZERO) > 0) {
                anyIn = true;
            }
            if (inCount.compareTo(count) < 0) {
                allIn = false;
            }
        }

        if (allIn) {
            return ErpPurchaseOrderInStatusEnum.ALL_IN.getStatus();
        } else if (anyIn) {
            return ErpPurchaseOrderInStatusEnum.PART_IN.getStatus();
        } else {
            return ErpPurchaseOrderInStatusEnum.NOT_IN.getStatus();
        }
    }

}