fix(oms):入库/出库 预约/业务单号生成

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java

@@ -73,4 +73,6 @@ public interface ReservationStockInOrderMapper extends BaseMapper<ReservationSto
     String getCustomerOrgCode(@Param("id") Long id);
 
     int countByOrderNumberPrefix(@Param("prefix") String prefix);
+
+    List<String> generateReserveOrderNumber1(@Param("prefix") String prefix);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderApplicationService.java

@@ -2290,4 +2290,7 @@ public class ReservationStockInOrderApplicationService {
         return stockInOrderDomainService.generateReserveOrderNumber();
     }
 
+    public String generateReserveOrderNumber1() {
+        return stockInOrderDomainService.generateReserveOrderNumber1();
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/service/ReservationStockInOrderDomainService.java

@@ -38,6 +38,7 @@ import com.mhd.oms.domain.reservationStockOutOrder.entity.ReservationStockOutOrd
 import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservationStockOutOrderService;
 import com.mhd.oms.domain.reserveInMaterialDetail.entity.ReserveInMaterialDetail;
 import com.mhd.oms.domain.reserveStockInOrder.entity.ReserveStockInOrder;
+import com.mhd.oms.domain.reserveStockInOrder.repository.mapper.ReserveStockInOrderMapper;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.WmsServiceFeign;
 import com.mhd.system.api.domain.*;
@@ -88,6 +89,8 @@ public class ReservationStockInOrderDomainService {
     private BusinessDocumentOrderMapper businessDocumentOrderMapper;
     @Autowired
     private ExecutionStockInOrderMapper executionStockInOrderMapper;
+    @Autowired
+    private ReserveStockInOrderMapper reserveStockInOrderMapper;
 
     /**
      * 分页查询入库单列表
@@ -1232,4 +1235,25 @@ public class ReservationStockInOrderDomainService {
         return prefix + seq;
     }
 
+    public String generateReserveOrderNumber1() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
+        String datePart = sdf.format(new Date());
+        String prefix = "R" + datePart;
+        List<String> orderNumber1 = reservationStockInOrderMapper.generateReserveOrderNumber1(prefix);
+        List<String> orderNumber2 = reserveStockInOrderMapper.generateReserveOrderNumber1(prefix);
+        List<String> allOrders = new ArrayList<>();
+        allOrders.addAll(orderNumber1);
+        allOrders.addAll(orderNumber2);
+        int maxseq = 0;
+        for(String order:allOrders)
+        {
+            String numStr = order.substring(prefix.length());
+            int num = Integer.parseInt(numStr);
+            if(num > maxseq){
+                maxseq = num;
+            }
+        }
+        String seq = String.format("%03d", maxseq + 1);
+        return prefix + seq;
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/mapper/ReservationStockOutOrderMapper.java

@@ -39,4 +39,6 @@ public interface ReservationStockOutOrderMapper extends BaseMapper<ReservationSt
     Long queryShipperId(@Param("userMemberCode") String userMemberCode,@Param("organizationId") Long organizationId);
 
     int countByOrderNumberPrefix(@Param("prefix") String prefix);
+
+    List<String> generateReserveOrderNumber1(@Param("prefix") String prefix);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderApplicationService.java

@@ -1747,4 +1747,7 @@ public class ReservationStockOutOrderApplicationService {
         return stockOutOrderDomainService.generateReserveOrderNumber();
     }
 
+    public String generateReserveOrderNumber1() {
+        return stockOutOrderDomainService.generateReserveOrderNumber1();
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/service/ReservationStockOutOrderDomainService.java

@@ -51,6 +51,7 @@ import com.mhd.oms.domain.reservationStockOutOrder.repository.facade.IReservatio
 import com.mhd.oms.domain.reservationStockOutOrder.repository.mapper.ReservationStockOutOrderMapper;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.po.ReservationStockOutOrderPO;
 import com.mhd.oms.domain.reservationStockOutOrder.repository.todo.ReservationStockOutOrderDO;
+import com.mhd.oms.domain.reserveStockOutOrder.repository.mapper.ReserveStockOutOrderMapper;
 import com.mhd.system.api.SystemServiceFeign;
 import com.mhd.system.api.WmsServiceFeign;
 import com.mhd.system.api.domain.*;
@@ -112,6 +113,8 @@ public class ReservationStockOutOrderDomainService {
     private BusinessDeliveryDetailsLinkMapper businessDeliveryDetailsLinkMapper;
     @Autowired
     private ReservationStockOutOrderMapper reservationStockOutOrderMapper;
+    @Autowired
+    private ReserveStockOutOrderMapper reserveStockOutOrderMapper;
 
     /**
      * 分页查询出库单列表
@@ -1076,4 +1079,25 @@ public class ReservationStockOutOrderDomainService {
         return prefix + seq;
     }
 
+    public String generateReserveOrderNumber1() {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
+        String datePart = sdf.format(new Date());
+        String prefix = "R" + datePart;
+        List<String> orderNumber1 = reservationStockOutOrderMapper.generateReserveOrderNumber1(prefix);
+        List<String> orderNumber2 = reserveStockOutOrderMapper.generateReserveOrderNumber1(prefix);
+        List<String> allOrders = new ArrayList<>();
+        allOrders.addAll(orderNumber1);
+        allOrders.addAll(orderNumber2);
+        int maxseq = 0;
+        for(String order:allOrders)
+        {
+            String numStr = order.substring(prefix.length());
+            int num = Integer.parseInt(numStr);
+            if(num > maxseq){
+                maxseq = num;
+            }
+        }
+        String seq = String.format("%03d", maxseq + 1);
+        return prefix + seq;
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/repository/mapper/ReserveStockInOrderMapper.java

@@ -48,4 +48,6 @@ public interface ReserveStockInOrderMapper extends BaseMapper<ReserveStockInOrde
     public String getJsbz(@Param("id") Long id);
 
     int countByOrderNumberPrefix(@Param("prefix") String prefix);
+
+    List<String> generateReserveOrderNumber1(@Param("prefix") String prefix);
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/repository/mapper/ReserveStockOutOrderMapper.java

@@ -36,4 +36,6 @@ public interface ReserveStockOutOrderMapper extends BaseMapper<ReserveStockOutOr
     List<ReserveOutMaterialDetailPO> queryOutStockNoticePrintDetail(ReserveStockOutOrderDO stockOutOrderDO);
 
     int countByOrderNumberPrefix(@Param("prefix") String prefix);
+
+    List<String> generateReserveOrderNumber1(@Param("prefix") String prefix);
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/ReservationStockOutOrder/ReservationStockOutOrderApi.java

@@ -252,4 +252,10 @@ public class ReservationStockOutOrderApi extends BaseController {
         return AjaxResult.success(stockOutOrderApplicationService.generateReserveOrderNumber());
     }
 
+
+    @ApiOperation("生成出库预约单号/出库业务单号")
+    @GetMapping("/generateOrderNumber1")
+    public AjaxResult generateOrderNumber1() {
+        return AjaxResult.success(stockOutOrderApplicationService.generateReserveOrderNumber1());
+    }
 }

mhd_oms/src/main/java/com/mhd/oms/interfaces/facade/reservationStockInOrder/ReservationStockInOrderApi.java

@@ -287,4 +287,10 @@ public class ReservationStockInOrderApi extends BaseController {
         return AjaxResult.success(stockInOrderApplicationService.generateReserveOrderNumber());
     }
 
+    @ApiOperation("生成入库预约单号/入库业务单号")
+    @GetMapping("/generateOrderNumber1")
+    public AjaxResult generateOrderNumber1() {
+        return AjaxResult.success(stockInOrderApplicationService.generateReserveOrderNumber1());
+    }
+
 }