未排单管理-创建排单列表查询优化:1、减少前端无用加工组字段;2、恢复sql结果集中的groupId;3、cad拆单order_item支持group_id为空;

This commit is contained in:
gaoqr
2025-06-12 17:51:05 +08:00
parent 4042a68be4
commit 81aa5fe1fb
4 changed files with 15 additions and 26 deletions
@@ -788,21 +788,6 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
AssertUtils.notEmpty(plateDetailRespVOS,ORDER_PLATE_ERROR);
for (PlateDetailRespVO plateDetailsRespVO : plateDetailRespVOS) {
StringBuilder name = new StringBuilder();
if (CollUtil.isNotEmpty(plateDetailsRespVO.getProcessGroupLists())) {
for (ProcessGroupList groupNameList : plateDetailsRespVO.getProcessGroupLists()) {
// 去除最后的逗号
name.append(groupNameList.getGroupName()).append(",");
}
name = new StringBuilder(name.substring(0, name.length() - 1));
}
plateDetailsRespVO.setProcessGroupName(name.toString());
}
// todo 数据结构改后,可以增加排单ID作为筛选,只查为 0 的
List<OrderModelDO> orderModelDOS = getOrderModels(orderIds);
@@ -853,7 +838,7 @@ public class OptimizePlanServiceImpl implements OptimizePlanService {
))
.source(s -> s
.filter(f -> f
.includes("holeDetail", "sideHoleDetail", "contourDetail", "sideDetail", "id")
.includes("holeDetail", "sideHoleDetail", "contourDetail", "sideDetail", "id", "plateId")
)
)
.trackTotalHits(t -> t.enabled(false));
@@ -459,7 +459,7 @@
select distinct
oi.group_id as groupId,
og.name as groupName,
ogs.goods_id as plateGoodsId,
ogs.goods_name as goodsName,
@@ -498,7 +498,7 @@
from order_plate op
join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
left join order_item oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id and oi.plate_id != 0
left join order_group og on oi.organ_id = og.organ_id and oi.order_id = og.order_id and oi.group_id = og.id
left join order_plan_item opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id
where op.organ_id = #{organId}