计价规则字段添加;

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;

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 = "单位")

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<String> materialClassifyCodeList;
     @ApiModelProperty("收费标准")
     @Excel(name = "收费标准")
-    private String chargeStandard;
+    private BigDecimal chargeStandard;
 
     @ApiModelProperty("单位")
     @Excel(name = "单位")

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<String> materialClassifyCodeList;
     @ApiModelProperty("收费标准")
     @Excel(name = "收费标准")
-    private String chargeStandard;
+    private BigDecimal chargeStandard;
 
     @ApiModelProperty("单位")
     @Excel(name = "单位")

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<String> materialClassifyCodeList;
     @ApiModelProperty("收费标准")
     @Excel(name = "收费标准")
-    private String chargeStandard;
+    private BigDecimal chargeStandard;
 
     @ApiModelProperty("单位")
     @Excel(name = "单位")

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;

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
+
 }

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;
 }

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;
 }

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;

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;

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;

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;