From 3fe9a444ae42ea2e158379ef37cb27cb8d1d8eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Wed, 17 Jun 2026 17:03:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A5=E5=BA=93=E9=A2=84=E7=BA=A6=E5=8D=95?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=8A=B6=E6=80=81=E4=B8=BA=E6=9C=AA=E7=A1=AE?= =?UTF-8?q?=E8=AE=A4;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reserveInMaterialDetail/entity/ReserveInMaterialDetail.java | 2 -- .../repository/po/ReserveInMaterialDetailPO.java | 2 -- .../repository/todo/ReserveInMaterialDetailDO.java | 2 -- .../repository/todo/ReserveInMaterialDetailDTO.java | 2 -- .../service/ReserveStockInOrderApplicationService.java | 2 +- 5 files changed, 1 insertion(+), 9 deletions(-) diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java index 9c097cf06..ac4c6c09a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/entity/ReserveInMaterialDetail.java @@ -401,6 +401,4 @@ public class ReserveInMaterialDetail extends BaseVOEntity { @DateTimeFormat(pattern="yyyy-MM-dd") private Date shelfLife; - @ApiModelProperty("火险保费") - private BigDecimal fireInsureFee; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java index 5c563704a..66043e8f1 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java @@ -503,7 +503,5 @@ public class ReserveInMaterialDetailPO extends ReserveStockInOrderBasePO { @DateTimeFormat(pattern="yyyy-MM-dd") private Date shelfLife; - @ApiModelProperty("火险保费") - private BigDecimal fireInsureFee; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDO.java index f71825501..b55266c2a 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDO.java @@ -465,6 +465,4 @@ public class ReserveInMaterialDetailDO extends ReserveStockInOrderBaseDO { @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd") @DateTimeFormat(pattern="yyyy-MM-dd") private Date shelfLife; - @ApiModelProperty("火险保费") - private BigDecimal fireInsureFee; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDTO.java index 0ea164dc2..7201a9163 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/todo/ReserveInMaterialDetailDTO.java @@ -472,6 +472,4 @@ public class ReserveInMaterialDetailDTO extends BaseVOEntity { @DateTimeFormat(pattern="yyyy-MM-dd") private Date shelfLife; - @ApiModelProperty("火险保费") - private BigDecimal fireInsureFee; } \ No newline at end of file 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 900443138..98e47ba05 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 @@ -1965,7 +1965,7 @@ public class ReserveStockInOrderApplicationService { LoginUser loginUser = SecurityUtils.getLoginUser(); ReserveStockInOrderDO reserveStockInOrder = new ReserveStockInOrderDO(); reserveStockInOrder.setBusinessOrderNo(generateDateTimeWithRandom()); - reserveStockInOrder.setIssueStatus(0); + reserveStockInOrder.setIssueStatus(1); reserveStockInOrder.setDocumentDate(new Date()); reserveStockInOrder.setExpectTime(new Date()); reserveStockInOrder.setOrderStatus("新增");