mirror of
http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git
synced 2026-08-14 13:42:07 +08:00
获取生产单源数据-优化时的数据新增随机ID
This commit is contained in:
+3
@@ -8,6 +8,9 @@ import lombok.Data;
|
|||||||
@Data
|
@Data
|
||||||
public class OptimizePlateDetialRespVO {
|
public class OptimizePlateDetialRespVO {
|
||||||
|
|
||||||
|
@Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
|
private Long id;
|
||||||
|
|
||||||
@Schema(description = "大板名称", requiredMode = Schema.RequiredMode.REQUIRED)
|
@Schema(description = "大板名称", requiredMode = Schema.RequiredMode.REQUIRED)
|
||||||
private String plateName;
|
private String plateName;
|
||||||
|
|
||||||
|
|||||||
+11
-1
@@ -1,6 +1,8 @@
|
|||||||
package com.cf.imes.module.executor.service.optimizeplan;
|
package com.cf.imes.module.executor.service.optimizeplan;
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
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 cn.hutool.core.util.StrUtil;
|
||||||
import co.elastic.clients.elasticsearch.ElasticsearchClient;
|
import co.elastic.clients.elasticsearch.ElasticsearchClient;
|
||||||
import co.elastic.clients.elasticsearch._types.FieldValue;
|
import co.elastic.clients.elasticsearch._types.FieldValue;
|
||||||
@@ -90,7 +92,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
|
|||||||
@Resource
|
@Resource
|
||||||
private ElasticsearchClient elasticsearchClient;
|
private ElasticsearchClient elasticsearchClient;
|
||||||
|
|
||||||
//public static final String ORDER_PLATE_MODEL = "imes_order_plate_model";
|
private Snowflake snowflake = IdUtil.getSnowflake();
|
||||||
|
|
||||||
@Resource
|
@Resource
|
||||||
private MachineApi machineApi;
|
private MachineApi machineApi;
|
||||||
@@ -302,6 +304,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
|
|||||||
OrderSource orderSource = new OrderSource();
|
OrderSource orderSource = new OrderSource();
|
||||||
|
|
||||||
List<OptimizePlateDetialRespVO> optimizePlateDetialRespVO = plateMapper.selectPlate(orderId);
|
List<OptimizePlateDetialRespVO> optimizePlateDetialRespVO = plateMapper.selectPlate(orderId);
|
||||||
|
// 赋值随机ID
|
||||||
|
for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVO) {
|
||||||
|
plateDetialRespVO.setId(snowflake.nextId());
|
||||||
|
}
|
||||||
|
|
||||||
List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>()
|
List<GoodsDO> goodsDOS = goodsMapper.selectList(new LambdaQueryWrapperX<GoodsDO>()
|
||||||
.eq(GoodsDO::getOrderId, orderId)
|
.eq(GoodsDO::getOrderId, orderId)
|
||||||
@@ -340,6 +346,10 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
|
|||||||
List<Long> orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList());
|
List<Long> orderIds = orderItemDOS.stream().map(OrderItemDO::getOrderId).collect(Collectors.toList());
|
||||||
|
|
||||||
List<OptimizePlateDetialRespVO> optimizePlateDetialRespVOS = plateMapper.selectPlateListByOrderIds(orderIds);
|
List<OptimizePlateDetialRespVO> optimizePlateDetialRespVOS = plateMapper.selectPlateListByOrderIds(orderIds);
|
||||||
|
// 赋值随机ID
|
||||||
|
for (OptimizePlateDetialRespVO plateDetialRespVO : optimizePlateDetialRespVOS) {
|
||||||
|
plateDetialRespVO.setId(snowflake.nextId());
|
||||||
|
}
|
||||||
|
|
||||||
List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds);
|
List<OrderDO> orderDOS = orderMapper.selectBatchIds(orderIds);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user