From c3a471276ad5f972b7c6059c43344ef12401e074 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Tue, 10 Sep 2024 17:53:13 +0800
Subject: [PATCH] =?UTF-8?q?xml=E5=AF=BC=E5=85=A5-=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/controller/admin/order/OrderController.java      | 4 ++--
 .../util/fileConversion/admin/files/xml/XmlBuilder.java       | 4 +---
 .../util/fileConversion/admin/files/xml/XmlTypeRealize.java   | 4 ++--
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
index c5f1cda5f..9a115c258 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/OrderController.java
@@ -311,6 +311,7 @@ public class OrderController {
                 } else {
                     list = (List<?>) map.get("plate");
                     mapOrder = (Map<String, Object>) map.get("order");
+                    orderDO = (OrderDO) mapOrder.get("order");
                     if (list.size() == 0) {
                         orderDO.setStatus(OrderStatusEnum.EMPTY.getStatus());
                     } else {
@@ -327,6 +328,7 @@ public class OrderController {
 //                }
                 assert orderXmlVO != null;
                 mapOrder = xmlTypeRealize.changeOrder(orderXmlVO, getUserOrganId());
+                orderDO = (OrderDO) mapOrder.get("order");
                 if (orderXmlVO.getMaterialXmlVO().getPlateXmlVOS().getPlateXmlVOList().size() == 0) {
                     orderDO.setStatus(OrderStatusEnum.EMPTY.getStatus());
                 } else {
@@ -335,8 +337,6 @@ public class OrderController {
             }
 
             if (index == null || index == 0) { // 整单导入
-                assert mapOrder != null;
-                orderDO = (OrderDO) mapOrder.get("order");
                 err = ((String) mapOrder.get("error"));
                 orderDO.setOrderType(OrderTypeEnum.MAIN_ORDER.getStatus());
                 if (!orderService.customOrderNoIsExists(orderDO.getCustomOrderNo())) {
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/XmlBuilder.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlBuilder.java
index fe2fa57d5..f1793cba4 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlBuilder.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlBuilder.java
@@ -8,9 +8,7 @@ import javax.xml.bind.JAXBContext;
 import javax.xml.bind.Unmarshaller;
 
 /**
- * @projectName: cf_imes_server
- * @author: 晨丰科技
- * @date: 2024/8/21 17:58
+ * xml 转换工具
  */
 public class XmlBuilder {
 
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/XmlTypeRealize.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
index 78f57af1f..b1ac1cb6b 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/fileConversion/admin/files/xml/XmlTypeRealize.java
@@ -582,9 +582,9 @@ public class XmlTypeRealize {
                 long plateNo = idWorker.nextId();
                 long obtainingTime = idWorker.obtainingTime();
                 Long plateId = (Long) identifierGenerator.nextId(null);
-                BigDecimal area = BigDecimal.valueOf((Double.parseDouble(blockXmlVO.getWidth())  / 1000) * (Double.parseDouble(blockXmlVO.getLength())) );
+                BigDecimal area = BigDecimal.valueOf((Double.parseDouble(blockXmlVO.getWidth()) / 1000) * (Double.parseDouble(blockXmlVO.getLength()) / 1000) );
                 // 开料面积
-                BigDecimal sealAcreage = BigDecimal.valueOf( (Double.parseDouble(blockXmlVO.getCuttingWidth())  / 1000)  * ( Double.parseDouble(blockXmlVO.getCuttingLength())   / 1000));
+                BigDecimal sealAcreage = BigDecimal.valueOf( (Double.parseDouble(blockXmlVO.getCuttingWidth())  / 1000)  * ( Double.parseDouble(blockXmlVO.getCuttingLength())  / 1000));
                 // 开门类型获取
                 Integer doorType = Integer.valueOf(dictDataApi.parseDictData(DictTypeConstants.DOOR_OPENING_DIRECTIONS, blockXmlVO.getOpenDirection()).getData().getValue());