From d8c3f185bcecc96c919e415a22869b31cef9f568 Mon Sep 17 00:00:00 2001
From: lym <1994302445@qq.com>
Date: Wed, 19 Jun 2024 18:00:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=A4=87=E6=B3=A8es2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../executor/service/order/OrderServiceImpl.java  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
index 2c68afde6..6bf2d33b4 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/order/OrderServiceImpl.java
@@ -349,16 +349,17 @@ public class OrderServiceImpl implements OrderService {
         List<PlateDO> plateDO = (List<PlateDO>) listMap.get("platesDO");
         List<PlateDetail> plateDetail = (List<PlateDetail>) listMap.get("plateDetail");
         List<OrderItemDO> itemDO = (List<OrderItemDO>) listMap.get("itemDO");
+        List<OrderPartsRemark> partsRemark = (List<OrderPartsRemark>) listMap.get("partsRemark");
 
         Map<String, List<?>> map = getPlateGoods(goodsDO);// 检验商品板材信息是否存在
         goodsDO = (List<GoodsDO>) map.get("goodsDO");
         List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists");
         validateCustomOrderNoExists(order.get(0).getCustomOrderNo());
 
-//        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS);
-//        List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
-//        orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId()));
-//        orderInputProcessor.batchSaveModel(orderModelDOs);
+        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, order.get(0), goodsDO, plateGoodDOS);
+        List<OrderModelDO> orderModelDOs = BeanUtils.toBean(plateDetail, OrderModelDO.class);
+        orderModelDOs.forEach(orderModelDO -> orderModelDO.setOrderId(order.get(0).getId()));
+        orderInputProcessor.batchSaveModel(orderModelDOs);
         return order.get(0).getId();
     }
 
@@ -528,9 +529,9 @@ public class OrderServiceImpl implements OrderService {
         goodsDO = (List<GoodsDO>) map.get("goodsDO");
         List<PlateGoodDO> plateGoodDOS = (List<PlateGoodDO>) map.get("plateGoodDOLists");
 
-//        validateCustomOrderNoExists(orderDO.getCustomOrderNo());
-//        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS);
-//        orderInputProcessor.batchSaveModel(orderModelDOS);
+        validateCustomOrderNoExists(orderDO.getCustomOrderNo());
+        orderInputProcessor.batchInsert(rawGoodsDO, bodyDO, groupDO, partsDO, plateDO, null, itemDO, orderDO, goodsDO, plateGoodDOS);
+        orderInputProcessor.batchSaveModel(orderModelDOS);
 
     }