fix(oms):出库单号/预约单生成修改,预约确认生成单号修改

2026-07-25 09:43:05 +08:00
parent 69e54bb2c6
commit 0c71c4e661
5 changed files with 17 additions and 20 deletions
@@ -221,7 +221,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO

        ReservationStockOutOrderDO reservationStockOutOrderDO = new ReservationStockOutOrderDO();
        // 生成出库业务单号
-        String orderNumber = reservationStockOutOrderApplicationService.generateReserveOrderNumber();
+        String orderNumber = reservationStockOutOrderApplicationService.generateReserveOrderNumber1();
        reservationStockOutOrderDO.setOutOrderNumber(orderNumber);
        reservationStockOutOrderDO.setBusinessOrderNo(orderNumber);
        // 货主信息：有货品明细时从解析结果取，无货品明细时从登录用户取
@@ -394,7 +394,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
        }
        ReservationStockInOrderDO reservationStockInOrderDO = new ReservationStockInOrderDO();
        // 生成业务单号
-        String orderNumber = reservationStockInOrderDomainService.generateReserveOrderNumber();
+        String orderNumber = reservationStockInOrderDomainService.generateReserveOrderNumber1();
        reservationStockInOrderDO.setInOrderNumber(orderNumber);
        reservationStockInOrderDO.setBusinessOrderNo(orderNumber);
        reservationStockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId());
@@ -491,7 +491,7 @@ public class ReservationStockInOrderImpl extends ServiceImpl<ReservationStockInO
    @Transactional(rollbackFor = Exception.class)
    public Boolean insertDomain(ReservationStockInOrderDO stockInOrderDO) {
        if (stockInOrderDO.getInOrderNumber() == null) {
-            stockInOrderDO.setInOrderNumber(reservationStockInOrderDomainService.generateReserveOrderNumber());
+            stockInOrderDO.setInOrderNumber(reservationStockInOrderDomainService.generateReserveOrderNumber1());
            stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber());
        }
 //        //统计总计划数
