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

liyong

9 天以前 88e384da863bb2f7324cb1e1474885df3b7cce91

 yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/service/wm/salesnotice/MesWmSalesNoticeServiceImpl.java

@@ -9,7 +9,11 @@
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeDO;
import cn.iocoder.yudao.module.mes.dal.dataobject.wm.salesnotice.MesWmSalesNoticeLineDO;
import cn.iocoder.yudao.module.mes.dal.mysql.wm.salesnotice.MesWmSalesNoticeMapper;
import cn.iocoder.yudao.module.mes.service.md.autocode.MesMdAutoCodeRecordService;
import cn.iocoder.yudao.module.mes.service.md.client.MesMdClientService;
import cn.iocoder.yudao.module.erp.api.sale.ErpSaleOrderApi;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderItemRespDTO;
import cn.iocoder.yudao.module.erp.api.sale.dto.ErpSaleOrderRespDTO;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -39,6 +43,11 @@
    private MesWmSalesNoticeLineService salesNoticeLineService;
    @Resource
    private MesMdClientService clientService;

    @Resource
    private ErpSaleOrderApi saleOrderApi;
    @Resource
    private MesMdAutoCodeRecordService autoCodeRecordService;

    @Override
    public Long createSalesNotice(MesWmSalesNoticeSaveReqVO createReqVO) {
@@ -149,4 +158,55 @@
        }
    }

    @Override
    @Transactional(rollbackFor = Exception.class)
    public Long generateSalesNoticeFromSaleOrder(Long saleOrderId) {
        // 1. 获取销售订单信息
        ErpSaleOrderRespDTO saleOrder = saleOrderApi.getSaleOrder(saleOrderId).getCheckedData();
        if (saleOrder == null) {
            throw exception(WM_SALES_NOTICE_SALE_ORDER_NOT_EXISTS);
        }

        // 2. 获取销售订单明细
        List<ErpSaleOrderItemRespDTO> saleOrderItems = saleOrderApi.getSaleOrderItemList(saleOrderId).getCheckedData();
        if (CollUtil.isEmpty(saleOrderItems)) {
            throw exception(WM_SALES_NOTICE_SALE_ORDER_ITEM_EMPTY);
        }

        // 3. 生成发货通知单编码
        String code = autoCodeRecordService.generateAutoCode("SALESNOTICE_CODE", null);

        // 4. 创建发货通知单主表
        MesWmSalesNoticeDO notice = new MesWmSalesNoticeDO();
        notice.setCode(code);
        notice.setName("销售订单[" + saleOrder.getNo() + "]发货通知");
        notice.setClientId(saleOrder.getCustomerId());
        notice.setSaleOrderId(saleOrderId);
        notice.setSaleOrderCode(saleOrder.getNo());
        notice.setSalesDate(java.time.LocalDateTime.now());
        notice.setStatus(PREPARE.getStatus());
        salesNoticeMapper.insert(notice);

        // 5. 遍历明细创建发货通知单行
        for (ErpSaleOrderItemRespDTO saleOrderItem : saleOrderItems) {
            MesWmSalesNoticeLineDO line = new MesWmSalesNoticeLineDO();
            line.setNoticeId(notice.getId());
            line.setSaleOrderItemId(saleOrderItem.getId());
            line.setItemId(saleOrderItem.getProductId());
            line.setQuantity(saleOrderItem.getCount());
            salesNoticeLineService.createSalesNoticeLine(line);
        }

        return notice.getId();
    }

    @Override
    public void finishSalesNotice(Long id) {
        // 校验存在
        MesWmSalesNoticeDO notice = validateSalesNoticeExists(id);
        // 更新状态为已完成
        salesNoticeMapper.updateById(new MesWmSalesNoticeDO()
                .setId(id).setStatus(FINISHED.getStatus()));
    }

}