From f9df266baef17c40ebce41225f5facf5080650d0 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Tue, 30 Apr 2024 15:16:20 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E7=BC=96=E8=AF=91=E5=A4=B1?=
 =?UTF-8?q?=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/plan/bo/OrderSource.java      |  2 +-
 .../optimizeplan/OptimizePlanServiceImpl.java      | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java
index b51ac4e32..34ab6983c 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/bo/OrderSource.java
@@ -29,7 +29,7 @@ public class OrderSource {
     private MachineDTO machineDTO;
 
     @Schema(description = "排单数据")
-    private PlanDO planDO;
+    private PlanDO plan;
 
     @Schema(description = "生产单列表")
     private List<OrderDO> orderList;
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 bf5c10ed4..06b0959e4 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
@@ -308,9 +308,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
                 .eq(PlateDO::getOrderId, orderId)
         );
         List<OrderModelDO> orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL);
-        orderSource.setOrders(Collections.singletonList(orderDO));
-        orderSource.setPlates(plateDOS);
-        orderSource.setGoods(goodsDOS);
+        orderSource.setOrderList(Collections.singletonList(orderDO));
+        orderSource.setPlateList(plateDOS);
+        orderSource.setGoodsList(goodsDOS);
         orderSource.setPlateModels(orderModelDOS);
         return orderSource;
     }
@@ -336,10 +336,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
         List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>().in(PlateDO::getOrderId, orderIds));
         List<OrderModelDO> orderModelDOS = buildRespByOrderIds(orderIds, ORDER_PLATE_MODEL);
         return OrderSource.builder()
-                .orders(orderDOS)
-                .planDO(planDO)
-                .goods(goodsDOS)
-                .plates(plateDOS)
+                .orderList(orderDOS)
+                .plan(planDO)
+                .goodsList(goodsDOS)
+                .plateList(plateDOS)
                 .plateModels(orderModelDOS)
                 .build();
     }