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

/body/view/cadinfo接口移除range参数查询

Browse Source
This commit is contained in:
gaoqr
2026-02-28 17:52:10 +08:00
parent d461e4a6e6
commit 7d43620a94
7 changed files with 2 additions and 30 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/order/vo/order/OrderCadViewPlatePageReqVO.java
-8
View File
@@ -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;
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/PlateController.java
+1 -1
View File
@@ -144,7 +144,7 @@ public class PlateController {
@PostMapping("/body/view/cadinfo")
@Operation(summary = "获取板件对应柜体下的所有板件视图列表数据")
public CommonResult<List<OrderViewPlatePageRespVO>> getBodyViewPlatesCadInfo(@Validated(OrderCadViewInfoGroup.class) @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
public CommonResult<List<OrderViewPlatePageRespVO>> getBodyViewPlatesCadInfo(@Validated @RequestBody OrderCadViewPlatePageReqVO orderCadViewPlatePageReqVO) {
return success(plateService.getBodyViewPlatesCadInfo(orderCadViewPlatePageReqVO));
}
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plate/vo/OrderCadViewInfoGroup.java
-10
View File
@@ -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 {
}
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plate/PlateServiceImpl.java
+1 -8
View File
@@ -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<OrderBodyViewPlatesPageDO> page = new PageDTO<>(1, PageParam.PAGE_SIZE_NONE);
IPage<OrderBodyViewPlatesPageDO> viewPlatesPage;
IPage<OrderBodyViewPlatesPageDO> 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<OrderBodyViewPlatesPageDO> records = viewPlatesPage.getRecords();
// cad图纸id赋到每块板上
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message.properties
-1
View File
@@ -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=订单编号不能为空
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_cht.properties
-1
View File
@@ -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=訂單編號不能為空
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_en.properties
-1
View File
@@ -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