From 0873a731961aeb26bc5d92fbc4000f86800b0f37 Mon Sep 17 00:00:00 2001 From: liuzhaotian Date: Wed, 22 May 2024 14:11:59 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E7=94=9F=E4=BA=A7=E5=8D=95?= =?UTF-8?q?=E6=BA=90=E6=95=B0=E6=8D=AE-=E4=BC=98=E5=8C=96=E6=97=B6?= =?UTF-8?q?=E7=9A=84=E6=95=B0=E6=8D=AE=E6=96=B0=E5=A2=9E=E9=9A=8F=E6=9C=BA?= =?UTF-8?q?ID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/plan/vo/OptimizePlateDetialRespVO.java | 3 +++ .../optimizeplan/OptimizePlanServiceImpl.java | 12 +++++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) 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);