From 8d5b33bbe417f6423da73b1c6729f4211d86061d Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 25 Jun 2025 15:53:57 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=94=A8=E6=9D=BF=E9=87=8F?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../optimizeplan/OptimizePlanServiceImpl.java |  3 +-
 .../resources/mapper/plate/PlateMapper.xml    | 38 ++++++++++++++++---
 2 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
index 21efed468..b88e20837 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
@@ -831,7 +831,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
                         ))
                         .source(s -> s
                                 .filter(f -> f
-                                        .includes("holeDetail", "sideHoleDetail", "contourDetail", "sideDetail", "id", "plateId")
+                                        .includes("holeDetail", "sideHoleDetail", "contourDetail", "sideDetail", "id", "plateId", "pointDetail",
+                                                "rawPointDetail", "splitLength", "splitWidth", "offsetX", "offsetY")
                                 )
                         )
                         .trackTotalHits(t -> t.enabled(false));
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
index 0a2a48761..e6a028a8c 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
@@ -377,10 +377,40 @@
 
     </select>
 
+    <resultMap id="OrderSourcePlateDetialMap" type="com.cf.imes.module.executor.controller.admin.plan.vo.PlateDetailRespVO">
+        <result property="goodsId" column="plateGoodsId"/>
+        <result property="goodsName" column="goodsName"/>
+        <result property="brand" column="brand"/>
+        <result property="color" column="color"/>
+        <result property="material" column="material"/>
+        <result property="plateId" column="plateId"/>
+        <result property="orderId" column="orderId"/>
+        <result property="name" column="name"/>
+        <result property="plateNo" column="plateNo"/>
+        <result property="customPlateNo" column="customPlateNo"/>
+        <result property="type" column="type"/>
+        <result property="id" column="goodsId"/>
+        <result property="width" column="width"/>
+        <result property="height" column="height"/>
+        <result property="thickness" column="thickness"/>
+        <result property="splitWidth" column="splitWidth"/>
+        <result property="splitHeight" column="splitHeight"/>
+        <result property="sealLeft" column="sealLeft"/>
+        <result property="sealRight" column="sealRight"/>
+        <result property="sealUp" column="sealUp"/>
+        <result property="sealDown" column="sealDown"/>
+        <result property="area" column="area"/>
+        <result property="texture" column="texture"/>
+        <result property="holeFace" column="holeFace"/>
+        <result property="openDoorType" column="openDoorType"/>
+        <result property="offsetX" column="offsetX"/>
+        <result property="offsetY" column="offsetY"/>
+        <result property="isSpecialShaped" column="isSpecialShaped"/>
+        <result property="remark" column="remark"/>
+    </resultMap>
 
     <select id="selectPlateListByGoodsIds"
-            resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateDetailRespVO">
-
+            resultMap="OrderSourcePlateDetialMap">
 
         select
         ogs.goods_id as plateGoodsId,
@@ -398,8 +428,6 @@
         op.width as width,
         op.height as height,
         op.thickness as thickness,
-        op.split_width as splitWidth,
-        op.split_height as splitHeight,
         op.seal_left as sealLeft,
         op.seal_right as sealRight,
         op.seal_up as sealUp,
@@ -408,8 +436,6 @@
         op.texture as texture,
         op.hole_face as holeFace,
         op.open_door_type as openDoorType,
-        op.offset_x as offsetX,
-        op.offset_y as offsetY,
         op.is_special_shaped as isSpecialShaped,
         op.remark as remark