添加计费字段;

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

mhd_oms/src/main/resources/mapper/executionStockOutOrder/ExecutionStockOutOrderMapper.xml

@@ -112,6 +112,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lineCode"    column="LINE_CODE"    />
         <result property="lineName"    column="LINE_NAME"    />
         <result property="shuttleNo"    column="SHUTTLE_NO"    />
+        <result property="totalWarehouseRent"    column="TOTAL_WAREHOUSE_RENT"    />
+        <result property="businessChargeType"    column="BUSINESS_CHARGE_TYPE"    />
+        <result property="businessPriceWay"    column="BUSINESS_PRICE_WAY"    />
+        <result property="discount"    column="DISCOUNT"    />
     </resultMap>
 
 
@@ -130,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
         a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.RETURN_QUANTITY,a.DELIVERY_NAME,a.CUSTOMER_NUMBER,a.INVOICE_NUMBER,a.RETURN_ORDER_NUMBER,a.TOTAL_AMOUNT,
-        a.ROUTE,a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,a.LINE_CODE,a.LINE_NAME,a.SHUTTLE_NO
+        a.ROUTE,a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,a.LINE_CODE,a.LINE_NAME,a.SHUTTLE_NO,
+        a.TOTAL_WAREHOUSE_RENT,a.BUSINESS_CHARGE_TYPE,a.BUSINESS_PRICE_WAY,a.DISCOUNT
     </sql>
 
 

mhd_oms/src/main/resources/mapper/reservationInMaterialDetail/ReservationInMaterialDetailMapper.xml

@@ -90,6 +90,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lotNo"    column="lot_no"    />
         <result property="drinkDate"    column="drink_date"    />
         <result property="fireInsureFee"    column="fire_insure_fee"    />
+        <result property="manpowerFee"    column="manpower_fee"    />
+        <result property="totalWarehouseRent"    column="total_warehouse_rent"    />
         <result property="lineNumGw"    column="line_num_gw"    />
         <result property="specGw"    column="spec_gw"    />
         <result property="unitGw"    column="unit_gw"    />
@@ -110,7 +112,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.lot_no ,
         a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.in_order_number, a.material_base_info_id,
         a.material_code, a.material_name, a.bar_code, a.quantity, a.receipt_quantity, a.shelves_quantity,
-        a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.drink_date,a.fire_insure_fee,
+        a.receipt_status, a.shelves_status, a.pack_id, a.pack_code, a.pack_name,a.drink_date,a.fire_insure_fee,a.manpower_fee,a.total_warehouse_rent,
         CASE 
             WHEN a.pack_detail_id IS NULL OR TRIM(a.pack_detail_id) = '' THEN NULL 
             ELSE CAST(a.pack_detail_id AS BIGINT) 

mhd_oms/src/main/resources/mapper/reservationOutMaterialDetail/ReservationOutMaterialDetailMapper.xml

@@ -94,6 +94,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="inOrderNumber"    column="in_order_number"    />
         <result property="stockUnit"    column="stock_unit"    />
         <result property="stockQuantity"    column="stock_quantity"    />
+        <result property="totalWarehouseRent"    column="total_warehouse_rent"    />
         <result property="inventoryQuantity"    column="inventory_quantity"    />
         <result property="lineNumGw"    column="line_num_gw"    />
         <result property="specGw"    column="spec_gw"    />
@@ -115,6 +116,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.single_gross_weight ,
         a.lot_no ,
         a.stock_quantity ,
+        a.total_warehouse_rent ,
         a.stock_unit ,a.in_order_number ,
         a.material_detail_id, a.organization_id, a.organization_name, a.top_organization_id, a.unique_id, a.out_order_number, a.material_base_info_id, a.line_number, a.material_code, a.material_name, a.bar_code, a.weight_limit, a.volume_limit,
         a.quantity, a.already_allocation_quantity, a.allocation_quantity, a.picking_quantity, a.check_quantity, ROUND(GREATEST(0, IFNULL(a.quantity, 0) - IFNULL(a.check_quantity, 0), IFNULL(a.picking_quantity, 0) - IFNULL(a.check_quantity, 0)), 2) AS wait_check_quantity,

mhd_oms/src/main/resources/mapper/reservationStockOutOrder/ReservationStockOutOrderMapper.xml

@@ -112,6 +112,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="lineCode"    column="LINE_CODE"    />
         <result property="lineName"    column="LINE_NAME"    />
         <result property="shuttleNo"    column="SHUTTLE_NO"    />
+        <result property="totalWarehouseRent"    column="TOTAL_WAREHOUSE_RENT"    />
+        <result property="businessChargeType"    column="BUSINESS_CHARGE_TYPE"    />
+        <result property="businessPriceWay"    column="BUSINESS_PRICE_WAY"    />
+        <result property="discount"    column="DISCOUNT"    />
     </resultMap>
 
 
@@ -130,7 +134,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         a.CUSTOMS_INSPECTION_FLAG,a.NEED_DECLARE_FLAG,a.NEED_TRANSPORT_FLAG,a.picture_app,a.reservation_audit_time,a.reservation_audit_name
         ,a.reservation_audit_id,a.issue_name,a.issue_id,a.issue_time,a.issue_status,a.tms_order_number,
         a.DIRECTOR_NAME ,a.DIRECTOR_PHONE,a.DIRECTOR_ID,a.RESERVATION_ORDER_SOURCE,a.OUTBOUND_TIME,a.RETURN_QUANTITY,a.DELIVERY_NAME,a.CUSTOMER_NUMBER,a.INVOICE_NUMBER,a.RETURN_ORDER_NUMBER,a.TOTAL_AMOUNT,
-        a.ROUTE,a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,a.execution_out_order_number,a.LINE_CODE,a.LINE_NAME,a.SHUTTLE_NO
+        a.ROUTE,a.PUSH_TIME,a.PUSH_STATUS,a.PUSH_BY,a.PUSH_BY_NAME,a.execution_out_order_number,a.LINE_CODE,a.LINE_NAME,a.SHUTTLE_NO,
+        a.TOTAL_WAREHOUSE_RENT,a.BUSINESS_CHARGE_TYPE,a.BUSINESS_PRICE_WAY,a.DISCOUNT
     </sql>