删除多余字段、 sku关联主材bom与打印纸bom

sd-business/src/main/java/com/sd/business/entity/order/enums/OrderExceptionTypeEnum.java

@@ -21,9 +21,11 @@ public enum OrderExceptionTypeEnum {
     ORDER_EXCEPTION_HANDLING(3, "万里牛状态异常：订单异常处理"),
     UNKNOWN_WAREHOUSE(4, "无法通过仓库编码找到事业部"),
     UNKNOWN_SKU_SPEC(5, "订单存在未知sku规格"),
-    UNKNOWN_BOM_SPEC(6, "订单sku规格未绑定bom规格"),
-    SKU_UPDATE(7, "订单商品被更改"),
-    NO_DESIGN_DOCUMENT(8, "未绑定图稿"),
+    UNKNOWN_BOM_SPEC(6, "订单sku规格未绑定主材"),
+    UNKNOWN_PRINTING_PAPER_BOM_SPEC(7, "订单sku规格未绑定打印纸"),
+    SKU_UPDATE(8, "订单商品被更改"),
+    NO_DESIGN_DOCUMENT(9, "未绑定图稿"),
+
     ;
 
     private static final Map<Integer, OrderExceptionTypeEnum> map = new HashMap<>();

sd-business/src/main/java/com/sd/business/entity/order/po/OrderSku.java

@@ -41,6 +41,11 @@ public class OrderSku extends BasePo {
     private Long bomSpecId;
 
     /**
+     * 打印纸bom id
+     */
+    private Long printingPaperBomSpecId;
+
+    /**
      * 图稿id
      */
     private Long artworkLibraryId;

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

@@ -459,10 +459,16 @@ public class WlnOrderServiceImpl implements WlnOrderService {
 
             // 通过万里牛sku规格uid找到sku规格
             SkuSpec skuSpec = skuSpecMap.get(wlnOrderSku.getString("sys_spec_uid"));
+
             if (skuSpec == null) {
                 addExceptionType(orderInfo, OrderExceptionTypeEnum.UNKNOWN_SKU_SPEC);
-            } else if (skuSpec.getBomSpecId() == null) {
-                addExceptionType(orderInfo, OrderExceptionTypeEnum.UNKNOWN_BOM_SPEC);
+            } else {
+                if (skuSpec.getBomSpecId() == null) {
+                    addExceptionType(orderInfo, OrderExceptionTypeEnum.UNKNOWN_BOM_SPEC);
+                }
+                if (skuSpec.getPrintingPaperBomSpecId() == null) {
+                    addExceptionType(orderInfo, OrderExceptionTypeEnum.UNKNOWN_PRINTING_PAPER_BOM_SPEC);
+                }
             }
 
             // 创建订单sku
@@ -527,6 +533,7 @@ public class WlnOrderServiceImpl implements WlnOrderService {
             orderSku.setSkuId(skuSpec.getSkuId());
             orderSku.setSkuSpecId(skuSpec.getId());
             orderSku.setBomSpecId(skuSpec.getBomSpecId());
+            orderSku.setPrintingPaperBomSpecId(skuSpec.getPrintingPaperBomSpecId());
 
             Long artworkLibraryId = skuSpec.getArtworkLibraryId();