工序加工204Bug修改，根据排单ID查询板材信息接口新增

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/PlanController.java

@@ -78,7 +78,7 @@ public class PlanController {
 
     @GetMapping("getPlateByPlanId")
     @Operation(summary = "根据排单id获取小板分页")
-    @PreAuthorize("@ss.hasPermission('executor:plan:query')")
+    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
     public CommonResult<PageResult<PlateResList>> getPlateByPlanId(@Valid GetPlateByPlanIdVO vo) {
         return success(planService.getPlateByPlanId(vo));
     }
@@ -161,4 +161,13 @@ public class PlanController {
     }
 
 
+
+    @GetMapping("getPlateList")
+    @Operation(summary = "根据排单ID获取板材列表（未分页）")
+    @Parameter(name = "planId", description = "排单id", required = true, example = "1024")
+    @PreAuthorize("@ss.hasPermission('placeorder:orderlist')")
+    public CommonResult<List<PlateResList>> getPlateList(@Valid @RequestParam("planId") Long planId) {
+        return success(planService.getPlateList(planId));
+    }
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/dal/mysql/plate/PlateMapper.java

@@ -112,4 +112,7 @@ public interface PlateMapper extends BaseMapperX<PlateDO> {
 
 
     BigDecimal selectPlateSize( @Param("orderId") Long orderId);
+
+
+    List<PlateResList> selectPlateListByPlanId(@Param("planId") Long planId, @Param("organId") Long organId);
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanService.java

@@ -69,4 +69,6 @@ public interface PlanService {
     PageResult<PlanGoodsVO> getNotPlanGoodsListPageByOrderId( NotPlanGoodsListPageVO pageVO);
 
     Boolean setSort(List<SortVO> list);
+
+    List<PlateResList> getPlateList(Long planId);
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/service/plan/PlanServiceImpl.java

@@ -331,7 +331,7 @@ public class PlanServiceImpl implements PlanService {
                 .eqIfPresent("op.is_door", pageReqVO.getIsDoor())
                 .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
                 .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()})
-                .groupBy("a.id", " a.order_date", "a.delivery_date", "a.customer", "a.address", "a.custom_order_no")
+                .groupBy("a.id", " a.order_date", "a.delivery_date", "a.customer", "a.address", "a.custom_order_no","a.create_time")
                 .orderByDesc("a.create_time");
         List<Integer> filterTypes = new ArrayList<>();
         if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
@@ -502,4 +502,15 @@ public class PlanServiceImpl implements PlanService {
         return Boolean.TRUE;
     }
 
+
+
+    @Override
+    public List<PlateResList> getPlateList(Long planId) {
+
+
+        return plateMapper.selectPlateListByPlanId(planId,getUserOrganId());
+
+
+    }
+
 }

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/plate/PlateMapper.xml

@@ -288,5 +288,21 @@
 
     </select>
 
+    <select id="selectPlateListByPlanId" resultType="com.cf.imes.module.executor.controller.admin.plan.vo.PlateResList"
+            parameterType="java.lang.Long">
+
+
+        select a.order_id, a.plate_no , a.name as plateName,a.is_special_shaped,a.is_sculpt,a.area,a.seal_left,a.seal_right,a.seal_up,a.seal_down, e.material, e.color, a.width, a.height, a.thickness, b.room_id, b.body_id
+        from order_plan_item p
+                 left join order_item b on p.item_id = b.id and b.organ_id = p.organ_id
+                 left join order_plate a on b.plate_id = a.id and b.order_id = a.order_id and b.organ_id = a.organ_id
+                 left join order_goods e on a.goods_id = e.id and a.order_id = e.order_id and a.organ_id = e.organ_id
+
+        where p.plan_id = #{planId} and p.organ_id = #{organId} ;
+
+
+
+    </select>
+
 
 </mapper>