Showing
2 changed files
with
7 additions
and
0 deletions
| @@ -225,6 +225,12 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> { | @@ -225,6 +225,12 @@ public class OrderChangeRecordBo extends BaseBo<OrderInfoChangeRecord> { | ||
| 225 | private LocalDate createDate; | 225 | private LocalDate createDate; |
| 226 | 226 | ||
| 227 | /** | 227 | /** |
| 228 | + * 是否已产出 | ||
| 229 | + */ | ||
| 230 | + @ApiModelProperty("是否已产出") | ||
| 231 | + private Boolean output; | ||
| 232 | + | ||
| 233 | + /** | ||
| 228 | * 变更前规格数据 | 234 | * 变更前规格数据 |
| 229 | */ | 235 | */ |
| 230 | @ApiModelProperty("变更前规格数据") | 236 | @ApiModelProperty("变更前规格数据") |
| @@ -121,6 +121,7 @@ | @@ -121,6 +121,7 @@ | ||
| 121 | 121 | ||
| 122 | <select id="queryCanShipmentsData" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail"> | 122 | <select id="queryCanShipmentsData" resultType="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail"> |
| 123 | select | 123 | select |
| 124 | + ol.id, | ||
| 124 | o.id as order_id, | 125 | o.id as order_id, |
| 125 | o.order_no, | 126 | o.order_no, |
| 126 | c.name AS customer_name, | 127 | c.name AS customer_name, |