diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
index ca6666b1a..b63043da4 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/api/webcad/ApiTypeRealize.java
@@ -829,6 +829,8 @@ public class ApiTypeRealize {
                             .setRemarkJsonDei(remarkJson);
 
                     plateInfo.setHoleFace(plateDetailInfo.getTypographicFace())
+                            .setWidth(BigDecimal.valueOf(plateDetailInfo.getWidth()))
+                            .setHeight(BigDecimal.valueOf(plateDetailInfo.getHeight()))
                             .setOffsetX(plateDetailInfo.getOffsetX())
                             .setOffsetY(plateDetailInfo.getOffsetY());
 
@@ -860,15 +862,22 @@ public class ApiTypeRealize {
                 Long blockNo = plate.getLong(ProduceApiConstants.BD_BLOCK_NO);
                 if (plateMap.get(blockNo) != null) {
                     JSONObject jsonObject = plateMap.get(blockNo);
-                    plateInfo.setHeight(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_HEIGHT)))
-                            .setWidth(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_WIDTH)))
-                            .setThickness(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_THICKNESS)))
+                    plateInfo.setThickness(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_THICKNESS)))
                             .setArea(BigDecimal.valueOf(jsonObject.getDouble(ProduceApiConstants.BG_AREA)))
                             .setTexture(jsonObject.getInteger(ProduceApiConstants.BG_WAVE))
                             .setIsRowHole(jsonObject.getBoolean(ProduceApiConstants.BG_IS_HOLE));
                 }
             }
 
+            BigDecimal splitHeight = plateInfo.getSplitHeight();
+            BigDecimal splitWidth = plateInfo.getSplitWidth();
+            BigDecimal splitThickness = plateInfo.getSplitThickness();
+
+            if (BigDecimal.ZERO.compareTo(splitHeight) == 0 || BigDecimal.ZERO.compareTo(splitWidth) == 0 || BigDecimal.ZERO.compareTo(splitThickness) == 0) {
+                plateInfo.setSplitHeight(plateInfo.getHeight())
+                        .setSplitWidth(plateInfo.getWidth())
+                        .setSplitThickness(plateInfo.getThickness());
+            }
 
             platesInfos.put(plate.getLong(ProduceApiConstants.BD_ITEM_ID), plateInfo);
             platesItem.put(plate.getLong(ProduceApiConstants.BD_ITEM_ID), itemPlate);
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
index 7a4f6fe90..453f18fc9 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/orderItem/OrderItemMapper.xml
@@ -235,7 +235,7 @@
         WHERE
             i.order_id = #{orderId} AND i.organ_id = #{organId}  AND p.deleted = #{deleted}
         GROUP BY
-            i.room_id, i.body_id, p.goods_id, g.goods_name
+            i.order_id, i.room_id, i.body_id, p.goods_id, g.goods_name
     </select>