Merge remote-tracking branch 'origin/master'

sd-business/src/main/java/com/sd/business/entity/statement/vo/DocumentByBomVo.java

@@ -81,4 +81,9 @@ public class DocumentByBomVo {
      */
     private Integer placeholder;
 
+    /**
+     * 订单id
+     */
+    private Long orderId;
+
 }

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

@@ -198,6 +198,12 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         // 赋值订单明细
         List<OrderSku> tempOrderSkuList = orderSkuService.list(q -> q.eq(OrderSku::getOrderId, id));
         List<OrderSkuVo> orderSkuList = BeanUtil.copyToList(tempOrderSkuList, OrderSkuVo.class);
+
+        // 当订单为委外订单时，数量设置为0
+        if (orderInfo.getType().equals(2)) {
+            orderSkuList.forEach(item -> item.setQuantity(BigDecimal.ZERO));
+        }
+
         skuSpecService.attributeAssign(orderSkuList, OrderSkuVo::getSkuSpecId, (item, skuSpec) -> {
             item.setName(skuSpec.getName());
             item.setCode(skuSpec.getCode());
@@ -236,6 +242,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
             item.setCode(bomSpec.getCode());
             item.setName(bomSpec.getName());
         });
+        result.setOrderPackageList(orderPackageList);
 
         return result;
     }

sd-business/src/main/java/com/sd/business/service/statement/impl/StatementOfAccountServiceImpl.java

@@ -295,6 +295,7 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
         // 主材bom
         List<DocumentByBomVo> result = orderSkuList.stream()
                 .map(item -> DocumentByBomVo.builder()
+                        .orderId(item.getOrderId())
                         .bomSpecId(item.getBomSpecId())
                         .quantity(item.getQuantity())
                         .unitPrice(item.getUnitPrice())
@@ -318,6 +319,13 @@ public class StatementOfAccountServiceImpl extends ServiceImpl<StatementOfAccoun
                                 .add(item.getManagementFeeSummary())
                 ))
                 .peek(item -> item.setTotal(item.getSubtotal()))
+                .peek(item -> {
+                    // 判断是否是委外订单，如果是委外订单时将bom数量修改为0
+                    OrderInfo orderInfo = orderService.getOne(q -> q.eq(OrderInfo::getId, item.getOrderId()).eq(OrderInfo::getType, 2));
+                    if (ObjectUtil.isNotEmpty(orderInfo)) {
+                        item.setQuantity(BigDecimal.ZERO);
+                    }
+                })
                 .collect(Collectors.toList());
 
         // 赋值主材bom品名品号