生产工序代码-排单-新增排单

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<PageResult<OrderRespVOCopy>> getOrderPage(@Valid OrderPageReqVOCopy pageReqVO) {
+    public CommonResult<List<OrderRespVOCopy>> getOrderPage(@Valid OrderPageReqVOCopy pageReqVO) {
         return success(planService.getOrderPage(pageReqVO));
     }
 
     @GetMapping("getNotPlanPlateListPage")
     @Operation(summary = "获取未排单的板材分页列表")
     @PreAuthorize("@ss.hasPermission('executor:plan:query')")
-    public CommonResult<PageResult<PlatePage>> getNotPlanPlateListPage(@Valid PlateReqPageVO pageVO) {
+    public CommonResult<List<PlatePage>> getNotPlanPlateListPage(@Valid PlateReqPageVO pageVO) {
         return success(planService.getNotPlanPlateListPage(pageVO));
     }
 

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<PlatePage> platePages;
+
     @Schema(description = "颜色")
     private String color;
     @Schema(description = "材质：颗粒板、欧松板、多层板、生态板、禾香板、密度板、实木、铝蜂窝板、铝塑板")

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<OrderDO> {
     }
 
 
-    IPage<OrderRespVOCopy> selectOrderPage(@Param("page") IPage page, @Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
+    List<OrderRespVOCopy> selectOrderPage(/*@Param("page") IPage page,*/ @Param(Constants.WRAPPER) Wrapper<OrderDO> wrapper);
 
     default List<OrderDO> selectOrderCheck(OrderPageReqVO reqVO) {
         MPJLambdaWrapper<OrderDO> wrapper = new MPJLambdaWrapper<OrderDO>()

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<PlateDO> {
                 .orderByDesc(PlateDO::getId));
     }
 
-    IPage<PlatePage> selectPlatePage(@Param("page") IPage<PlatePage> page, @Param("orderId")Long organId, @Param("goodsId") String goodsId);
+//    IPage<PlatePage> selectPlatePage(@Param("page") IPage<PlatePage> page, @Param("orderId")Long organId, @Param("goodsId") String goodsId);
+    List<PlatePage> selectPlatePage(/*@Param("page") IPage<PlatePage> page,*/ @Param("orderId")Long organId, @Param("goodsId") String goodsId);
 
     IPage<PlateResList> selectPlateByPlanId(@Param("page") IPage<PlateResList> page, @Param(Constants.WRAPPER) Wrapper<PlateDO> wrapper);
 

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<PlanRespVO> getPlanPage(PlanPageReqVO pageReqVO);
 
-    PageResult<OrderRespVOCopy> getOrderPage(OrderPageReqVOCopy pageReqVO);
+    List<OrderRespVOCopy> getOrderPage(OrderPageReqVOCopy pageReqVO);
 
-    PageResult<PlatePage> getNotPlanPlateListPage(PlateReqPageVO pageVO);
+    List<PlatePage> getNotPlanPlateListPage(PlateReqPageVO pageVO);
 
     Boolean addPlate(AddPlateReq req);
 

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<OrderRespVOCopy> getOrderPage(OrderPageReqVOCopy pageReqVO) {
-        PageDTO<OrderRespVOCopy> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
+    public List<OrderRespVOCopy> getOrderPage(OrderPageReqVOCopy pageReqVO) {
+//        PageDTO<OrderRespVOCopy> page = new PageDTO<>(pageReqVO.getPageNo(), pageReqVO.getPageSize());
 
         QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
         queryWrapperX
@@ -285,18 +285,30 @@ public class PlanServiceImpl implements PlanService {
 
         queryWrapperX.inIfPresent("op.filter_type", filterTypes);
 
-        IPage<OrderRespVOCopy> orderDOPageResult = orderMapper.selectOrderPage(page, queryWrapperX);
-        if (CollectionUtil.isEmpty(orderDOPageResult.getRecords())) {
-            return new PageResult<>();
+        List<OrderRespVOCopy> orderRespVOCopies = orderMapper.selectOrderPage(queryWrapperX);
+
+        for (OrderRespVOCopy orderRespVOCopy : orderRespVOCopies) {
+
+            List<PlatePage> platePages = plateMapper.selectPlatePage(orderRespVOCopy.getOrderId(), orderRespVOCopy.getGoodsId());
+            orderRespVOCopy.setPlatePages(platePages);
+
         }
-        return new PageResult<>(orderDOPageResult.getRecords(), orderDOPageResult.getTotal());
+        return orderRespVOCopies;
+
+
+//        IPage<OrderRespVOCopy> orderDOPageResult = orderMapper.selectOrderPage(queryWrapperX);
+
+//        if (CollectionUtil.isEmpty(orderDOPageResult.getRecords())) {
+//            return new PageResult<>();
+//        }
+//        return new PageResult<>(orderDOPageResult.getRecords(), orderDOPageResult.getTotal());
     }
 
     @Override
-    public PageResult<PlatePage> getNotPlanPlateListPage(PlateReqPageVO pageVO) {
-        PageDTO<PlatePage> page = new PageDTO<>(pageVO.getPageNo(), pageVO.getPageSize());
-        IPage<PlatePage> pageRes = plateMapper.selectPlatePage(page, pageVO.getOrderId(), pageVO.getGoodsId());
-        return new PageResult<PlatePage>(pageRes.getRecords(), pageRes.getTotal());
+    public List<PlatePage> getNotPlanPlateListPage(PlateReqPageVO pageVO) {
+//        PageDTO<PlatePage> page = new PageDTO<>(pageVO.getPageNo(), pageVO.getPageSize());
+        List<PlatePage> pageRes = plateMapper.selectPlatePage(/*page, */pageVO.getOrderId(), pageVO.getGoodsId());
+        return pageRes;
     }
 
     @Override

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}
             </if>
             <if test="goodsId !=null and goodsId != '' ">
-               and c.id = #{goodsId}
+               and c.goods_id = #{goodsId}
             </if>
         </where>
     </select>