From c22fbc53c30d274f7a8065ee5f6b6616eb1380cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=A5=8E=E5=85=B4?= <2220574228@qq.com> Date: Tue, 16 Jun 2026 15:06:53 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E4=BB=B7=E8=A7=84=E5=88=99=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E6=B7=BB=E5=8A=A0;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/domain/MaterialBaseInfoFeign.java | 2 +- .../entity/MaterialClassify.java | 2 +- .../repository/po/MaterialClassifyPO.java | 2 +- .../repository/todo/MaterialClassifyDO.java | 2 +- .../materialClassify/MaterialClassifyDTO.java | 2 +- .../repository/todo/MaterialBaseInfoDTO.java | 2 +- .../entity/ReservationStockInOrder.java | 20 ++++++++++++++++++ .../po/ReservationStockInOrderPO.java | 21 +++++++++++++++++++ .../todo/ReservationStockInOrderDO.java | 20 ++++++++++++++++++ .../todo/ReservationStockInOrderDTO.java | 20 ++++++++++++++++++ .../entity/ReserveInMaterialDetail.java | 3 +++ .../po/ReserveInMaterialDetailPO.java | 3 +++ .../todo/ReserveInMaterialDetailDO.java | 3 ++- .../todo/ReserveInMaterialDetailDTO.java | 3 +++ .../entity/MaterialBaseInfo.java | 2 +- .../repository/po/MaterialBaseInfoPO.java | 2 +- .../repository/todo/MaterialBaseInfoDO.java | 2 +- .../materialBaseInfo/MaterialBaseInfoDTO.java | 2 +- 18 files changed, 102 insertions(+), 11 deletions(-) diff --git a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java index 2c4d93174..44ff2f082 100644 --- a/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java +++ b/mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/domain/MaterialBaseInfoFeign.java @@ -240,7 +240,7 @@ public class MaterialBaseInfoFeign extends BaseVOEntity{ private BigDecimal insureAmount; @ApiModelProperty(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty(name = "单位") private String unit; diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java index c1413a396..081c81727 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/entity/MaterialClassify.java @@ -76,7 +76,7 @@ public class MaterialClassify extends BaseVOEntity{ @ApiModelProperty("收费标准") @Excel(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty("单位") @Excel(name = "单位") diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/po/MaterialClassifyPO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/po/MaterialClassifyPO.java index 6d42a67a5..276e24432 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/po/MaterialClassifyPO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/po/MaterialClassifyPO.java @@ -83,7 +83,7 @@ public class MaterialClassifyPO extends BaseVOEntity{ private List materialClassifyCodeList; @ApiModelProperty("收费标准") @Excel(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty("单位") @Excel(name = "单位") diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/todo/MaterialClassifyDO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/todo/MaterialClassifyDO.java index 5442e5a9f..9cc61a2fa 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/todo/MaterialClassifyDO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/domain/materialClassify/repository/todo/MaterialClassifyDO.java @@ -84,7 +84,7 @@ public class MaterialClassifyDO extends BaseVOEntity{ private List materialClassifyCodeList; @ApiModelProperty("收费标准") @Excel(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty("单位") @Excel(name = "单位") diff --git a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialClassify/MaterialClassifyDTO.java b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialClassify/MaterialClassifyDTO.java index 8b91ae8ef..36a18c532 100644 --- a/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialClassify/MaterialClassifyDTO.java +++ b/mhd-modules/mhd-system/src/main/java/com/mhd/basic/interfaces/dto/materialClassify/MaterialClassifyDTO.java @@ -84,7 +84,7 @@ public class MaterialClassifyDTO extends BaseVOEntity{ private List materialClassifyCodeList; @ApiModelProperty("收费标准") @Excel(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty("单位") @Excel(name = "单位") diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java index c8155647e..f58ea7046 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationMaterialInventory/repository/todo/MaterialBaseInfoDTO.java @@ -263,7 +263,7 @@ public class MaterialBaseInfoDTO extends BaseVOEntity { private BigDecimal insureAmount; @ApiModelProperty(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty(name = "单位") private String unit; diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java index f27e64e3a..1cc8956c4 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/entity/ReservationStockInOrder.java @@ -432,4 +432,24 @@ public class ReservationStockInOrder extends BaseVOEntity { @ApiModelProperty("运输业务单号") private String businessNumber; + @ApiModelProperty("是否免费夫力费费") + private String isFreeManpowerFee; + + @ApiModelProperty("折扣") + private BigDecimal discount; + + @ApiModelProperty("火险保费") + private BigDecimal fireInsureFee; + + @ApiModelProperty("夫力费") + private BigDecimal manpowerFee; + + @ApiModelProperty("总仓租") + private BigDecimal totalWarehouseRent; + + @ApiModelProperty("业务计价类型") + private String businessChargeType; + + @ApiModelProperty("业务计价方式") + private String businessPriceWay; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java index 08cd09e6a..a86c24a0d 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/po/ReservationStockInOrderPO.java @@ -455,4 +455,25 @@ public class ReservationStockInOrderPO extends BaseVOEntity { private String customerNcCode; @ApiModelProperty("运输业务单号") private String businessNumber; + + @ApiModelProperty("是否免费夫力费费") + private String isFreeManpowerFee; + + @ApiModelProperty("折扣") + private BigDecimal discount; + + @ApiModelProperty("火险保费") + private BigDecimal fireInsureFee; + + @ApiModelProperty("夫力费") + private BigDecimal manpowerFee; + + @ApiModelProperty("总仓租") + private BigDecimal totalWarehouseRent; + + @ApiModelProperty("业务计价类型") + private String businessChargeType; + + @ApiModelProperty("业务计价方式") + private String businessPriceWay; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java index fe0a9b573..9118c756f 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDO.java @@ -480,4 +480,24 @@ public class ReservationStockInOrderDO extends BaseVOEntity { private String xfStatus; @ApiModelProperty("运输业务单号") private String businessNumber; + @ApiModelProperty("是否免费夫力费费") + private String isFreeManpowerFee; + + @ApiModelProperty("折扣") + private BigDecimal discount; + + @ApiModelProperty("火险保费") + private BigDecimal fireInsureFee; + + @ApiModelProperty("夫力费") + private BigDecimal manpowerFee; + + @ApiModelProperty("总仓租") + private BigDecimal totalWarehouseRent; + + @ApiModelProperty("业务计价类型") + private String businessChargeType; + + @ApiModelProperty("业务计价方式") + private String businessPriceWay; } \ No newline at end of file diff --git a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java index 151dc5529..4e7385990 100644 --- a/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java +++ b/mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockInOrder/repository/todo/ReservationStockInOrderDTO.java @@ -475,4 +475,24 @@ public class ReservationStockInOrderDTO extends ReservationStockInOrderBaseDTO { private String expectTimeEnd; @ApiModelProperty("运输业务单号") private String businessNumber; + @ApiModelProperty("是否免费夫力费费") + private String isFreeManpowerFee; + + @ApiModelProperty("折扣") + private BigDecimal discount; + + @ApiModelProperty("火险保费") + private BigDecimal fireInsureFee; + + @ApiModelProperty("夫力费") + private BigDecimal manpowerFee; + + @ApiModelProperty("总仓租") + private BigDecimal totalWarehouseRent; + + @ApiModelProperty("业务计价类型") + private String businessChargeType; + + @ApiModelProperty("业务计价方式") + private String businessPriceWay; } \ No newline at end of file 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 452384303..9c097cf06 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 @@ -400,4 +400,7 @@ public class ReserveInMaterialDetail extends BaseVOEntity { @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/po/ReserveInMaterialDetailPO.java b/mhd_oms/src/main/java/com/mhd/oms/domain/reserveInMaterialDetail/repository/po/ReserveInMaterialDetailPO.java index 78d4e93d7..5c563704a 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,4 +503,7 @@ 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 3eaae5651..f71825501 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,5 +465,6 @@ 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 af28e3bdf..0ea164dc2 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 @@ -471,4 +471,7 @@ public class ReserveInMaterialDetailDTO extends BaseVOEntity { @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_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java index 01bc38dd6..6610535ca 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/entity/MaterialBaseInfo.java @@ -232,7 +232,7 @@ public class MaterialBaseInfo extends BaseVOEntity { private BigDecimal insureAmount; @ApiModelProperty(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty(name = "单位") private String unit; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java index 249a3e103..119bd3c2a 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/po/MaterialBaseInfoPO.java @@ -279,7 +279,7 @@ public class MaterialBaseInfoPO extends BaseVOEntity { private BigDecimal insureAmount; @ApiModelProperty(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty(name = "单位") private String unit; diff --git a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java index 0484546e0..941462c72 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/domain/materialBaseInfo/repository/todo/MaterialBaseInfoDO.java @@ -255,7 +255,7 @@ public class MaterialBaseInfoDO extends BaseVOEntity { private BigDecimal insureAmount; @ApiModelProperty(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty(name = "单位") private String unit; diff --git a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java index b24a34567..3a14c679e 100644 --- a/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java +++ b/mhd_wms/src/main/java/com/mhd/wms/interfaces/dto/materialBaseInfo/MaterialBaseInfoDTO.java @@ -307,7 +307,7 @@ public class MaterialBaseInfoDTO extends BaseVOEntity { private BigDecimal insureAmount; @ApiModelProperty(name = "收费标准") - private String chargeStandard; + private BigDecimal chargeStandard; @ApiModelProperty(name = "单位") private String unit;