楚江ERP-订货单变更记录详情调整

@@ -273,9 +273,12 @@ public class OrderChangeRecordServiceImpl extends BaseMpServiceImpl<OrderChangeR
                 .eq(OrderInfoChangeRecord::getId, vo.getId());
                 .eq(OrderInfoChangeRecord::getId, vo.getId());
         getBaseMapper().update(updateWrapper);
         getBaseMapper().update(updateWrapper);
         // 更新订货单物料行
         // 更新订货单物料行
-        List<UpdatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList();
-        for (UpdatePurchaseOrderLineVo updatePurchaseOrderLineVo : lineVoList) {
-            purchaseOrderLineService.update(updatePurchaseOrderLineVo);
+        // 先删再增
+        List<CreatePurchaseOrderLineVo> lineVoList = vo.getOrderSpecList();
+        purchaseOrderLineService.deleteByOrderId(data.getId());
+        for (CreatePurchaseOrderLineVo createVo : lineVoList) {
+            createVo.setPurchaseOrderId(data.getId());
+            purchaseOrderLineService.create(createVo);
         }
         }
         // 重新发起流程
         // 重新发起流程
         Boolean output = data.getOutput();
         Boolean output = data.getOutput();

 package com.lframework.xingyun.sc.vo.order.change;
 package com.lframework.xingyun.sc.vo.order.change;
 
 
+import com.lframework.xingyun.sc.vo.order.CreatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import com.lframework.xingyun.sc.vo.order.UpdatePurchaseOrderLineVo;
 import lombok.Data;
 import lombok.Data;
 
 
@@ -209,5 +210,5 @@ public class UpdateOrderChangeRecordVo implements BaseVo, Serializable {
     @Valid
     @Valid
     @ApiModelProperty(value = "规格变更记录", required = true)
     @ApiModelProperty(value = "规格变更记录", required = true)
     @NotEmpty(message = "请输入规格变更记录！")
     @NotEmpty(message = "请输入规格变更记录！")
-    List<UpdatePurchaseOrderLineVo> orderSpecList;
+    List<CreatePurchaseOrderLineVo> orderSpecList;
 }
 }

@@ -4,6 +4,7 @@
 
 
     <resultMap id="OrderChangeRecord" type="com.lframework.xingyun.sc.entity.OrderInfoChangeRecord">
     <resultMap id="OrderChangeRecord" type="com.lframework.xingyun.sc.entity.OrderInfoChangeRecord">
         <id column="id" property="id"/>
         <id column="id" property="id"/>
+        <result column="order_id" property="orderId"/>
         <result column="order_no" property="orderNo"/>
         <result column="order_no" property="orderNo"/>
         <result column="supply_unit" property="supplyUnit"/>
         <result column="supply_unit" property="supplyUnit"/>
         <result column="ordering_unit" property="orderingUnit"/>
         <result column="ordering_unit" property="orderingUnit"/>
@@ -41,6 +42,7 @@
     <sql id="OrderChangeRecord_sql">
     <sql id="OrderChangeRecord_sql">
         SELECT
         SELECT
             tb.id,
             tb.id,
+            tb.order_id,
             tb.order_no,
             tb.order_no,
             tb.supply_unit,
             tb.supply_unit,
             tb.ordering_unit,
             tb.ordering_unit,