diff --git a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
index e904ccd0b..e63e08988 100644
--- a/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
+++ b/cf-module-prod-plan/cf-module-prod-plan-biz/src/main/java/com/cf/imes/module/plan/service/orderImport/factory/WebCadOrderImportFactory.java
@@ -524,6 +524,9 @@ public class WebCadOrderImportFactory {
 
         WebCadDataBlockReqVO.InfoDTO blockInfo = block.getInfo();
 
+
+        String splitHeight = blockInfo.getSpliteHeight();
+        String spliteWidth = blockInfo.getSpliteWidth();
         // 创建order_plate
         PlateDO plateDO = PlateDO.builder()
                 .id(plateId)
@@ -535,9 +538,9 @@ public class WebCadOrderImportFactory {
                 .width(BigDecimal.valueOf(block.getWidth()))
                 .height(BigDecimal.valueOf(block.getHeight()))
                 .thickness(BigDecimal.valueOf(block.getThickness()))
-                .splitHeight(BigDecimal.valueOf(NumberUtil.parseDouble(blockInfo.getSpliteHeight())))
+                .splitHeight(BigDecimal.valueOf(NumberUtil.parseDouble(StringUtils.isNotEmpty(splitHeight) ? splitHeight : String.valueOf(block.getKaiLiaoHeight()))))
                 .splitThickness(BigDecimal.valueOf(NumberUtil.parseDouble(blockInfo.getSpliteThickness())))
-                .splitWidth(BigDecimal.valueOf(NumberUtil.parseDouble(blockInfo.getSpliteWidth())))
+                .splitWidth(BigDecimal.valueOf(NumberUtil.parseDouble(StringUtils.isNotEmpty(spliteWidth) ? spliteWidth : String.valueOf(block.getKaiLiaoWidth()))))
                 .area(BigDecimal.valueOf(block.getArea()))
                 .texture(block.getTexture())
                 .holeFace(block.getHoleFace())
@@ -890,6 +893,9 @@ public class WebCadOrderImportFactory {
      * @param blockObjectList
      */
     private void analyzeOrderParts(List<WebCadDataPartsReqVO.BlockObjectListDTO> blockObjectList) {
+        if (CollUtil.isEmpty(blockObjectList)) {
+            return;
+        }
         // 筛选出组件配件
         List<WebCadDataPartsReqVO.BlockObjectListDTO> moduleCollect = blockObjectList.stream().filter(p -> PART_CATEGORY_THREE.equals(p.getType())).collect(Collectors.toList());
         // 基于以下属性分组非组件的配件