添加计费字段;

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/entity/ExecutionStockOutOrder.java

@@ -504,4 +504,16 @@ public class ExecutionStockOutOrder extends BaseVOEntity {
     @Excel(name = "车次")
     private String shuttleNo;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/po/ExecutionStockOutOrderPO.java

@@ -516,4 +516,16 @@ public class ExecutionStockOutOrderPO extends BaseVOEntity {
     @ApiModelProperty("车次")
     @Excel(name = "车次")
     private String shuttleNo;
+
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDO.java

@@ -576,4 +576,16 @@ public class ExecutionStockOutOrderDO extends BaseVOEntity {
 
     @ApiModelProperty("车次")
     private String shuttleNo;
+
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/executionStockOutOrder/repository/todo/ExecutionStockOutOrderDTO.java

@@ -564,4 +564,16 @@ public class ExecutionStockOutOrderDTO extends ExecutionStockOutOrderBaseDTO {
 
     @ApiModelProperty("车次")
     private String shuttleNo;
+
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/entity/ReservationInMaterialDetail.java

@@ -381,6 +381,10 @@ public class ReservationInMaterialDetail extends BaseVOEntity {
     private Date drinkDate;
     @ApiModelProperty("火险保费")
     private BigDecimal fireInsureFee;
+    @ApiModelProperty("夫力费")
+    private BigDecimal manpowerFee;
+    @ApiModelProperty("仓租费")
+    private BigDecimal totalWarehouseRent;
 
 
     //订单行号

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/po/ReservationInMaterialDetailPO.java

@@ -483,6 +483,10 @@ public class ReservationInMaterialDetailPO extends ReservationStockInOrderBasePO
     private String lotNumber;
     @ApiModelProperty("火险保费")
     private BigDecimal fireInsureFee;
+    @ApiModelProperty("夫力费")
+    private BigDecimal manpowerFee;
+    @ApiModelProperty("仓租费")
+    private BigDecimal totalWarehouseRent;
 
     //订单行号
     private String lineNumGw;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDO.java

@@ -448,6 +448,10 @@ public class ReservationInMaterialDetailDO extends ReservationStockInOrderBaseDO
     private BigDecimal unitPrice;
     @ApiModelProperty("火险保费")
     private BigDecimal fireInsureFee;
+    @ApiModelProperty("夫力费")
+    private BigDecimal manpowerFee;
+    @ApiModelProperty("仓租费")
+    private BigDecimal totalWarehouseRent;
 
     //订单行号
     private String lineNumGw;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationInMaterialDetail/repository/todo/ReservationInMaterialDetailDTO.java

@@ -455,6 +455,10 @@ public class ReservationInMaterialDetailDTO extends BaseVOEntity {
     private String productionDate;
     @ApiModelProperty("火险保费")
     private BigDecimal fireInsureFee;
+    @ApiModelProperty("夫力费")
+    private BigDecimal manpowerFee;
+    @ApiModelProperty("仓租费")
+    private BigDecimal totalWarehouseRent;
 
     //订单行号
     private String lineNumGw;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/entity/ReservationOutMaterialDetail.java

@@ -501,6 +501,9 @@ public class ReservationOutMaterialDetail extends BaseVOEntity {
     @Excel(name = "库存数量")
     private BigDecimal stockQuantity;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
 
     //订单行号
     private String lineNumGw;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/po/ReservationOutMaterialDetailPO.java

@@ -519,6 +519,9 @@ public class ReservationOutMaterialDetailPO extends ReservationStockOutOrderBase
     @Excel(name = "库存数量")
     private BigDecimal stockQuantity;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
     @ApiModelProperty("出库异常明细：计划数量（复核异常场景=拣货数量）")
     @TableField(exist = false)
     private BigDecimal abnormalPlanQuantity;

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDO.java

@@ -477,6 +477,8 @@ public class ReservationOutMaterialDetailDO extends BaseVOEntity {
     @Excel(name = "库存数量")
     private BigDecimal stockQuantity;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
 
     @ApiModelProperty("调整前库存数量")
     @Excel(name = "调整前库存数量")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationOutMaterialDetail/repository/todo/ReservationOutMaterialDetailDTO.java

@@ -469,6 +469,8 @@ public class ReservationOutMaterialDetailDTO extends BaseVOEntity {
     @Excel(name = "库存数量")
     private BigDecimal stockQuantity;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
 
     @ApiModelProperty("调整前库存数量")
     @Excel(name = "调整前库存数量")

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/entity/ReservationStockOutOrder.java

@@ -503,4 +503,16 @@ public class ReservationStockOutOrder extends BaseVOEntity {
     @Excel(name = "车次")
     private String shuttleNo;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/po/ReservationStockOutOrderPO.java

@@ -526,4 +526,16 @@ public class ReservationStockOutOrderPO extends BaseVOEntity {
     @Excel(name = "车次")
     private String shuttleNo;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDO.java

@@ -579,4 +579,16 @@ public class ReservationStockOutOrderDO extends BaseVOEntity {
     @ApiModelProperty("车次")
     private String shuttleNo;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
+
 }

mhd_oms/src/main/java/com/mhd/oms/domain/reservationStockOutOrder/repository/todo/ReservationStockOutOrderDTO.java

@@ -568,4 +568,16 @@ public class ReservationStockOutOrderDTO extends ReservationStockOutOrderBaseDTO
     @ApiModelProperty("车次")
     private String shuttleNo;
 
+    @ApiModelProperty("总仓租")
+    private BigDecimal totalWarehouseRent;
+
+    @ApiModelProperty("业务计价类型")
+    private String businessChargeType;
+
+    @ApiModelProperty("业务计价方式")
+    private String businessPriceWay;
+
+    @ApiModelProperty("折扣")
+    private BigDecimal discount;
+
 }