订单明细

sd-business/src/main/java/com/sd/business/entity/sku/vo/SkuSpecLinkVo.java

@@ -4,6 +4,8 @@ import com.sd.business.entity.sku.po.SkuSpecLink;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
+
 /**
  * sku规格关联列表查询返回值实体
  *
@@ -19,4 +21,9 @@ public class SkuSpecLinkVo extends SkuSpecLink {
      */
     private String name;
 
+    /**
+     * 对内销售价(含税)
+     */
+    private BigDecimal internalSellingPrice;
+
 }

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

@@ -114,7 +114,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         wrapper.le("o", OrderInfo::getWlnCreateTime, dto.getEndTime());
         wrapper.and(q -> q
                 .and(r -> r.eq("o", OrderInfo::getWlnStorageCode, "T007").ge("o", OrderInfo::getWlnStatus, 2))
-                .or(r -> r.ne("o", OrderInfo::getWlnStorageCode, "T007").ge("o", OrderInfo::getWlnStatus, 1)));
+                .or(r -> r.ne("o", OrderInfo::getWlnStorageCode, "T007").ge("o", OrderInfo::getWlnStatus, 1))
+                .or(r -> r.eq("o", OrderInfo::getSource, 1))
+        );
 
         if (Objects.equals(dto.getLinkedStatementOfAccount(), 0)) {
             wrapper.isNull("o.statement_of_account_id");
@@ -212,6 +214,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OrderInfo> implem
         orderDto.setSettlementStatus(1);
         orderDto.setTaxRate(new BigDecimal("10.00"));
         orderDto.setTag("0");
+        orderDto.setExceptionType(OrderExceptionTypeEnum.NORMAL.getKey().toString());
         this.save(orderDto);
 
         List<OrderSkuDto> orderSkuList = orderDto.getOrderSkuList();

sd-business/src/main/java/com/sd/business/service/production/impl/StockPreparationServiceImpl.java

@@ -385,7 +385,9 @@ public class StockPreparationServiceImpl implements StockPreparationService {
         wrapper.eq("ss", SkuSpec::getName, dto.getSkuSpecName());
         wrapper.and(q -> q
                 .and(r -> r.eq("oi", OrderInfo::getWlnStorageCode, "T007").ge("oi", OrderInfo::getWlnStatus, 2))
-                .or(r -> r.ne("oi", OrderInfo::getWlnStorageCode, "T007").ge("oi", OrderInfo::getWlnStatus, 1)));
+                .or(r -> r.ne("oi", OrderInfo::getWlnStorageCode, "T007").ge("oi", OrderInfo::getWlnStatus, 1))
+                .or(r -> r.eq("o", OrderInfo::getSource, 1))
+        );
         return wrapper;
     }
 

sd-business/src/main/java/com/sd/business/service/sku/impl/SkuServiceImpl.java

@@ -476,6 +476,7 @@ public class SkuServiceImpl extends ServiceImpl<SkuMapper, Sku> implements SkuSe
             BomSpec bomSpec = bomSpecMap.get(item.getBomSpecId());
             if (bomSpec != null) {
                 skuSpecLinkVo.setName(bomSpec.getName());
+                skuSpecLinkVo.setInternalSellingPrice(bomSpec.getInternalSellingPrice());
             }
             return skuSpecLinkVo;
         }).collect(Collectors.toList());