diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java
index aa848e0ec..2afba1064 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/OrderPageReqVOCopy.java
@@ -32,8 +32,8 @@ public class OrderPageReqVOCopy extends PageParam {
     private String consigneeAddress;
     @Schema(description = "状态列表")
     private List<Integer> stateList;
-    @Schema(description = "矩形")
-    private Boolean rectangle;
+    /*@Schema(description = "矩形")
+    private Boolean rectangle;*/
     @Schema(description = "异形")
     private Boolean specialShaped;
     @Schema(description = "造型")
@@ -44,6 +44,8 @@ public class OrderPageReqVOCopy extends PageParam {
     private Boolean burrow;
     @Schema(description = "有二维纹路")
     private Boolean twoDimensionalToolPath;
+    @Schema(description = "门板")
+    private Boolean isDoor;
     @Schema(description = "创建时间", example = "[2022-07-01 00:00:00,2022-07-01 23:59:59]")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime[] createTime;
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 f7d4aadb9..576b8df2d 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
@@ -249,6 +249,9 @@ public class PlanServiceImpl implements PlanService {
                 .eqIfPresent("address", pageReqVO.getConsigneeAddress())
                 .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
                 .betweenIfPresent("a.create_time", pageReqVO.getCreateTime())
+                .eqIfPresent("op.is_special_shaped", pageReqVO.getSpecialShaped())
+                .eqIfPresent("op.is_sculpt", pageReqVO.getSculpt())
+                .eqIfPresent("op.is_door", pageReqVO.getIsDoor())
                 .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
                 .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()} )
         ;
@@ -336,6 +339,8 @@ public class PlanServiceImpl implements PlanService {
 
         queryWrapperX.eq("p.plan_id", vo.getPlanId())
                 .eqIfPresent("a.is_door", vo.getIsDoor())
+                .eqIfPresent("a.is_special_shaped", vo.getSpecialShaped())
+                .eqIfPresent("a.is_sculpt", vo.getSculpt())
                 .betweenIfPresent("a.width", new BigDecimal[]{vo.getWidthMinRang(), vo.getWidthMaxRang()})
                 .betweenIfPresent("a.height", new BigDecimal[]{vo.getLongMinRang(), vo.getLongMaxRang()})
                 .inIfPresent("a.filter_type", filterTypes)