楚江ERP-发货明细增加运费字段

@@ -84,6 +84,12 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> {
     private String packagingFee;
     private String packagingFee;
 
 
     /**
     /**
+     * 运费
+     */
+    @ApiModelProperty("运费")
+    private String shippingCost;
+
+    /**
      * 合同类型
      * 合同类型
      */
      */
     @ApiModelProperty("合同类型")
     @ApiModelProperty("合同类型")

@@ -76,6 +76,12 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto {
     private String packagingFee;
     private String packagingFee;
 
 
     /**
     /**
+     * 运费
+     */
+    @TableField(exist = false)
+    private String shippingCost;
+
+    /**
      * 合同类型
      * 合同类型
      */
      */
     @TableField(exist = false)
     @TableField(exist = false)

@@ -47,6 +47,7 @@
                 END AS order_type,
                 END AS order_type,
             o.ordering_unit AS customer_id,
             o.ordering_unit AS customer_id,
             o.packaging_fee,
             o.packaging_fee,
+            o.shipping_cost,
             c.name AS customer_name,
             c.name AS customer_name,
             tb.order_spec_id,
             tb.order_spec_id,
             ol.brand,
             ol.brand,
@@ -204,6 +205,7 @@
             o.delivery_method,
             o.delivery_method,
             o.settlement_terms,
             o.settlement_terms,
             o.packaging_fee,
             o.packaging_fee,
+            o.shipping_cost,
             sc.type as contract_type,
             sc.type as contract_type,
             CASE
             CASE
                 WHEN sc.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'
                 WHEN sc.type IN ('DISTRIB_STD', 'DIST_STOCK_CONTRACT', 'DRAFT_DIST_AGMT') THEN '经销'