diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java index dd6ea028b..a88f0a204 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/OrderComponentController.java @@ -5,6 +5,7 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderComponentRespVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentListReqVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentPageReqVO; +import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrdersTopComponentListReqVO; import com.cf.imes.module.executor.controller.admin.plate.vo.OrderViewPlatePageRespVO; import com.cf.imes.module.executor.service.ordercomponent.OrderComponentService; import io.swagger.v3.oas.annotations.Operation; @@ -48,7 +49,7 @@ public class OrderComponentController { @PostMapping("/top/list") @Operation(summary = "查询订单顶级部件列表") - public CommonResult> getOrderTopComponentList(@Valid @RequestBody OrderDetailComponentListReqVO reqVO) { + public CommonResult> getOrderTopComponentList(@Valid @RequestBody OrdersTopComponentListReqVO reqVO) { return success(orderComponentService.getOrderTopComponentList(reqVO)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrdersTopComponentListReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrdersTopComponentListReqVO.java new file mode 100644 index 000000000..9bebf7b0a --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/ordercomponent/vo/OrdersTopComponentListReqVO.java @@ -0,0 +1,36 @@ +package com.cf.imes.module.executor.controller.admin.ordercomponent.vo; + +import io.swagger.v3.oas.annotations.media.Schema; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.ToString; +import org.hibernate.validator.constraints.Length; + +import java.util.List; + +/** + * + * + * @author Gqr + * @since 2026/2/2 11:34 + */ +@Schema(description = "管理后台 - 装配清单 - 顶级部件列表查询 Request VO") +@Data +@ToString(callSuper = true) +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OrdersTopComponentListReqVO { + + @Schema(description = "订单编号列表", example = "[1,2]") + @Size(max = 100, message = "{order.component.assemble.req.orderIds.max}") + private List orderIds; + + @Schema(description = "部件名称", example = "部件") + @Length(max = 64, message = "{order.component.assemble.req.name.max}") + private String name; + +} diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentService.java index 6661c53de..ad0f5d668 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentService.java @@ -4,6 +4,7 @@ import com.cf.imes.framework.common.pojo.PageResult; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderComponentRespVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentListReqVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentPageReqVO; +import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrdersTopComponentListReqVO; import com.cf.imes.module.executor.controller.admin.plate.vo.OrderViewPlatePageRespVO; import java.util.List; @@ -29,7 +30,7 @@ public interface OrderComponentService { * @param reqVO * @return */ - List getOrderTopComponentList(OrderDetailComponentListReqVO reqVO); + List getOrderTopComponentList(OrdersTopComponentListReqVO reqVO); /** * 获取节点的顶级节点下所有节点 diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java index eff7891e5..ff630c1fc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/ordercomponent/OrderComponentServiceImpl.java @@ -17,6 +17,7 @@ import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderComponentRespVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentListReqVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderDetailComponentPageReqVO; +import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrdersTopComponentListReqVO; import com.cf.imes.module.executor.controller.admin.plate.vo.OrderViewPlatePageRespVO; import com.cf.imes.module.executor.dal.dataobject.goods.GoodsDO; import com.cf.imes.module.executor.dal.dataobject.goods.OrderGoodsPlateNumAndAreaDO; @@ -126,7 +127,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { } @Override - public List getOrderTopComponentList(OrderDetailComponentListReqVO reqVO) { + public List getOrderTopComponentList(OrdersTopComponentListReqVO reqVO) { List orderIds = reqVO.getOrderIds(); if (CollUtil.isEmpty(orderIds)) { return Collections.emptyList(); @@ -135,7 +136,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { .in(OrderComponentDO::getOrderId, orderIds) .eq(OrderComponentDO::getPid, OrderComponentDO.PARENT_ID_ROOT) .likeIfPresent(OrderComponentDO::getName, reqVO.getName()) - .eqIfPresent(OrderComponentDO::getProcessStatus, reqVO.getProcessStatus())); + ); return BeanUtil.copyToList(orderComponentDOS, OrderComponentRespVO.class); }