diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java index 745d8dbc7..e89f3d5a4 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java @@ -108,14 +108,14 @@ public class PlanController { @GetMapping("getNotPlanOrderListPage") @Operation(summary = "获取未排单的板材生产单板材分页列表") @PreAuthorize("@ss.hasPermission('executor:plan:query')") - public CommonResult> getOrderPage(@Valid OrderPageReqVOCopy pageReqVO) { + public CommonResult> getOrderPage(@Valid OrderPageReqVOCopy pageReqVO) { return success(planService.getOrderPage(pageReqVO)); } @GetMapping("getNotPlanPlateListPage") @Operation(summary = "获取未排单的板材分页列表") @PreAuthorize("@ss.hasPermission('executor:plan:query')") - public CommonResult> getNotPlanPlateListPage(@Valid PlateReqPageVO pageVO) { + public CommonResult> getNotPlanPlateListPage(@Valid PlateReqPageVO pageVO) { return success(planService.getNotPlanPlateListPage(pageVO)); } diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java index 634a9573d..a8c91b2bc 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderRespVOCopy.java @@ -9,6 +9,7 @@ import lombok.NoArgsConstructor; import java.math.BigDecimal; import java.util.Date; +import java.util.List; import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; import static com.cf.imes.framework.common.util.date.DateUtils.TIME_ZONE_DEFAULT; @@ -44,6 +45,10 @@ public class OrderRespVOCopy { private String goodsId; @Schema(description = "商品名称") private String goodsName; + + @Schema(description = "订单对应的板件的信息") + private List platePages; + @Schema(description = "颜色") private String color; @Schema(description = "材质:颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板") diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java index ca3a65e4f..10340d19d 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/order/OrderMapper.java @@ -49,7 +49,7 @@ public interface OrderMapper extends BaseMapperX { } - IPage selectOrderPage(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); + List selectOrderPage(/*@Param("page") IPage page,*/ @Param(Constants.WRAPPER) Wrapper wrapper); default List selectOrderCheck(OrderPageReqVO reqVO) { MPJLambdaWrapper wrapper = new MPJLambdaWrapper() diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java index 6ccb2ae93..a7ae96153 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java @@ -65,7 +65,8 @@ public interface PlateMapper extends BaseMapperX { .orderByDesc(PlateDO::getId)); } - IPage selectPlatePage(@Param("page") IPage page, @Param("orderId")Long organId, @Param("goodsId") String goodsId); +// IPage selectPlatePage(@Param("page") IPage page, @Param("orderId")Long organId, @Param("goodsId") String goodsId); + List selectPlatePage(/*@Param("page") IPage page,*/ @Param("orderId")Long organId, @Param("goodsId") String goodsId); IPage selectPlateByPlanId(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper wrapper); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java index 6246c0034..956bc8b7a 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java @@ -53,9 +53,9 @@ public interface PlanService { */ PageResult getPlanPage(PlanPageReqVO pageReqVO); - PageResult getOrderPage(OrderPageReqVOCopy pageReqVO); + List getOrderPage(OrderPageReqVOCopy pageReqVO); - PageResult getNotPlanPlateListPage(PlateReqPageVO pageVO); + List getNotPlanPlateListPage(PlateReqPageVO pageVO); Boolean addPlate(AddPlateReq req); diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java index b71ac5b98..62259d44e 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java @@ -254,8 +254,8 @@ public class PlanServiceImpl implements PlanService { } @Override - public PageResult getOrderPage(OrderPageReqVOCopy pageReqVO) { - PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); + public List getOrderPage(OrderPageReqVOCopy pageReqVO) { +// PageDTO page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize()); QueryWrapperX queryWrapperX = new QueryWrapperX<>(); queryWrapperX @@ -285,18 +285,30 @@ public class PlanServiceImpl implements PlanService { queryWrapperX.inIfPresent("op.filter_type", filterTypes); - IPage orderDOPageResult = orderMapper.selectOrderPage(page, queryWrapperX); - if (CollectionUtil.isEmpty(orderDOPageResult.getRecords())) { - return new PageResult<>(); + List orderRespVOCopies = orderMapper.selectOrderPage(queryWrapperX); + + for (OrderRespVOCopy orderRespVOCopy : orderRespVOCopies) { + + List platePages = plateMapper.selectPlatePage(orderRespVOCopy.getOrderId(), orderRespVOCopy.getGoodsId()); + orderRespVOCopy.setPlatePages(platePages); + } - return new PageResult<>(orderDOPageResult.getRecords(), orderDOPageResult.getTotal()); + return orderRespVOCopies; + + +// IPage orderDOPageResult = orderMapper.selectOrderPage(queryWrapperX); + +// if (CollectionUtil.isEmpty(orderDOPageResult.getRecords())) { +// return new PageResult<>(); +// } +// return new PageResult<>(orderDOPageResult.getRecords(), orderDOPageResult.getTotal()); } @Override - public PageResult getNotPlanPlateListPage(PlateReqPageVO pageVO) { - PageDTO page = new PageDTO<>(pageVO.getPageNo(), pageVO.getPageSize()); - IPage pageRes = plateMapper.selectPlatePage(page, pageVO.getOrderId(), pageVO.getGoodsId()); - return new PageResult(pageRes.getRecords(), pageRes.getTotal()); + public List getNotPlanPlateListPage(PlateReqPageVO pageVO) { +// PageDTO page = new PageDTO<>(pageVO.getPageNo(), pageVO.getPageSize()); + List pageRes = plateMapper.selectPlatePage(/*page, */pageVO.getOrderId(), pageVO.getGoodsId()); + return pageRes; } @Override diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml index c43392258..473695fea 100644 --- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml +++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml @@ -17,7 +17,7 @@ and a.order_id = #{orderId} - and c.id = #{goodsId} + and c.goods_id = #{goodsId} diff --git a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyReqVO.java b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyReqVO.java index f890b7084..7829e71f1 100644 --- a/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyReqVO.java +++ b/cf-module-prod-manage/cf-module-prod-manage-biz/src/main/java/com/cf/imes/module/manage/controller/admin/process/vo/OrderBodyReqVO.java @@ -12,11 +12,11 @@ import lombok.ToString; public class OrderBodyReqVO { - @Schema(description = "工序类型",requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "工序类型",requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long processType; - @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED) + @Schema(description = "生产单号",requiredMode = Schema.RequiredMode.REQUIRED, example = "1") private Long orderId;