Showing
3 changed files
with
4 additions
and
4 deletions
| @@ -81,7 +81,7 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> { | @@ -81,7 +81,7 @@ public class ShipmentsPlanDetailBo extends BaseBo<ShipmentsPlanDetail> { | ||
| 81 | * 包装费 | 81 | * 包装费 |
| 82 | */ | 82 | */ |
| 83 | @ApiModelProperty("包装费") | 83 | @ApiModelProperty("包装费") |
| 84 | - private String packagingFee; | 84 | + private BigDecimal packagingFee; |
| 85 | 85 | ||
| 86 | /** | 86 | /** |
| 87 | * 运费 | 87 | * 运费 |
| @@ -73,7 +73,7 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto { | @@ -73,7 +73,7 @@ public class ShipmentsPlanDetail extends BaseEntity implements BaseDto { | ||
| 73 | * 包装费 | 73 | * 包装费 |
| 74 | */ | 74 | */ |
| 75 | @TableField(exist = false) | 75 | @TableField(exist = false) |
| 76 | - private String packagingFee; | 76 | + private BigDecimal packagingFee; |
| 77 | 77 | ||
| 78 | /** | 78 | /** |
| 79 | * 运费 | 79 | * 运费 |
| @@ -48,7 +48,7 @@ | @@ -48,7 +48,7 @@ | ||
| 48 | ELSE '其它' | 48 | ELSE '其它' |
| 49 | END AS order_type, | 49 | END AS order_type, |
| 50 | o.ordering_unit AS customer_id, | 50 | o.ordering_unit AS customer_id, |
| 51 | - o.packaging_fee, | 51 | + ol.packaging_fee, |
| 52 | o.shipping_cost, | 52 | o.shipping_cost, |
| 53 | c.name AS customer_name, | 53 | c.name AS customer_name, |
| 54 | tb.order_spec_id, | 54 | tb.order_spec_id, |
| @@ -220,7 +220,7 @@ | @@ -220,7 +220,7 @@ | ||
| 220 | o.ordering_unit AS customer_id, | 220 | o.ordering_unit AS customer_id, |
| 221 | o.delivery_method, | 221 | o.delivery_method, |
| 222 | o.settlement_terms, | 222 | o.settlement_terms, |
| 223 | - o.packaging_fee, | 223 | + ol.packaging_fee, |
| 224 | o.shipping_cost, | 224 | o.shipping_cost, |
| 225 | sc.type as contract_type, | 225 | sc.type as contract_type, |
| 226 | CASE | 226 | CASE |