楚江ERP-发货单拆分bug修复

@@ -538,8 +538,7 @@ public class ShipmentsOrderInfoServiceImpl extends BaseMpServiceImpl<ShipmentsOr
                 // 生成草稿要车单
                 // 生成草稿要车单
                 CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate(), quantity);
                 CreateDraftRequestCarTicketVo createVo = packDraftRequestCarTicket(orderInfo, plan.getTomoPreShipDate(), quantity);
                 String draftId = draftRequestCarTicketService.create(createVo);
                 String draftId = draftRequestCarTicketService.create(createVo);
-
-                // 草稿要车单id和要车单id映射
+                // 草稿要车单ID和发货单ID映射
                 redisHandler.set("GET_SHIPMENTS_ORDER_ID_" + draftId, shipmentsOrderId);
                 redisHandler.set("GET_SHIPMENTS_ORDER_ID_" + draftId, shipmentsOrderId);
                 break;
                 break;
             }
             }

@@ -168,6 +168,7 @@ public class ShipmentsPlanDetailServiceImpl extends BaseMpServiceImpl<ShipmentsP
      * @param vo 条件
      * @param vo 条件
      */
      */
     @Override
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void planDetailSplit(ShipmentsPlanDetailSplitVo vo) {
     public void planDetailSplit(ShipmentsPlanDetailSplitVo vo) {
         String id = vo.getId();
         String id = vo.getId();
         ShipmentsPlanDetail detail = findById(id);
         ShipmentsPlanDetail detail = findById(id);

@@ -5,6 +5,7 @@
     <resultMap id="ShipmentsPlanDetail" type="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">
     <resultMap id="ShipmentsPlanDetail" type="com.lframework.xingyun.sc.entity.ShipmentsPlanDetail">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
         <result column="plan_id" property="planId"/>
         <result column="plan_id" property="planId"/>
+        <result column="shipment_order_id" property="shipmentOrderId"/>
         <result column="order_id" property="orderId"/>
         <result column="order_id" property="orderId"/>
         <result column="order_no" property="orderNo"/>
         <result column="order_no" property="orderNo"/>
         <result column="contract_type" property="contractType"/>
         <result column="contract_type" property="contractType"/>
@@ -36,6 +37,7 @@
         SELECT
         SELECT
             tb.id,
             tb.id,
             tb.plan_id,
             tb.plan_id,
+            tb.shipment_order_id,
             tb.order_id,
             tb.order_id,
             o.order_no,
             o.order_no,
             s.type as contract_type,
             s.type as contract_type,
@@ -122,6 +124,7 @@
         INSERT INTO shipments_plan_detail (
         INSERT INTO shipments_plan_detail (
         id,
         id,
         plan_id,
         plan_id,
+        shipment_order_id,
         order_id,
         order_id,
         order_spec_id,
         order_spec_id,
         parent_id,
         parent_id,
@@ -140,6 +143,7 @@
             (
             (
             #{item.id},
             #{item.id},
             #{item.planId},
             #{item.planId},
+            #{item.shipmentOrderId},
             #{item.orderId},
             #{item.orderId},
             #{item.orderSpecId},
             #{item.orderSpecId},
             #{item.parentId},
             #{item.parentId},