diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java index ed858d3ae..fbd62a53d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderCadViewPlatePageReqVO.java @@ -1,10 +1,7 @@ package com.cf.imes.module.executor.controller.admin.order.vo.order; import com.cf.imes.framework.common.pojo.PageParam; -import com.cf.imes.framework.common.validation.InEnum; -import com.cf.imes.module.executor.controller.admin.plate.vo.OrderCadViewInfoGroup; import com.cf.imes.module.executor.controller.admin.plate.vo.OrderCadViewPageGroup; -import com.cf.imes.module.executor.enums.OrderCadViewPlateRangeEnum; import io.swagger.v3.oas.annotations.media.Schema; import jakarta.validation.constraints.NotNull; import lombok.AllArgsConstructor; @@ -35,9 +32,4 @@ public class OrderCadViewPlatePageReqVO extends PageParam { @Schema(description = "部件编号", example = "1024") private Long componentId; - - @Schema(description = "板件查询范围", example = "1") - @NotNull(message = "{order.cadview.plate.cadinfo.range.not.null}", groups = OrderCadViewInfoGroup.class) - @InEnum(OrderCadViewPlateRangeEnum.class) - private Integer range; } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java index ec68d20df..8171a4bd4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java @@ -144,7 +144,7 @@ public class PlateController { @PostMapping("/body/view/cadinfo") @Operation(summary = "获取板件对应柜体下的所有板件视图列表数据") - public CommonResult> getBodyViewPlatesCadInfo(@Validated(OrderCadViewInfoGroup.class) @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { + public CommonResult> getBodyViewPlatesCadInfo(@Validated @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) { return success(plateService.getBodyViewPlatesCadInfo(orderCadViewPlatePageReqVO)); } } \ No newline at end of file diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java deleted file mode 100644 index 7b440bcce..000000000 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.cf.imes.module.executor.controller.admin.plate.vo; - -/** - * cad视图信息请求校验组 - * - * @author Gqr - * @since 2025/12/30 9:58 - */ -public interface OrderCadViewInfoGroup { -} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java index be8080c4d..cd7842987 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java @@ -44,7 +44,6 @@ import com.cf.imes.module.executor.dal.mysql.orderItem.OrderItemMapper; import com.cf.imes.module.executor.dal.mysql.plan.PlanMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateGoodMapper; import com.cf.imes.module.executor.dal.mysql.plate.PlateMapper; -import com.cf.imes.module.executor.enums.OrderCadViewPlateRangeEnum; import com.cf.imes.module.executor.enums.OrderItemType; import com.cf.imes.module.executor.enums.OrderStatusEnum; import com.cf.imes.module.executor.service.order.OrderInputProcessor; @@ -859,14 +858,8 @@ public class PlateServiceImpl implements PlateService { // 查询所有板件的视图所需信息 PageDTO page = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE); - IPage viewPlatesPage; + IPage viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderId, bodyIds, null, null, true); - Integer range = reqVO.getRange(); - if (OrderCadViewPlateRangeEnum.BODY.getRange().equals(range)) { - viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderId, bodyIds, null, null, true); - } else { - viewPlatesPage = orderItemMapper.selectBodyViewPlatesPage(page, orderId, bodyIds, reqVO.getGroupId(), null, true); - } List records = viewPlatesPage.getRecords(); // cad图纸id赋到每块板上 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message.properties index 687f9a72c..b336dfc39 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message.properties @@ -25,7 +25,6 @@ order.detail.component.list.query.bodyIds.max=柜体查询范围不能超过200 order.detail.component.list.query.componentIds.max=部件查询范围不能超过200个 order.detail.component.plate.page.query.componentId.not.null=部件编号不能为空 -order.cadview.plate.cadinfo.range.not.null=板件查询范围不能为空 order.cadview.plate.cadinfo.plateno.not.null=板件编号不能为空 order.cadview.plate.page.orderid.not.null=订单编号不能为空 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_cht.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_cht.properties index 934f73cf1..ff87c0c93 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_cht.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_cht.properties @@ -25,7 +25,6 @@ order.detail.component.list.query.bodyIds.max=櫃體查詢範圍不能超過200 order.detail.component.list.query.componentIds.max=部件查詢範圍不能超過200個 order.detail.component.plate.page.query.componentId.not.null=部件編號不能為空 -order.cadview.plate.cadinfo.range.invalid=板件查詢範圍不能為空 order.cadview.plate.cadinfo.plateno.not.null=板件編號不能為空 order.cadview.plate.page.orderid.not.null=訂單編號不能為空 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_en.properties b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_en.properties index 8f351689d..b38e1360d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_en.properties +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_en.properties @@ -25,7 +25,6 @@ order.detail.component.list.query.bodyIds.max=The cabinet query range cannot exc order.detail.component.list.query.componentIds.max=The range of component queries cannot exceed 200 order.detail.component.plate.page.query.componentId.not.null=The component id cannot be empty -order.cadview.plate.cadinfo.range.invalid=range cannot be empty order.cadview.plate.cadinfo.plateno.not.null=plate no cannot be empty order.cadview.plate.page.orderid.not.null=order id cannot be empty