diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java index 6af28eb52..a06c33d0f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/businessDocumentOrder/repository/persistence/BusinessDocumentOrderImpl.java @@ -1,6 +1,8 @@ package com.mhd.oms.domain.businessDocumentOrder.repository.persistence; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; +import cn.hutool.core.util.RandomUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -43,6 +45,7 @@ import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import org.springframework.util.CollectionUtils; import java.rmi.ServerException; import java.util.ArrayList; @@ -169,6 +172,29 @@ public class BusinessDocumentOrderImpl extends ServiceImpl ids, Long reviewStatus, String SalesManager,String reviewOpinion ) { LoginUser loginUser = SecurityUtils.getLoginUser();//获取登录人 @@ -229,6 +255,31 @@ public class BusinessDocumentOrderImpl extends ServiceImpl checkOrderCodes = businessDocumentOrderMapper.selectList( + new QueryWrapper().eq("goods_number", orderCode) + ); + + if (CollectionUtils.isEmpty(checkOrderCodes)) { + break; + } + + if (retryCount >= maxRetryCount) { + throw new com.aliyun.oss.ServiceException("生成唯一订单编号失败,已达到最大重试次数:" + maxRetryCount); + } + } + + //生成货源单号 + subOrder.setGoodsNumber(orderCode); + + businessDocumentOrderMapper.insert(subOrder); subOrderCount++; // 增加子单计数 @@ -706,4 +757,4 @@ public class BusinessDocumentOrderImpl extends ServiceImpl