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

处理编译失败

Browse Source
This commit is contained in:
yangsb
2024-04-30 15:16:20 +08:00
parent fa4ea458b0
commit f9df266bae
2 changed files with 8 additions and 8 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/controller/admin/plan/bo/OrderSource.java
+1 -1
View File
@@ -29,7 +29,7 @@ public class OrderSource {
private MachineDTO machineDTO; private MachineDTO machineDTO;
@Schema(description = "排单数据") @Schema(description = "排单数据")
private PlanDO planDO; private PlanDO plan;
@Schema(description = "生产单列表") @Schema(description = "生产单列表")
private List<OrderDO> orderList; private List<OrderDO> orderList;
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+7 -7
View File
@@ -308,9 +308,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
.eq(PlateDO::getOrderId, orderId) .eq(PlateDO::getOrderId, orderId)
); );
List<OrderModelDO> orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL); List<OrderModelDO> orderModelDOS = buildRespByOrderId(orderId, ORDER_PLATE_MODEL);
orderSource.setOrders(Collections.singletonList(orderDO)); orderSource.setOrderList(Collections.singletonList(orderDO));
orderSource.setPlates(plateDOS); orderSource.setPlateList(plateDOS);
orderSource.setGoods(goodsDOS); orderSource.setGoodsList(goodsDOS);
orderSource.setPlateModels(orderModelDOS); orderSource.setPlateModels(orderModelDOS);
return orderSource; return orderSource;
} }
@@ -336,10 +336,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>().in(PlateDO::getOrderId, orderIds)); List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>().in(PlateDO::getOrderId, orderIds));
List<OrderModelDO> orderModelDOS = buildRespByOrderIds(orderIds, ORDER_PLATE_MODEL); List<OrderModelDO> orderModelDOS = buildRespByOrderIds(orderIds, ORDER_PLATE_MODEL);
return OrderSource.builder() return OrderSource.builder()
.orders(orderDOS) .orderList(orderDOS)
.planDO(planDO) .plan(planDO)
.goods(goodsDOS) .goodsList(goodsDOS)
.plates(plateDOS) .plateList(plateDOS)
.plateModels(orderModelDOS) .plateModels(orderModelDOS)
.build(); .build();
} }