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-13 05:12:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2024-08-07 18:35:34 +08:00
parent 2a7f19d69f a939049345
commit a261b91fec
8 changed files with 51 additions and 40 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/dal/dataobject/plan/PlanDO.java
+3 -16
View File
@@ -33,10 +33,7 @@ public class PlanDO extends BaseDO {
// 组织 ID
@TableField(fill = FieldFill.INSERT_UPDATE)
private Long organId;
// /**
// * 排单号
// */
// private String planNo;
/**
* 排序优先级
*/
@@ -49,10 +46,7 @@ public class PlanDO extends BaseDO {
* 排单状态：0 新单，1 板材已申请，2 开料中，3 已开料
*/
private Integer status;
// /**
// * 是否支付：0 否，1 是
// */
// private Boolean isPay;
/**
* 机台 ID
*/
@@ -65,14 +59,7 @@ public class PlanDO extends BaseDO {
* 生产单号
*/
private String orderNos;
// /**
// * 排单优化文件地址
// */
// private String placeDateFileUrl;
// /**
// * 排单优化文件地址
// */
// private String placeOrderFileUrl;
/**
* 备注
*/
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/optimizeplan/OptimizePlanServiceImpl.java
+19 -2
View File
@@ -514,9 +514,9 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
// 大板数据的尺寸长度
Integer boardSize = goodsDOS.stream().map(m -> m.getId()).collect(Collectors.toList()).size();
Integer boardSize = goodsDOS.stream().map(GoodsReqVO::getId).toList().size();
List<OptimizeBoardModelDO> optimizeBoardModelDOS = buildBoardByOrderIds(orderIds, ORDER_REMAIN_PLATE_MODEL, boardSize);
List<OptimizeBoardModelDO> optimizeBoardModelDOS = buildBoardByPlanId(planId, ORDER_REMAIN_PLATE_MODEL, boardSize);
List<RemainPlateDO> remainPlateDOS = remainPlateMapper.selectByPlanId(planId,getUserOrganId());
@@ -764,6 +764,23 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
}
private List<OptimizeBoardModelDO> buildBoardByPlanId(Long planId, String index,Integer size) {
SearchRequest.Builder builder = new SearchRequest.Builder();
builder.index(index);
builder.size(size);
builder.query(q -> q.term(b -> b.field("planId").value(planId)));
try {
SearchResponse<OptimizeBoardModelDO> search = elasticsearchClient.search(builder.build(), OptimizeBoardModelDO.class);
List<Hit<OptimizeBoardModelDO>> hits = search.hits().hits();
if (CollectionUtil.isNotEmpty(hits)) {
return hits.stream().map(Hit::source).collect(Collectors.toList());
}
return new ArrayList<>();
} catch (IOException e) {
log.error(e.getMessage());
throw new ServiceException(INTERNAL_SERVER_ERROR);
}
}
private List<OptimizeBoardModelDO> buildBoardByOrderIds(Collection<Long> orderIds, String index, Integer size) {
List<FieldValue> fieldValues = orderIds.stream().map(FieldValue::of).toList();
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/dataTwo/PointList.java
+1 -1
View File
@@ -22,7 +22,7 @@ public class PointList {
@Schema(description = "点Id")
private Integer pointId;
//
@Schema(description = "点的位置信息")
private Double pointX;
private Double pointY;