Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-14 05:42:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

生产单xml导入问题修复：封边临时表数据错误修复

Browse Source
This commit is contained in:
gaoqr
2025-03-05 18:03:10 +08:00
parent 8374365163
commit 275a1ddf3a
1 changed files with 22 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/DefaultOrderImportXmlParserHandler.java
+22 -6
View File
@@ -140,7 +140,9 @@ public class DefaultOrderImportXmlParserHandler {
private RoomXmlVO roomXmlVO; private RoomXmlVO roomXmlVO;
private BlockXmlVO blockXmlVO; private BlockXmlVO blockXmlVO;
private PointXmlVOS pointXmlVOS; private PointXmlVOS pointXmlVOS;
private PointXmlVOS groovePointXmlVOS;
private OutlineXmlVO outlineXmlVO; private OutlineXmlVO outlineXmlVO;
private OutlineXmlVO grooveOutlineXmlVO;
private CuttingOutlineXmlVO cuttingOutlineXmlVO; private CuttingOutlineXmlVO cuttingOutlineXmlVO;
private RawOutlineXmlVO rawOutlineXmlVO; private RawOutlineXmlVO rawOutlineXmlVO;
private HoleXmlVOS holeXmlVOS; private HoleXmlVOS holeXmlVOS;
@@ -997,7 +999,11 @@ public class DefaultOrderImportXmlParserHandler {
private void analyzeOutline(Iterator<Attribute> attributes) throws Exception { private void analyzeOutline(Iterator<Attribute> attributes) throws Exception {
// 设置全局参数 // 设置全局参数
inOutline = true; 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)) { if (CollUtil.isEmpty(points)) {
throw ServiceExceptionUtil.exception(ORDER_IMPORT_DETAIL_VALID_ERROR, "原始造型(外)轮廓点阵列表不能为空"); 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(); points.clear();
inOutline = false; inOutline = false;
@@ -1215,8 +1223,8 @@ public class DefaultOrderImportXmlParserHandler {
* Groove标签结束 * Groove标签结束
*/ */
private void endGroove() { private void endGroove() {
grooveXmlVO.setOutlineXmlVO(outlineXmlVO); grooveXmlVO.setOutlineXmlVO(grooveOutlineXmlVO);
grooveXmlVO.setPointXmlVOS(pointXmlVOS); grooveXmlVO.setPointXmlVOS(groovePointXmlVOS);
grooveXmlVOS.getGrooveXmlVOList().add(grooveXmlVO); grooveXmlVOS.getGrooveXmlVOList().add(grooveXmlVO);
// 重置全局参数 // 重置全局参数
inGroove = false; inGroove = false;
@@ -1268,7 +1276,11 @@ public class DefaultOrderImportXmlParserHandler {
// 设置全局参数 // 设置全局参数
inPoints = true; inPoints = true;
// 从标签属性生成points对象 // 从标签属性生成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)) { if (ObjectUtil.isNotNull(pointXmlVOS) && CollUtil.isEmpty(points)) {
throw ServiceExceptionUtil.exception(ORDER_IMPORT_DETAIL_VALID_ERROR, inIslet ? "孤岛点阵列表不可为空" : "槽点坐标列表不可为空"); 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(); points.clear();
inPoints = false; inPoints = false;