订单同步

申购单草稿赋值流程状态

sd-business/src/main/java/com/sd/business/controller/purchase/PurchaseController.java

@@ -50,7 +50,7 @@ public class PurchaseController {
      */
     @PostMapping("/add")
     public void add(@RequestBody PurchaseDto purchaseDto) {
-        purchaseDto.setPaymentStatus(FlowStatusEnum.READY_START.getKey());
+        purchaseDto.setFlowStatus(FlowStatusEnum.READY_START.getKey());
         purchaseService.add(purchaseDto);
     }
 

sd-business/src/main/java/com/sd/business/entity/bom/bo/BomBo.java

@@ -15,21 +15,6 @@ public class BomBo {
     private Long skuSpecId;
 
     /**
-     * bomId
-     */
-    private Long bomId;
-
-    /**
-     * bom规格id
-     */
-    private Long bomSpecId;
-
-    /**
-     * 加工面板 字典:charge_item
-     */
-    private String machinedPanel;
-
-    /**
      * 对内销售价(含税)
      */
     private BigDecimal internalSellingPrice;

sd-business/src/main/java/com/sd/business/service/sku/SkuSpecService.java

@@ -50,6 +50,6 @@ public interface SkuSpecService extends BaseService<SkuSpec> {
     /**
      * 根据sku规格id获取bomId和bom规格id
      */
-    Map<Long, BomBo> getBomBySkuSpecIdList(List<Long> skuSpecIdList);
+    Map<Long, BomBo> getBomBoByIdList(List<Long> bomSpecIdList);
 
 }

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

@@ -64,19 +64,19 @@ public class SkuSpecServiceImpl extends ServiceImpl<SkuSpecMapper, SkuSpec> impl
     }
 
     @Override
-    public Map<Long, BomBo> getBomBySkuSpecIdList(List<Long> skuSpecIdList) {
+    public Map<Long, BomBo> getBomBoByIdList(List<Long> bomSpecIdList) {
 
-        if (ObjectUtil.isEmpty(skuSpecIdList)) {
+        if (ObjectUtil.isEmpty(bomSpecIdList)) {
             return Collections.emptyMap();
         }
 
-        skuSpecIdList = skuSpecIdList.stream().filter(ObjectUtil::isNotNull).distinct().collect(Collectors.toList());
+        bomSpecIdList = bomSpecIdList.stream().filter(ObjectUtil::isNotNull).distinct().collect(Collectors.toList());
 
-        if (ObjectUtil.isEmpty(skuSpecIdList)) {
+        if (ObjectUtil.isEmpty(bomSpecIdList)) {
             return Collections.emptyMap();
         }
 
-        List<BomBo> list = baseMapper.getBomBoList(Wrappers.query().in("ss.id", skuSpecIdList));
+        List<BomBo> list = baseMapper.getBomBoList(Wrappers.query().in("bs.id", bomSpecIdList));
 
         return list.stream().collect(Collectors.toMap(BomBo::getSkuSpecId, Function.identity()));
     }

sd-business/src/main/resources/mapper/sku/SkuSpecMapper.xml

@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sd.business.mapper.sku.SkuSpecMapper">
+
     <select id="getPage" resultType="com.sd.business.entity.sku.vo.SkuSpecVo">
         select ss.id,
                ss.sku_id,
@@ -24,16 +25,12 @@
     </select>
 
     <select id="getBomBoList" resultType="com.sd.business.entity.bom.bo.BomBo">
-        SELECT ss.id        skuSpecId,
+        SELECT bs.id        bomSpecId,
-               ss.machined_panel,
-               bs.id        bomSpecId,
                bs.internal_selling_price,
                bs.external_selling_price,
-               b.id         bomId,
                bc.parent_id classifyParentId
-        FROM sku_spec ss
+        FROM bom_spec bs
-                 INNER JOIN bom_spec bs ON ss.bom_spec_id = bs.id
+                 LEFT JOIN bom b ON bs.bom_id = b.id
-                 INNER JOIN bom b ON bs.bom_id = b.id
                  LEFT JOIN bom_classify bc on b.bom_classify_id = bc.id
             ${ew.customSqlSegment}
     </select>

sd-wln/src/main/java/com/sd/wln/service/impl/WlnOrderServiceImpl.java

@@ -387,9 +387,9 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             return;
         }
 
-        // 根据sku规格id获取bomId和bom规格id
+        // 根据sku规格id获取bom规格
-        Map<Long, BomBo> bomBoMap = skuSpecService.getBomBySkuSpecIdList(
+        List<Long> bomSpecIdList = saveOrderSkuList.stream().map(OrderSku::getBomSpecId).collect(Collectors.toList());
-                saveOrderSkuList.stream().map(OrderSku::getSkuSpecId).collect(Collectors.toList()));
+        Map<Long, BomBo> bomBoMap = skuSpecService.getBomBoByIdList(bomSpecIdList);
 
         // 订单明细
         Map<Long, List<OrderSku>> orderSkuGroup = saveOrderSkuList.stream().collect(Collectors.groupingBy(OrderSku::getOrderId));
@@ -434,7 +434,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
      * 赋值单价
      */
     private void assignedUnitPrice(OrderSku orderSku, Map<Long, BomBo> bomBoMap) {
-        BomBo bomBo = bomBoMap.get(orderSku.getSkuSpecId());
+        BomBo bomBo = bomBoMap.get(orderSku.getBomSpecId());
         if (bomBo != null) {
             orderSku.setUnitPrice(ObjectUtil.defaultIfNull(bomBo.getInternalSellingPrice(), BigDecimal.ZERO));
         } else {
@@ -472,7 +472,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
         }
 
         // 没绑定bom规格，不赋值价格
-        BomBo bomBo = bomBoMap.get(orderSku.getSkuSpecId());
+        BomBo bomBo = bomBoMap.get(orderSku.getBomSpecId());
         if (bomBo == null) {
             return;
         }