diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java index 06f5036e3..814454eb6 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OptimizePlateDetialRespVO.java @@ -8,6 +8,9 @@ import lombok.Data; @Data public class OptimizePlateDetialRespVO { + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED) + private Long id; + @Schema(description = "大板名称", requiredMode = Schema.RequiredMode.REQUIRED) private String plateName; 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 92b1d46d5..41bcccc4e 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 @@ -1,6 +1,8 @@ package com.cf.imes.module.executor.service.optimizeplan; import cn.hutool.core.collection.CollectionUtil; +import cn.hutool.core.lang.Snowflake; +import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import co.elastic.clients.elasticsearch.ElasticsearchClient; import co.elastic.clients.elasticsearch._types.FieldValue; @@ -90,7 +92,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { @Resource private ElasticsearchClient elasticsearchClient; - //public static final String ORDER_PLATE_MODEL = "imes_order_plate_model"; + private Snowflake snowflake = IdUtil.getSnowflake(); @Resource private MachineApi machineApi; @@ -302,6 +304,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { OrderSource orderSource = new OrderSource(); List optimizePlateDetialRespVO = plateMapper.selectPlate(orderId); + // 赋值随机ID + for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVO) { + plateDetialRespVO.setId(snowflake.nextId()); + } List goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX() .eq(GoodsDO::getOrderId, orderId) @@ -340,6 +346,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService { List orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList()); List optimizePlateDetialRespVOS = plateMapper.selectPlateListByOrderIds(orderIds); + // 赋值随机ID + for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVOS) { + plateDetialRespVO.setId(snowflake.nextId()); + } List orderDOS = orderMapper.selectBatchIds(orderIds);