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 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 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 plateDOS = plateMapper.selectList(new LambdaQueryWrapperX().in(PlateDO::getOrderId, orderIds)); List 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(); }