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

1、OrderModelDO减少记录字段；2、组件业务数据拉取改动：反同步订单+板件/配件合为一个接口，暂时注释反同步板材（组件报错）；

Browse Source
This commit is contained in:
gaoqr
2026-08-03 17:05:15 +08:00
parent 3fdaecf86a
commit ffc22b23b3
19 changed files with 407 additions and 102 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/service/optimizeplan/OptimizePlanServiceImpl.java
+15 -9
View File
@@ -278,9 +278,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<OrderModelDO> models =
plateDOS.stream()
.map(PlateDetailDO::getModelData)
.filter(StringUtils::isNotBlank)
.map(json -> parseObject(json, OrderModelDO.class))
.filter(plate -> StringUtils.isNotBlank(plate.getModelData()))
.map(this::parseOrderModelWithPlateId)
.toList();
AssertUtils.notEmpty(models, ORDER_PLATE_MODEL_DATE_ERROR);
@@ -345,9 +344,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<OrderModelDO> models =
plateDetailRespVOS.stream()
.map(PlateDetailDO::getModelData)
.filter(StringUtils::isNotBlank)
.map(json -> parseObject(json, OrderModelDO.class))
.filter(plate -> StringUtils.isNotBlank(plate.getModelData()))
.map(this::parseOrderModelWithPlateId)
.toList();
AssertUtils.notEmpty(models, ORDER_PLAN_PLATE_MODEL_DATE_ERROR);
@@ -743,9 +741,8 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
List<OrderModelDO> models =
resultPlateList.stream()
.map(PlateDetailDO::getModelData)
.filter(StringUtils::isNotBlank)
.map(json -> parseObject(json, OrderModelDO.class))
.filter(plate -> StringUtils.isNotBlank(plate.getModelData()))
.map(this::parseOrderModelWithPlateId)
.toList();
AssertUtils.notEmpty(plateDetailRespVOS, ORDER_PLATE_MODEL_DATE_ERROR);
@@ -759,6 +756,15 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
}
/**
* 解析板件造型数据，并以板件表查询结果中的主键为准补充板件 ID。
*/
private OrderModelDO parseOrderModelWithPlateId(PlateDetailDO plate) {
OrderModelDO model = parseObject(plate.getModelData(), OrderModelDO.class);
model.setPlateId(plate.getPlateId());
return model;
}
/**
* 合并加工组、部件名称
*
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+7 -4
View File
@@ -390,9 +390,12 @@ public class PlateServiceImpl implements PlateService {
List<OrderModelDO> models =
resultPlateList.stream()
.map(PlateDetailDO::getModelData)
.filter(StringUtils::isNotBlank)
.map(json -> JsonUtils.parseObject(json, OrderModelDO.class))
.filter(plate -> StringUtils.isNotBlank(plate.getModelData()))
.map(plate -> {
OrderModelDO model = JsonUtils.parseObject(plate.getModelData(), OrderModelDO.class);
model.setPlateId(plate.getPlateId());
return model;
})
.toList();
return NoPlanPlateRespVO.builder()
@@ -1354,4 +1357,4 @@ public class PlateServiceImpl implements PlateService {
return orderComponentService.getOrderViewCadInfo(detailReqVO);
}
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/veneer/VeneerDecomposeServiceImpl.java
+6 -3
View File
@@ -179,9 +179,12 @@ public class VeneerDecomposeServiceImpl implements VeneerDecomposeService {
private VeneerDecomposePlateDataRespVO buildPlateData(List<VeneerDecomposePlateRespVO> rawPlates) {
List<VeneerDecomposePlateRespVO> plates = mergePlateDetails(rawPlates);
List<OrderModelDO> plateModels = plates.stream()
.map(VeneerDecomposePlateRespVO::getModelData)
.filter(StrUtil::isNotBlank)
.map(modelData -> JsonUtils.parseObject(modelData, OrderModelDO.class))
.filter(plate -> StrUtil.isNotBlank(plate.getModelData()))
.map(plate -> {
OrderModelDO model = JsonUtils.parseObject(plate.getModelData(), OrderModelDO.class);
model.setPlateId(plate.getPlateId());
return model;
})
.toList();
return VeneerDecomposePlateDataRespVO.builder()
.plateList(plates)
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/veneer/VeneerManageServiceImpl.java
+3 -2
View File
@@ -193,8 +193,9 @@ public class VeneerManageServiceImpl implements VeneerManageService {
for (UnplannedVeneerPlateRespVO plate : plates) {
if (plate.getPlateId() != null && StrUtil.isNotBlank(plate.getModelData())
&& !modelMap.containsKey(plate.getPlateId())) {
modelMap.put(plate.getPlateId(),
JsonUtils.parseObject(plate.getModelData(), OrderModelDO.class));
OrderModelDO model = JsonUtils.parseObject(plate.getModelData(), OrderModelDO.class);
model.setPlateId(plate.getPlateId());
modelMap.put(plate.getPlateId(), model);
}
}
List<OrderModelDO> plateModels = new ArrayList<>(modelMap.values());