Showing
3 changed files
with
10 additions
and
4 deletions
| ... | ... | @@ -273,9 +273,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR |
| 273 | 273 | .eq(OrderInfoChangeRecord::getId, vo.getId()); |
| 274 | 274 | getBaseMapper().update(updateWrapper); |
| 275 | 275 | // 更新订货单物料行 |
| 276 | - List<UpdatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList(); | |
| 277 | - for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : lineVoList) { | |
| 278 | - purchaseOrderLineService.update(updatePurchaseOrderLineVo); | |
| 276 | + // 先删再增 | |
| 277 | + List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList(); | |
| 278 | + purchaseOrderLineService.deleteByOrderId(data.getId()); | |
| 279 | + for (CreatePurchaseOrderLineVo createVo : lineVoList) { | |
| 280 | + createVo.setPurchaseOrderId(data.getId()); | |
| 281 | + purchaseOrderLineService.create(createVo); | |
| 279 | 282 | } |
| 280 | 283 | // 重新发起流程 |
| 281 | 284 | Boolean output = data.getOutput(); | ... | ... |
| 1 | 1 | package com.lframework.xingyun.sc.vo.order.change; |
| 2 | 2 | |
| 3 | +import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo; | |
| 3 | 4 | import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo; |
| 4 | 5 | import lombok.Data; |
| 5 | 6 | |
| ... | ... | @@ -209,5 +210,5 @@ public class UpdateOrderChangeRecordVo implements BaseVo, Serializable { |
| 209 | 210 | @Valid |
| 210 | 211 | @ApiModelProperty(value = "规格变更记录", required = true) |
| 211 | 212 | @NotEmpty(message = "请输入规格变更记录!") |
| 212 | - List<UpdatePurchaseOrderLineVo> orderSpecList; | |
| 213 | + List<CreatePurchaseOrderLineVo> orderSpecList; | |
| 213 | 214 | } | ... | ... |
| ... | ... | @@ -4,6 +4,7 @@ |
| 4 | 4 | |
| 5 | 5 | <resultMap id="OrderChangeRecord" type="com.lframework.xingyun.sc.entity.OrderInfoChangeRecord"> |
| 6 | 6 | <id column="id" property="id"/> |
| 7 | + <result column="order_id" property="orderId"/> | |
| 7 | 8 | <result column="order_no" property="orderNo"/> |
| 8 | 9 | <result column="supply_unit" property="supplyUnit"/> |
| 9 | 10 | <result column="ordering_unit" property="orderingUnit"/> |
| ... | ... | @@ -41,6 +42,7 @@ |
| 41 | 42 | <sql id="OrderChangeRecord_sql"> |
| 42 | 43 | SELECT |
| 43 | 44 | tb.id, |
| 45 | + tb.order_id, | |
| 44 | 46 | tb.order_no, |
| 45 | 47 | tb.supply_unit, |
| 46 | 48 | tb.ordering_unit, | ... | ... |