Showing
3 changed files
with
6 additions
and
2 deletions
xingyun-sc/src/main/java/com/lframework/xingyun/sc/impl/shipments/ShipmentsOrderInfoServiceImpl.java
| ... | ... | @@ -538,8 +538,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr |
| 538 | 538 | // 生成草稿要车单 |
| 539 | 539 | CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate(), quantity); |
| 540 | 540 | String draftId = draftRequestCarTicketService.create(createVo); |
| 541 | - | |
| 542 | - // 草稿要车单id和要车单id映射 | |
| 541 | + // 草稿要车单ID和发货单ID映射 | |
| 543 | 542 | redisHandler.set("GET_SHIPMENTS_ORDER_ID_" + draftId, shipmentsOrderId); |
| 544 | 543 | break; |
| 545 | 544 | } | ... | ... |
| ... | ... | @@ -168,6 +168,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP |
| 168 | 168 | * @param vo 条件 |
| 169 | 169 | */ |
| 170 | 170 | @Override |
| 171 | + @Transactional(rollbackFor = Exception.class) | |
| 171 | 172 | public void planDetailSplit(ShipmentsPlanDetailSplitVo vo) { |
| 172 | 173 | String id = vo.getId(); |
| 173 | 174 | ShipmentsPlanDetail detail = findById(id); | ... | ... |
| ... | ... | @@ -5,6 +5,7 @@ |
| 5 | 5 | <resultMap id="ShipmentsPlanDetail" type="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail"> |
| 6 | 6 | <id column="id" property="id"/> |
| 7 | 7 | <result column="plan_id" property="planId"/> |
| 8 | + <result column="shipment_order_id" property="shipmentOrderId"/> | |
| 8 | 9 | <result column="order_id" property="orderId"/> |
| 9 | 10 | <result column="order_no" property="orderNo"/> |
| 10 | 11 | <result column="contract_type" property="contractType"/> |
| ... | ... | @@ -36,6 +37,7 @@ |
| 36 | 37 | SELECT |
| 37 | 38 | tb.id, |
| 38 | 39 | tb.plan_id, |
| 40 | + tb.shipment_order_id, | |
| 39 | 41 | tb.order_id, |
| 40 | 42 | o.order_no, |
| 41 | 43 | s.type as contract_type, |
| ... | ... | @@ -122,6 +124,7 @@ |
| 122 | 124 | INSERT INTO shipments_plan_detail ( |
| 123 | 125 | id, |
| 124 | 126 | plan_id, |
| 127 | + shipment_order_id, | |
| 125 | 128 | order_id, |
| 126 | 129 | order_spec_id, |
| 127 | 130 | parent_id, |
| ... | ... | @@ -140,6 +143,7 @@ |
| 140 | 143 | ( |
| 141 | 144 | #{item.id}, |
| 142 | 145 | #{item.planId}, |
| 146 | + #{item.shipmentOrderId}, | |
| 143 | 147 | #{item.orderId}, |
| 144 | 148 | #{item.orderSpecId}, |
| 145 | 149 | #{item.parentId}, | ... | ... |