承运结算单优化-货主结算单明细增加字段

performance-api/src/main/java/com/clx/performance/vo/pc/owner/settle/PageOwnerSettlementOwnerDetailVO.java

@@ -46,6 +46,20 @@ public class PageOwnerSettlementOwnerDetailVO {
     @ApiModelProperty(value="实际净重（吨）",example = "2.3")
     private BigDecimal weight;
 
+
+    @ApiModelProperty(value = "装货毛重（单位吨）", example = "1.23")
+    private BigDecimal loadRough;
+    @ApiModelProperty(value = "装货皮重（单位吨）", example = "1.23")
+    private BigDecimal loadTare;
+    @ApiModelProperty(value = "装货净重（单位吨）", example = "1.23")
+    private BigDecimal loadNet;
+    @ApiModelProperty(value = "卸货毛重（单位吨）", example = "1.23")
+    private BigDecimal unloadRough;
+    @ApiModelProperty(value = "卸货皮重（单位吨）", example = "1.23")
+    private BigDecimal unloadTare;
+    @ApiModelProperty(value = "卸货净重（单位吨）", example = "1.23")
+    private BigDecimal unloadNet;
+
     @MoneyOutConvert
     @ApiModelProperty(value="实际运费",example = "2.52")
     private BigDecimal freight;

performance-web/src/main/java/com/clx/performance/model/settle/SettlementOwnerDetail.java

@@ -43,6 +43,13 @@ public class SettlementOwnerDetail implements HasKey<Integer> {
     private String goodsName;                       //货物名称
     private BigDecimal freightPrice;                //平台运费单价（分）
     private BigDecimal weight;                      //实际净重（吨）
+    private BigDecimal loadRough;                   //装货毛重（单位吨）
+    private BigDecimal loadTare;                    //装货皮重（单位吨）
+    private BigDecimal loadNet;                     //装货净重（单位吨）
+    private BigDecimal unloadRough;                 //卸货毛重（单位吨）
+    private BigDecimal unloadTare;                  //卸货皮重（单位吨）
+    private BigDecimal unloadNet;                   //卸货净重（单位吨）
+
     private BigDecimal freight;                     //实际运费（分）
     private BigDecimal lossPrice;                   //损耗单价（分）
     private BigDecimal lossWeight;                  //货损吨数（吨）

performance-web/src/main/java/com/clx/performance/service/impl/settle/SettlementOwnerDetailServiceImpl.java

@@ -77,6 +77,12 @@ public class SettlementOwnerDetailServiceImpl  implements SettlementOwnerDetailS
         settlementOwnerDetail.setFreightPrice(orderChild.getOrderFreightPrice());     //平台运费
         settlementOwnerDetail.setWeight(weightCalc(orderGoods.getSettlementWay(),orderChild.getLoadNet(), orderChild.getUnloadNet()));
         settlementOwnerDetail.setFreight(freightCalc(settlementOwnerDetail.getFreightPrice(), settlementOwnerDetail.getWeight()));
+        settlementOwnerDetail.setLoadRough(orderChild.getLoadRough());
+        settlementOwnerDetail.setLoadTare(orderChild.getLoadTare());
+        settlementOwnerDetail.setLoadNet(orderChild.getLoadNet());
+        settlementOwnerDetail.setUnloadRough(orderChild.getUnloadRough());
+        settlementOwnerDetail.setUnloadTare(orderChild.getUnloadTare());
+        settlementOwnerDetail.setUnloadNet(orderChild.getUnloadNet());
 
         // 亏吨
         settlementOwnerDetail.setLossPrice(orderChild.getLossPrice());