@@ -106,7 +106,7 @@ public class ReservationStockInOrderDomainService {
    @Transactional(rollbackFor = Exception.class)
    public Boolean insert(ReservationStockInOrderDO stockInOrderDO) {
        if (stockInOrderDO.getInOrderNumber() == null) {
-            stockInOrderDO.setInOrderNumber(generateReserveOrderNumber());
+            stockInOrderDO.setInOrderNumber(generateReserveOrderNumber1());
            stockInOrderDO.setBusinessOrderNo(stockInOrderDO.getInOrderNumber());
        }
 //        //设置默认值
@@ -130,7 +130,7 @@ public class ReservationStockOutOrderDomainService {
    @Transactional(rollbackFor = Exception.class)
    public Boolean insert(ReservationStockOutOrderDO stockOutOrderDO) {
        if (stockOutOrderDO.getOutOrderNumber() == null) {
-            stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber());
+            stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber1());
            stockOutOrderDO.setBusinessOrderNo(stockOutOrderDO.getOutOrderNumber());
        }
        // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity
@@ -104,7 +104,7 @@ public class ReserveStockInOrderDomainService {
    @Transactional(rollbackFor = Exception.class)
    public Boolean insert(ReserveStockInOrderDO stockInOrderDO) {
        if (stockInOrderDO.getInOrderNumber() == null) {
-            stockInOrderDO.setInOrderNumber(generateReserveOrderNumber());
+            stockInOrderDO.setInOrderNumber(reservationStockInOrderDomainService.generateReserveOrderNumber1());
        }
 //        //设置默认值
 //        setDefaultValues(stockInOrderDO);
@@ -137,7 +137,7 @@ public class ReserveStockInOrderDomainService {
    public Boolean batchInsert(List<ReserveStockInOrderDO> stockInOrderDOList) {
        for (ReserveStockInOrderDO stockInOrderDO : stockInOrderDOList){
            if (StringUtils.isBlank(stockInOrderDO.getInOrderNumber())){
-                stockInOrderDO.setInOrderNumber(generateReserveOrderNumber());
+                stockInOrderDO.setInOrderNumber(reservationStockInOrderDomainService.generateReserveOrderNumber1());
            }
 //            //设置物料信息
 //            setMaterialDetailInfo(stockInOrderDO);
@@ -475,17 +475,16 @@ public class ReserveStockInOrderDomainService {
        String jsbz = reservationStockInOrderMapper.getJsbz(shipperId);
        reservationStockInOrder.setSettlementCurrency(jsbz);
        String oldInOrderNumber = reservationStockInOrder.getInOrderNumber();
-        // 生成新业务单号，防止与已生成的入库业务单号重复
-        String newOrderNumber = reservationStockInOrderDomainService.generateReserveOrderNumber();
-        reservationStockInOrder.setInOrderNumber(newOrderNumber);
-        reservationStockInOrder.setBusinessOrderNo(newOrderNumber);
+        // 直接使用预约单号作为业务单号
+        reservationStockInOrder.setInOrderNumber(oldInOrderNumber);
+        reservationStockInOrder.setBusinessOrderNo(oldInOrderNumber);
        List<ReserveInMaterialDetail> materialDetailList = materialDetailService.list(new QueryWrapper<ReserveInMaterialDetail>().lambda().eq(ReserveInMaterialDetail::getInOrderNumber, oldInOrderNumber));
        List<ReservationInMaterialDetail> inMaterialDetailList  = new ArrayList<>();
        int index = 1;
        for (ReserveInMaterialDetail reserveInMaterialDetail : materialDetailList) {
            ReservationInMaterialDetail  reservationInMaterialDetail = new ReservationInMaterialDetail();
            BeanUtils.copyProperties(reserveInMaterialDetail, reservationInMaterialDetail,"materialDetailId");
-            reservationInMaterialDetail.setInOrderNumber(newOrderNumber); // 使用新单号保持与主表关联
+            reservationInMaterialDetail.setInOrderNumber(oldInOrderNumber);
            reservationInMaterialDetail.setQuantity(reserveInMaterialDetail.getReserveQuantity());
            String lot = generateDateSerialNumber();
            lot = lot+"-"+index;
@@ -97,7 +97,7 @@ public class ReserveStockOutOrderDomainService {
    @Transactional(rollbackFor = Exception.class)
    public Boolean insert(ReserveStockOutOrderDO stockOutOrderDO) {
        if (stockOutOrderDO.getOutOrderNumber() == null) {
-            stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber());
+            stockOutOrderDO.setOutOrderNumber(reservationStockOutOrderDomainService.generateReserveOrderNumber1());
        }
        // 与 update / batchInsert 一致：前端传计划数量为 quantity，非 outboundQuantity
        setMaterialDetailInfo(stockOutOrderDO);
@@ -127,7 +127,7 @@ public class ReserveStockOutOrderDomainService {
    public Boolean batchInsert(List<ReserveStockOutOrderDO> stockOutOrderDOList) {
        for (ReserveStockOutOrderDO stockOutOrderDO : stockOutOrderDOList){
            if (StringUtils.isBlank(stockOutOrderDO.getOutOrderNumber())){
-                stockOutOrderDO.setOutOrderNumber(generateReserveOrderNumber());
+                stockOutOrderDO.setOutOrderNumber(reservationStockOutOrderDomainService.generateReserveOrderNumber1());
            }
            //设置物料信息
            setMaterialDetailInfo(stockOutOrderDO);
@@ -306,12 +306,10 @@ public class ReserveStockOutOrderDomainService {
        Long shipperId = reservationStockOutOrder.getShipperId();
        String jsbz = reservationStockInOrderMapper.getJsbz(shipperId);
        reservationStockOutOrder.setSettlementCurrency(jsbz);
-        // 保留旧单号，用于查询源明细数据
+        // 直接使用预约出库单号作为业务单号
        String oldOutOrderNumber = reservationStockOutOrder.getOutOrderNumber();
-        // 生成出库业务单号，防止与已生成的出库业务单号重复
-        String newOrderNumber = reservationStockOutOrderDomainService.generateReserveOrderNumber();
-        reservationStockOutOrder.setOutOrderNumber(newOrderNumber);
-        reservationStockOutOrder.setBusinessOrderNo(newOrderNumber);
+        reservationStockOutOrder.setOutOrderNumber(oldOutOrderNumber);
+        reservationStockOutOrder.setBusinessOrderNo(oldOutOrderNumber);
        reservationStockOutOrderService.save(reservationStockOutOrder);
        List<ReserveOutMaterialDetail> materialDetailList = outMaterialDetailService.list(new QueryWrapper<ReserveOutMaterialDetail>().lambda().eq(ReserveOutMaterialDetail::getOutOrderNumber, oldOutOrderNumber));
        List<ReservationOutMaterialDetail> inMaterialDetailList  = new ArrayList<>();
@@ -319,7 +317,7 @@ public class ReserveStockOutOrderDomainService {
        for (ReserveOutMaterialDetail reserveOutMaterialDetail   : materialDetailList) {
            ReservationOutMaterialDetail reservationOutMaterialDetail = new ReservationOutMaterialDetail();
            BeanUtils.copyProperties(reserveOutMaterialDetail, reservationOutMaterialDetail,"materialDetailId");
-            reservationOutMaterialDetail.setOutOrderNumber(newOrderNumber); // 使用新单号保持与主表关联
+            reservationOutMaterialDetail.setOutOrderNumber(oldOutOrderNumber);
            String lot = generateDateSerialNumber();
            lot = lot+"-"+index;
            index++;