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/OrderPrintListReqVO.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPrintListReqVO.java new file mode 100644 index 000000000..4d291bbb6 --- /dev/null +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/order/vo/order/OrderPrintListReqVO.java @@ -0,0 +1,35 @@ +package com.cf.imes.module.executor.controller.admin.order.vo.order; + +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 java.util.List; +import java.util.Set; + +/** + * + * + * @author Gqr + * @since 2026/2/2 11:34 + */ +@Schema(description = "管理后台 - 订单明细打印列表查询 Request VO") +@Data +@ToString(callSuper = true) +@Builder +@AllArgsConstructor +@NoArgsConstructor +public class OrderPrintListReqVO { + + @Schema(description = "订单编号列表", example = "[1,2]") + @Size(min = 1, max = 100, message = "{order.component.assemble.req.orderIds.max}") + private List orderIds; + + @Schema(description = "部件编号", example = "[1,2]") + @Size(max = 200, message = "{order.detail.component.list.query.componentIds.max}") + private Set componentIds; +} 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 f9b98f35d..af11d12f1 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 @@ -2,6 +2,7 @@ package com.cf.imes.module.executor.controller.admin.ordercomponent; import com.cf.imes.framework.common.pojo.CommonResult; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPrintListReqVO; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPrintRespVO; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrdersViewCadViewInfoRespVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderComponentRespVO; @@ -111,7 +112,7 @@ public class OrderComponentController { @PostMapping("/print") @Operation(summary = "获取订单部件打印列表") @PreAuthorize("@ss.hasPermission('production:assemblyList:print')") - public CommonResult getOrderComponentPrintList(@Valid @RequestBody OrderDetailComponentListReqVO reqVO) { + public CommonResult getOrderComponentPrintList(@Valid @RequestBody OrderPrintListReqVO reqVO) { return success(orderComponentService.getOrderComponentPrintList(reqVO)); } } 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 456230229..a73854dfa 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 @@ -1,6 +1,7 @@ package com.cf.imes.module.executor.service.ordercomponent; import com.cf.imes.framework.common.pojo.PageResult; +import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPrintListReqVO; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPrintRespVO; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrdersViewCadViewInfoRespVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderComponentRespVO; @@ -119,5 +120,5 @@ public interface OrderComponentService { * @param pageReqVO * @return */ - OrderPrintRespVO getOrderComponentPrintList(OrderDetailComponentListReqVO pageReqVO); + OrderPrintRespVO getOrderComponentPrintList(OrderPrintListReqVO pageReqVO); } \ 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/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 f59d3e02a..8cf308329 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 @@ -18,6 +18,7 @@ import com.cf.imes.framework.common.util.Assert.AssertUtils; import com.cf.imes.framework.mybatis.core.query.LambdaQueryWrapperX; import com.cf.imes.framework.security.core.util.SecurityFrameworkUtils; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPrintDetailRespVO; +import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPrintListReqVO; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPrintRespVO; import com.cf.imes.module.executor.controller.admin.order.vo.order.OrdersViewCadViewInfoRespVO; import com.cf.imes.module.executor.controller.admin.ordercomponent.vo.OrderComponentRespVO; @@ -864,7 +865,7 @@ public class OrderComponentServiceImpl implements OrderComponentService { } @Override - public OrderPrintRespVO getOrderComponentPrintList(OrderDetailComponentListReqVO pageReqVO) { + public OrderPrintRespVO getOrderComponentPrintList(OrderPrintListReqVO pageReqVO) { OrderPrintRespVO result = new OrderPrintRespVO(); List orderIds = pageReqVO.getOrderIds(); Set componentIds = pageReqVO.getComponentIds();