diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java index 8f6078a99..2d23240eb 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/mapper/ReservationStockInOrderMapper.java @@ -77,4 +77,6 @@ public interface ReservationStockInOrderMapper extends BaseMapper generateReserveOrderNumber1(@Param("prefix") String prefix); int existsByOrderNumber(@Param("inOrderNumber") String inOrderNumber); + + int existsByBusinessOrderNo(@Param("businessOrderNo") String businessOrderNo); } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java index 26d21686d..5116ef9b0 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/persistence/ReservationStockInOrderImpl.java @@ -486,25 +486,17 @@ public class ReservationStockInOrderImpl extends ServiceImpl 0 - || reservationStockInOrderMapper.countByInOrderNumber(templateOrderNo) > 0; - if (duplicated) { - throw new ServiceException("入库业务单号已存在:" + templateOrderNo + ",请修改模板中的OrderNO后重新导入"); + // 按业务单号查重(入库业务单表 business_order_no 字段) + if (stockInOrderMapper.existsByBusinessOrderNo(templateOrderNo) > 0) { + throw new ServiceException("业务单号已存在:" + templateOrderNo + ",请修改模板中的OrderNO后重新导入"); } + reservationStockInOrderDO.setBusinessOrderNo(templateOrderNo); } - if (templateOrderNo.isEmpty()) { - templateOrderNo = reservationStockInOrderDomainService.generateReserveOrderNumber(); - } - reservationStockInOrderDO.setInOrderNumber(templateOrderNo); - reservationStockInOrderDO.setBusinessOrderNo(templateOrderNo); reservationStockInOrderDO.setOrganizationId(loginUser.getUserPo().getOrganizationId()); reservationStockInOrderDO.setOrganizationName(loginUser.getUserPo().getOrganizationName()); reservationStockInOrderDO.setTopOrganizationId(loginUser.getUserPo().getTopOrganizationId()); @@ -597,25 +589,6 @@ public class ReservationStockInOrderImpl extends ServiceImpl SELECT COUNT(1) FROM reservation_stock_in_order WHERE in_order_number = #{inOrderNumber} + + + \ No newline at end of file