diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java index e0c259eff..cbf30e381 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockInOrder/service/ReserveStockInOrderApplicationService.java @@ -2201,7 +2201,7 @@ public class ReserveStockInOrderApplicationService { // 组装入库预约单 ReserveStockInOrderDO stockInOrderDO = new ReserveStockInOrderDO(); stockInOrderDO.setInOrderNumber(orderNumber); - stockInOrderDO.setBusinessOrderNo(generateDateTimeWithRandom()); + stockInOrderDO.setBusinessOrderNo(orderNumber); // 老系统历史数据,状态直接置为最终状态:已入库、审核通过、已完成 stockInOrderDO.setStatus(5); stockInOrderDO.setAuditStatus(3); diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java index 3d69b9552..4dc2f9a89 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveStockOutOrder/service/ReserveStockOutOrderApplicationService.java @@ -1240,7 +1240,8 @@ public class ReserveStockOutOrderApplicationService { materialDetail.setTotalGrossWeight(detailRow.getWeight()); // 保留老系统关联的入库单号到备注 if (StringUtils.isNotBlank(detailRow.getInOrderNumber())) { - materialDetail.setRemark("老系统入库单号:" + detailRow.getInOrderNumber()); +// materialDetail.setRemark("老系统入库单号:" + detailRow.getInOrderNumber()); + materialDetail.setInOrderNumber(detailRow.getInOrderNumber()); } materialDetail.setContractFee(BigDecimal.ZERO); materialDetail.setLotNo(generateDateSerialNumber() + "-" + lotIndex); @@ -1261,7 +1262,7 @@ public class ReserveStockOutOrderApplicationService { // 组装出库预约单 ReserveStockOutOrderDO stockOutOrderDO = new ReserveStockOutOrderDO(); stockOutOrderDO.setOutOrderNumber(orderNumber); - stockOutOrderDO.setBusinessOrderNo(generateDateTimeWithRandom()); + stockOutOrderDO.setBusinessOrderNo(orderNumber); // 老系统历史数据,状态直接置为最终状态:已出库、审核通过 stockOutOrderDO.setStatus(9); stockOutOrderDO.setAuditStatus(3);