Commit b0ee2140dc49032e67427986e07a68ccce9bcf3c
Merge remote-tracking branch 'origin/master_0929' into master_0929
Showing
2 changed files
with
9 additions
and
0 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/vo/shipments/plan/QueryShipmentsPlanDetailVo.java
| @@ -27,6 +27,12 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial | @@ -27,6 +27,12 @@ public class QueryShipmentsPlanDetailVo extends PageVo implements BaseVo, Serial | ||
| 27 | private String planId; | 27 | private String planId; |
| 28 | 28 | ||
| 29 | /** | 29 | /** |
| 30 | + * 发货单ID | ||
| 31 | + */ | ||
| 32 | + @ApiModelProperty("发货单ID") | ||
| 33 | + private String shipmentsOrderId; | ||
| 34 | + | ||
| 35 | + /** | ||
| 30 | * 发货日期 | 36 | * 发货日期 |
| 31 | */ | 37 | */ |
| 32 | @ApiModelProperty("发货日期") | 38 | @ApiModelProperty("发货日期") |
| @@ -83,6 +83,9 @@ | @@ -83,6 +83,9 @@ | ||
| 83 | <if test="vo.planId != null and vo.planId != ''"> | 83 | <if test="vo.planId != null and vo.planId != ''"> |
| 84 | AND tb.plan_id = #{vo.planId} | 84 | AND tb.plan_id = #{vo.planId} |
| 85 | </if> | 85 | </if> |
| 86 | + <if test="vo.shipmentsOrderId != null and vo.shipmentsOrderId != ''"> | ||
| 87 | + AND tb.shipment_order_id = #{vo.shipmentsOrderId} | ||
| 88 | + </if> | ||
| 86 | <if test="vo.shipmentsDate != null"> | 89 | <if test="vo.shipmentsDate != null"> |
| 87 | AND tb.shipments_date = #{vo.shipmentsDate} | 90 | AND tb.shipments_date = #{vo.shipmentsDate} |
| 88 | </if> | 91 | </if> |