修改-根据多个排单号查询板材数据

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

@@ -8,6 +8,7 @@ import org.springframework.format.annotation.DateTimeFormat;
 import javax.validation.constraints.NotNull;
 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;
 
@@ -15,7 +16,7 @@ import static com.cf.imes.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH
 public class GetPlateByPlanIdVO extends PageParam {
     @Schema(description = "排单id")
     @NotNull(message = "排单id不能空")
-    private Long planId;
+    private List<Long> planIds;
     @Schema(description = "矩形")
     private Boolean rectangle;
     @Schema(description = "异形")

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

@@ -423,7 +423,12 @@ public class PlanServiceImpl implements PlanService {
 
     @Override
     public PageResult<PlateResList> getPlateByPlanId(GetPlateByPlanIdVO vo) {
-        validatePlanExists(vo.getPlanId());
+        if(vo.getPlanIds().isEmpty()){
+            return null;
+        }
+        for (Long planId : vo.getPlanIds()) {
+            validatePlanExists(planId);
+        }
         QueryWrapperX<PlateDO> queryWrapperX = new QueryWrapperX<>();
         List<Integer> filterTypes = new ArrayList<>();
         if (Objects.nonNull(vo.getHoleThrough()) && vo.getHoleThrough()) {
@@ -436,7 +441,7 @@ public class PlanServiceImpl implements PlanService {
             filterTypes.add(PlanFilterTypeEnum.TWODIMENSIONALCUTTINGPATH.getType());
         }
 
-        queryWrapperX.eq("p.plan_id", vo.getPlanId())
+        queryWrapperX.in("p.plan_id", vo.getPlanIds())
                 .eq("a.organ_id",getUserOrganId())
                 .eqIfPresent("a.is_door", vo.getIsDoor())
                 .eqIfPresent("a.is_special_shaped", vo.getSpecialShaped())