From 275a1ddf3a3d516a5cd240167ed43ec8beeb5bb7 Mon Sep 17 00:00:00 2001
From: gaoqr <13665037151@163.com>
Date: Wed, 5 Mar 2025 18:03:10 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E5=8D=95xml=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D=EF=BC=9A=E5=B0=81?=
 =?UTF-8?q?=E8=BE=B9=E4=B8=B4=E6=97=B6=E8=A1=A8=E6=95=B0=E6=8D=AE=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../DefaultOrderImportXmlParserHandler.java   | 28 +++++++++++++++----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java
index 8d590627e..2f154d508 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java
@@ -140,7 +140,9 @@ public class DefaultOrderImportXmlParserHandler {
     private RoomXmlVO roomXmlVO;
     private BlockXmlVO blockXmlVO;
     private PointXmlVOS pointXmlVOS;
+    private PointXmlVOS groovePointXmlVOS;
     private OutlineXmlVO outlineXmlVO;
+    private OutlineXmlVO grooveOutlineXmlVO;
     private CuttingOutlineXmlVO cuttingOutlineXmlVO;
     private RawOutlineXmlVO rawOutlineXmlVO;
     private HoleXmlVOS holeXmlVOS;
@@ -997,7 +999,11 @@ public class DefaultOrderImportXmlParserHandler {
     private void analyzeOutline(Iterator<Attribute> attributes) throws Exception {
         // 设置全局参数
         inOutline = true;
-        outlineXmlVO = getJavaBeanFromXmlAttr(OutlineXmlVO.class, attributes);
+        if (inGroove) {
+            grooveOutlineXmlVO = getJavaBeanFromXmlAttr(OutlineXmlVO.class, attributes);
+        } else {
+            outlineXmlVO = getJavaBeanFromXmlAttr(OutlineXmlVO.class, attributes);
+        }
     }
 
     /**
@@ -1009,8 +1015,10 @@ public class DefaultOrderImportXmlParserHandler {
             if (CollUtil.isEmpty(points)) {
                 throw ServiceExceptionUtil.exception(ORDER_IMPORT_DETAIL_VALID_ERROR, "原始造型(外)轮廓点阵列表不能为空");
             }
+            grooveOutlineXmlVO.setPointXmlVOList(ListUtil.toList(points));
+        } else {
+            outlineXmlVO.setPointXmlVOList(ListUtil.toList(points));
         }
-        outlineXmlVO.setPointXmlVOList(ListUtil.toList(points));
         // 重置全局参数
         points.clear();
         inOutline = false;
@@ -1215,8 +1223,8 @@ public class DefaultOrderImportXmlParserHandler {
      * Groove标签结束
      */
     private void endGroove() {
-        grooveXmlVO.setOutlineXmlVO(outlineXmlVO);
-        grooveXmlVO.setPointXmlVOS(pointXmlVOS);
+        grooveXmlVO.setOutlineXmlVO(grooveOutlineXmlVO);
+        grooveXmlVO.setPointXmlVOS(groovePointXmlVOS);
         grooveXmlVOS.getGrooveXmlVOList().add(grooveXmlVO);
         // 重置全局参数
         inGroove = false;
@@ -1268,7 +1276,11 @@ public class DefaultOrderImportXmlParserHandler {
         // 设置全局参数
         inPoints = true;
         // 从标签属性生成points对象
-        pointXmlVOS = getJavaBeanFromXmlAttr(PointXmlVOS.class, attributes);
+        if(inGroove) {
+            groovePointXmlVOS = getJavaBeanFromXmlAttr(PointXmlVOS.class, attributes);
+        } else {
+            pointXmlVOS = getJavaBeanFromXmlAttr(PointXmlVOS.class, attributes);
+        }
     }
 
     /**
@@ -1279,7 +1291,11 @@ public class DefaultOrderImportXmlParserHandler {
         if (ObjectUtil.isNotNull(pointXmlVOS) && CollUtil.isEmpty(points)) {
             throw ServiceExceptionUtil.exception(ORDER_IMPORT_DETAIL_VALID_ERROR, inIslet ? "孤岛点阵列表不可为空" : "槽点坐标列表不可为空");
         }
-        pointXmlVOS.setPointXmlVOList(ListUtil.toList(points));
+        if(inGroove) {
+            groovePointXmlVOS.setPointXmlVOList(ListUtil.toList(points));
+        } else {
+            pointXmlVOS.setPointXmlVOList(ListUtil.toList(points));
+        }
         // 重置全局参数
         points.clear();
         inPoints = false;