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

未排单管理-创建排单列表查询优化

Browse Source
This commit is contained in:
gaoqr
2025-06-11 17:45:27 +08:00
parent 3ec3958a52
commit 4042a68be4
7 changed files with 14 additions and 23 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/controller/admin/plan/vo/PlateDetailRespVO.java
+2
View File
@@ -2,6 +2,7 @@ package com.cf.imes.module.executor.controller.admin.plan.vo;
import com.cf.imes.module.executor.controller.admin.plan.bo.ProcessGroupList;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.Data;
@@ -10,6 +11,7 @@ import java.util.List;
@Schema(description = "管理后台 - 生产单板件 Response VO")
@Data
@JsonInclude(JsonInclude.Include.NON_NULL)
public class PlateDetailRespVO {
@Schema(description = "板件ID", requiredMode = Schema.RequiredMode.REQUIRED)
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/HoleDetail.java
+2
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.executor.util.deviseData.structure;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -13,6 +14,7 @@ import lombok.NoArgsConstructor;
@Builder
@AllArgsConstructor
@NoArgsConstructor
@JsonInclude(JsonInclude.Include.NON_NULL)
public class HoleDetail {
@Schema(description = "孔ID")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/IOriginModelingData.java
+2
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.executor.util.deviseData.structure;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -17,6 +18,7 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问
@JsonInclude(JsonInclude.Include.NON_NULL)
public class IOriginModelingData {
@Schema(description = "刀半径")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/ModelDetail.java
+2
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.executor.util.deviseData.structure;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -16,6 +17,7 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@Schema(description = "管理后台 - 造型信息")
@JsonInclude(JsonInclude.Include.NON_NULL)
public class ModelDetail {
@Schema(description = "造型ID")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/OffSetList.java
+2
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.executor.util.deviseData.structure;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -17,6 +18,7 @@ import lombok.experimental.Accessors;
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问
@JsonInclude(JsonInclude.Include.NON_NULL)
public class OffSetList {
@Schema(description = "偏移刀路ID")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/util/deviseData/structure/PointList.java
+2
View File
@@ -1,5 +1,6 @@
package com.cf.imes.module.executor.util.deviseData.structure;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
@@ -15,6 +16,7 @@ import lombok.experimental.Accessors;
@AllArgsConstructor
@NoArgsConstructor
@Accessors(chain = false) // 设置 chain = false，避免生产单导入有问
@JsonInclude(JsonInclude.Include.NON_NULL)
public class PointList {
@Schema(description = "纹路Id")
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml
+2 -23
View File
@@ -460,12 +460,7 @@
select distinct
oi.body_id as bodyId,
oi.group_id as groupId,
oi.room_id as roomId,
og.name as groupName,
ob.name as bodyName,
ob.room_name as roomName,
ogs.goods_id as plateGoodsId,
ogs.goods_name as goodsName,
@@ -492,36 +487,20 @@
op.texture as texture,
op.hole_face as holeFace,
op.hole_arrange as holeArrange,
op.unregular_point_count as unregularPointCount,
op.front_hole_count as frontHoleCount,
op.back_hole_count as backHoleCount,
op.side_hole_count as sideHoleCount,
op.front_model_count as frontModelCount,
op.back_model_count as backModelCount,
op.is_door as isDoor,
op.open_door_type as openDoorType,
op.offset_x as offsetX,
op.offset_y as offsetY,
op.is_arc_across as isArcAcross,
op.module_type_id as moduleTypeId,
op.is_special_shaped as isSpecialShaped,
op.is_sculpt as isSculpt,
op.is_row_hole as hasHole,
op.remark as remark,
op.filter_type as filterType,
op.is_cancel as isCancel,
op.is_row_hole as hasHole,
op.is_side_sculpt as isSideSculpt,
op.is_2v as is2v,
op.is_side_2v as isSide2v
op.remark as remark
from order_plate op
left join order_goods ogs on op.organ_id = ogs.organ_id and op.order_id = ogs.order_id and op.goods_id = ogs.id
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_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_body ob on oi.organ_id = ob.organ_id and oi.order_id = ob.order_id and oi.body_id = ob.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}
and op.order_id in