Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/service/order/impl/OrderServiceImpl.java

@@ -304,6 +304,16 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
                 .collect(Collectors.toList());
         orderSkuBomService.editLinked(orderSkuBomList, OrderSkuBom::getOrderId, orderDto.getId());
 
+        if (ObjectUtil.isNotEmpty(orderDto.getOrderPackageBomList())) {
+            // 更新订单包装信息
+            List<OrderPackageBomDto> tempOrderPackageBomList = orderDto.getOrderPackageBomList();
+            List<OrderPackageBom> orderPackageBomList = tempOrderPackageBomList.stream()
+                    .peek(item -> item.setOrderId(orderDto.getId()))
+                    .map(item -> (OrderPackageBom) item)
+                    .collect(Collectors.toList());
+            orderPackageBomService.editLinked(orderPackageBomList, OrderPackageBom::getOrderId, orderDto.getId());
+        }
+
         if (orderDto.getUpdateType() != null) {
             OrderOperatingLog orderOperatingLog = new OrderOperatingLog();
             orderOperatingLog.setType(orderDto.getUpdateType());
@@ -313,6 +323,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         }
 
         ObsFileUtil.editFile(orderDto.getFileList(), orderDto.getId());
+        // 更新 外箱不干胶图稿
+        ObsFileUtil.editFile(Collections.singletonList(orderDto.getOuterBoxSelfAdhesiveStickerFile()), orderDto.getId(), 1);
     }
 
     @DSTransactional

sd-business/src/main/java/com/sd/business/service/packaging/impl/PackagingAssemblyServiceImpl.java

@@ -44,7 +44,7 @@ public class PackagingAssemblyServiceImpl extends ServiceImpl<PackagingAssemblyM
         this.save(dto);
         // 保存包装组合bom关联信息
         List<PackagingAssemblyBom> packagingAssemblyBomList = dto.getPackagingAssemblyBomList();
-        packagingAssemblyBomList.forEach(q -> q.setId(dto.getId()));
+        packagingAssemblyBomList.forEach(q -> q.setPackagingAssemblyId(dto.getId()));
         packagingAssemblyBomService.saveBatch(packagingAssemblyBomList);
     }