refactor(mes): 优化MES生产扫码入库功能支持多类型扫码

云

2 天以前 1ba0dbfde5634c8bf2ec20891d6b226b996f6b59

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

@@ -17,10 +17,7 @@
import cn.iocoder.yudao.module.mes.enums.wm.MesWmOutStatusEnum;
import cn.iocoder.yudao.module.mes.enums.wm.MesWmProductSalesStatusEnum;
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 cn.iocoder.yudao.module.crm.api.customer.CrmCustomerApi;
import jakarta.annotation.Resource;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
@@ -50,10 +47,8 @@
    @Resource
    private MesWmSalesNoticeLineService salesNoticeLineService;
    @Resource
    private MesMdClientService clientService;
    private CrmCustomerApi customerApi;

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

@@ -102,12 +97,22 @@

    @Override
    public MesWmSalesNoticeDO getSalesNotice(Long id) {
        return salesNoticeMapper.selectById(id);
        MesWmSalesNoticeDO notice = salesNoticeMapper.selectById(id);
        // 校验客户权限
        if (notice != null && notice.getClientId() != null) {
            List<Long> permittedIds = customerApi.getPermittedCustomerIds();
            if (permittedIds != null && !permittedIds.contains(notice.getClientId())) {
                return null; // 无权限则返回 null
            }
        }
        return notice;
    }

    @Override
    public PageResult<MesWmSalesNoticeDO> getSalesNoticePage(MesWmSalesNoticePageReqVO pageReqVO) {
        return salesNoticeMapper.selectPage(pageReqVO);
        // 获取用户有权限的客户 ID 列表
        List<Long> permittedClientIds = customerApi.getPermittedCustomerIds();
        return salesNoticeMapper.selectPage(pageReqVO, permittedClientIds);
    }

    @Override
@@ -159,7 +164,7 @@
        validateNoticeCodeUnique(saveReqVO.getId(), saveReqVO.getCode());
        // 校验客户存在
        if (saveReqVO.getClientId() != null) {
            clientService.validateClientExistsAndEnable(saveReqVO.getClientId());
            customerApi.validateCustomer(saveReqVO.getClientId());
        }
    }

@@ -171,48 +176,6 @@
        if (ObjUtil.notEqual(id, notice.getId())) {
            throw exception(WM_SALES_NOTICE_CODE_DUPLICATE);
        }
    }

    @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
@@ -308,22 +271,25 @@
            throw exception(WM_SALES_NOTICE_STATUS_NOT_APPROVED);
        }

        // 2. 获取发货通知单行
        // 2. 校验是否已生成过销售出库单（防止重复生成）
        if (productSalesMapper.selectByNoticeId(noticeId) != null) {
            throw exception(WM_PRODUCT_SALES_ALREADY_EXISTS);
        }

        // 3. 获取发货通知单行
        List<MesWmSalesNoticeLineDO> noticeLines = salesNoticeLineService.getSalesNoticeLineListByNoticeId(noticeId);
        if (CollUtil.isEmpty(noticeLines)) {
            throw exception(WM_SALES_NOTICE_LINE_EMPTY);
        }

        // 3. 生成销售出库单编码
        // 4. 生成销售出库单编码
        String code = autoCodeRecordService.generateAutoCode("WM_PRODUCT_SALES_CODE", null);

        // 4. 创建销售出库单主表
        // 5. 创建销售出库单主表
        MesWmProductSalesDO productSales = new MesWmProductSalesDO();
        productSales.setCode(code);
        productSales.setName("发货通知单[" + notice.getCode() + "]出库");
        productSales.setClientId(notice.getClientId());
        productSales.setSaleOrderId(notice.getSaleOrderId());
        productSales.setSalesOrderCode(notice.getSaleOrderCode());
        productSales.setNoticeId(noticeId);
        productSales.setSalesDate(notice.getSalesDate());
        // 收货信息从发货通知单带入
@@ -333,11 +299,10 @@
        productSales.setStatus(MesWmProductSalesStatusEnum.PREPARE.getStatus());
        productSalesMapper.insert(productSales);

        // 5. 遍历发货通知单行创建销售出库单行
        // 6. 遍历发货通知单行创建销售出库单行
        for (MesWmSalesNoticeLineDO noticeLine : noticeLines) {
            MesWmProductSalesLineDO salesLine = new MesWmProductSalesLineDO();
            salesLine.setSalesId(productSales.getId());
            salesLine.setSaleOrderItemId(noticeLine.getSaleOrderItemId());
            salesLine.setNoticeLineId(noticeLine.getId());
            salesLine.setItemId(noticeLine.getItemId());
            salesLine.setQuantity(noticeLine.getQuantity());