From 6d6765cf9f3266cb5bc11218b3758e749768deb8 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Mon, 29 Apr 2024 13:53:05 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=9C=AA=E6=8E=92=E5=8D=95=E7=9A=84?=
 =?UTF-8?q?=E6=9D=BF=E6=9D=90=E7=94=9F=E4=BA=A7=E5=8D=95=E6=9D=BF=E6=9D=90?=
 =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8=E6=8E=A5=E5=8F=A3=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=8F=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mybatis/core/query/QueryWrapperX.java          |  6 ++++++
 .../admin/plan/vo/OrderPageReqVOCopy.java          | 11 ++++++++---
 .../controller/admin/plan/vo/OrderRespVOCopy.java  |  3 +++
 .../executor/service/plan/PlanServiceImpl.java     | 10 +++++++---
 .../main/resources/mapper/order/OrderMapper.xml    | 14 ++++++++------
 5 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/QueryWrapperX.java b/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/QueryWrapperX.java
index a0ad9ec23..a4109dc52 100644
--- a/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/QueryWrapperX.java
+++ b/cf-framework/cf-spring-boot-starter-mybatis/src/main/java/com/cf/imes/framework/mybatis/core/query/QueryWrapperX.java
@@ -139,6 +139,12 @@ public class QueryWrapperX<T> extends QueryWrapper<T> {
         return this;
     }
 
+    @Override
+    public QueryWrapperX<T> isNull(String column) {
+        super.isNull(column);
+        return this;
+    }
+
     /**
      * 设置只返回最后一条
      *
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 734b1e7a7..aa848e0ec 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
@@ -7,6 +7,7 @@ import lombok.NoArgsConstructor;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.math.BigDecimal;
+import java.time.LocalDateTime;
 import java.util.Date;
 import java.util.List;
 
@@ -43,11 +44,15 @@ public class OrderPageReqVOCopy extends PageParam {
     private Boolean burrow;
     @Schema(description = "有二维纹路")
     private Boolean twoDimensionalToolPath;
-    @Schema(description = "开始时间")
+    @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 Date beginDate;
+    private LocalDateTime[] createTime;
+    /*@Schema(description = "交付日期开始时间")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
-    private Date endDate;
+    private LocalDateTime beginDate;
+    @Schema(description = "交付日期结束时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private LocalDateTime endDate;*/
     @Schema(description = "长 小范围")
     private BigDecimal longMinRang;
     @Schema(description = "长 大范围")
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 617766865..634a9573d 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
@@ -30,6 +30,9 @@ public class OrderRespVOCopy {
     private String customer;
     @Schema(description = "地址")
     private String address;
+    @Schema(description = "订单日期")
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
+    private Date orderDate;
     @Schema(description = "交付日期")
     @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND, timezone = TIME_ZONE_DEFAULT)
     private Date deliveryDate;
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 e7f6374e6..f7d4aadb9 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
@@ -34,6 +34,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.LocalDateTime;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -242,11 +243,14 @@ public class PlanServiceImpl implements PlanService {
 
         QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
         queryWrapperX
+                .isNull("opi.id")
                 .eqIfPresent("customer", pageReqVO.getConsignee())
+                .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
                 .eqIfPresent("address", pageReqVO.getConsigneeAddress())
                 .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
-                .betweenIfPresent("delivery_date", new Date[]{pageReqVO.getBeginDate(), pageReqVO.getEndDate()})
-                .isNull("d.order_id")
+                .betweenIfPresent("a.create_time", pageReqVO.getCreateTime())
+                .betweenIfPresent("op.height", new BigDecimal[]{pageReqVO.getLongMinRang(), pageReqVO.getLongMaxRang()})
+                .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()} )
         ;
         List<Integer> filterTypes = new ArrayList<>();
         if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
@@ -259,7 +263,7 @@ public class PlanServiceImpl implements PlanService {
             filterTypes.add(4);
         }
 
-        queryWrapperX.inIfPresent("c.filter_type", filterTypes);
+        queryWrapperX.inIfPresent("op.filter_type", filterTypes);
 
         IPage<OrderRespVOCopy> orderDOPageResult = orderMapper.selectOrderPage(page, queryWrapperX);
         if (CollectionUtil.isEmpty(orderDOPageResult.getRecords())) {
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
index e7f65eb1e..9a8d545ea 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/order/OrderMapper.xml
@@ -4,14 +4,16 @@
 
     <select id="selectOrderPage" resultType="com.cf.imes.module.executor.controller.admin.plan.vo.OrderRespVOCopy">
         select a.id as orderId, a.order_date, a.delivery_date, a.customer, a.address, a.custom_order_no as defineId,
-        count(c.id) as num, sum(c.area) as area, p.goods_name, p.color, p.material, p.goods_id
+               og.goods_name, og.color, og.material, op.goods_id, count(op.id) as num, sum(op.area) as area
         from `order` a
-        left join order_plate c ON a.id = c.order_id and c.is_cancel = 0
-        left join order_goods p on c.goods_id = p.goods_id
-        left join order_item d ON c.order_id = d.order_id
-        left join order_plan_item e on d.id = e.item_id
+        inner join order_plate op on a.id = op.order_id and op.is_cancel = 0
+        inner join order_goods og on op.goods_id = og.goods_id
+        left join order_item oi on a.id = oi.order_id
+        left join order_plan_item opi on oi.id = opi.item_id
         ${ew.customSqlSegment}
-        group by orderId, p.id
+        group by a.id, og.id
+
+
     </select>
 
     <select id="selectDynamicSqlString" resultType="java.util.Map">

From b6a67406e72bbee6246bab6c0b35a28223e57bc5 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Mon, 29 Apr 2024 14:48:05 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8E=92=E5=8D=95=E4=B8=AD=E5=B0=8F?=
 =?UTF-8?q?=E6=9D=BF=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0=E5=BC=82=E6=80=A7?=
 =?UTF-8?q?=E3=80=81=E9=80=A0=E5=9E=8B=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/plan/vo/OrderPageReqVOCopy.java        | 6 ++++--
 .../imes/module/executor/service/plan/PlanServiceImpl.java  | 5 +++++
 2 files changed, 9 insertions(+), 2 deletions(-)

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)

From 5b17e35e57128b98c4a909452cdb62a2f345a608 Mon Sep 17 00:00:00 2001
From: yangsb <there-y@qq.com>
Date: Mon, 29 Apr 2024 16:59:22 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8E=92=E5=8D=95=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E7=9A=84=E8=BF=87=E6=BB=A4=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/admin/plan/PlanController.java | 52 -------------------
 .../admin/plan/vo/GetSourceDataReq.java       |  4 ++
 .../service/plan/PlanServiceImpl.java         | 17 +++---
 3 files changed, 14 insertions(+), 59 deletions(-)

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 c90122321..1d86d5507 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
@@ -1,12 +1,6 @@
 package com.cf.imes.module.executor.controller.admin.plan;
 
-import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderPageReqVO;
 import com.cf.imes.module.executor.controller.admin.order.vo.order.OrderRespVO;
-import com.cf.imes.module.executor.dal.dataobject.order.OrderDO;
-import com.cf.imes.module.executor.service.order.OrderInputProcessor;
-import com.cf.imes.module.executor.util.RandomUtils;
-import com.cf.imes.module.executor.util.deviseData.Detail;
-import com.cf.imes.module.executor.util.deviseData.IBoardProdInfo;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -14,23 +8,18 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
-
 import javax.validation.*;
 import javax.servlet.http.*;
 import java.util.*;
 import java.io.IOException;
-
 import com.cf.imes.framework.common.pojo.PageParam;
 import com.cf.imes.framework.common.pojo.PageResult;
 import com.cf.imes.framework.common.pojo.CommonResult;
 import com.cf.imes.framework.common.util.object.BeanUtils;
 import static com.cf.imes.framework.common.pojo.CommonResult.success;
-
 import com.cf.imes.framework.excel.core.util.ExcelUtils;
-
 import com.cf.imes.framework.operatelog.core.annotations.OperateLog;
 import static com.cf.imes.framework.operatelog.core.enums.OperateTypeEnum.*;
-
 import com.cf.imes.module.executor.controller.admin.plan.vo.*;
 import com.cf.imes.module.executor.service.plan.PlanService;
 
@@ -43,9 +32,6 @@ public class PlanController {
     @Resource
     private PlanService planService;
 
-    @Resource
-    private OrderInputProcessor orderInputProcessor;
-
     @PostMapping("/create")
     @Operation(summary = "创建排单")
     @PreAuthorize("@ss.hasPermission('executor:plan:create')")
@@ -156,42 +142,4 @@ public class PlanController {
     }
 
 
-    @GetMapping("test")
-    @Operation(summary = "test")
-    public Boolean test() {
-        ArrayList<Detail> details = new ArrayList<>();
-        for (int i = 0; i < 20; i++) {
-            Detail detail = RandomUtils.randomPojo(Detail.class);
-            IBoardProdInfo iBoardProdInfo = detail.getIBoardProdInfo();
-            iBoardProdInfo.setRawGoodsId(999L);
-            iBoardProdInfo.setGoodsName("abc");
-            iBoardProdInfo.setMaterial("ccc");
-            iBoardProdInfo.setColor("blue");
-            iBoardProdInfo.setBrand("xxx");
-            iBoardProdInfo.setSpec("xxxx");
-            iBoardProdInfo.setGoodType(1);
-            iBoardProdInfo.setWidth((float) 0.0);
-            iBoardProdInfo.setHeight((float) 0.0);
-            iBoardProdInfo.setThickness(5.0);
-            iBoardProdInfo.setSplitWidth(1);
-            iBoardProdInfo.setSplitHeight(1);
-            iBoardProdInfo.setSplitThickness(2);
-            iBoardProdInfo.setSealUp((float) 0.0);
-            iBoardProdInfo.setSealLeft((float) 0.0);
-            iBoardProdInfo.setSealRight((float) 0.0);
-            iBoardProdInfo.setSealDown((float) 0.0);
-            iBoardProdInfo.setTexture(1);
-            iBoardProdInfo.setOpenDoorType(1);
-            iBoardProdInfo.setTypographicFace(1);
-            detail.setMultiNum(23);
-            detail.setDepth(10.0);
-            detail.setHeight(9.0);
-            detail.getContourDetail().forEach(e->e.setTypographicFace(1));
-            detail.getSideModelDetail().forEach(e->e.setTypographicFace(1));
-            details.add(detail);
-        }
-        orderInputProcessor.input(details, 999L);
-        return Boolean.TRUE;
-    }
-
 }
\ No newline at end of file
diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java
index 888014517..4cd155d49 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/java/com/cf/imes/module/executor/controller/admin/plan/vo/GetSourceDataReq.java
@@ -3,11 +3,13 @@ package com.cf.imes.module.executor.controller.admin.plan.vo;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotNull;
 
 /**
  * @author Beal
  */
+@Valid
 @Data
 @Schema(description = "")
 public class GetSourceDataReq {
@@ -20,9 +22,11 @@ public class GetSourceDataReq {
     private Long dataSourceId;
 
     @Schema(description = "排单id")
+    @NotNull(message = "排单id不能空")
     private Long planId;
 
     @Schema(description = "包裹id")
+    @NotNull(message = "包裹id不能空")
     private Long packageId;
 
 
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 576b8df2d..65796d029 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
@@ -220,7 +220,11 @@ public class PlanServiceImpl implements PlanService {
         List<PlateDO> plateDOS = plateMapper.selectList(new LambdaQueryWrapperX<PlateDO>().in(PlateDO::getGoodsId, goodsDOS.stream().map(GoodsDO::getGoodsId).collect(Collectors.toSet())));
         PageResult<PlanRespVO> planRespVOPageResult = BeanUtils.toBean(planDOPageResult, PlanRespVO.class);
         planRespVOPageResult.getList().forEach(e -> {
-            e.setMachineName(machines.stream().filter(f -> Objects.equals(f.getId(), e.getMachineId())).map(CuttingRespDTO::getName).findAny().orElse(null));
+            e.setMachineName(machines.stream()
+                    .filter(f -> Objects.equals(f.getId(), e.getMachineId()))
+                    .map(CuttingRespDTO::getName)
+                    .findAny()
+                    .orElse(null));
             e.setPlateInfoList(goodsDOS.stream()
                     .filter(f -> Objects.equals(f.getOrderId(), e.getId()))
                     .map(p -> PlateInfoVO.builder()
@@ -244,17 +248,16 @@ public class PlanServiceImpl implements PlanService {
         QueryWrapperX<OrderDO> queryWrapperX = new QueryWrapperX<>();
         queryWrapperX
                 .isNull("opi.id")
-                .eqIfPresent("customer", pageReqVO.getConsignee())
-                .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
-                .eqIfPresent("address", pageReqVO.getConsigneeAddress())
-                .eqIfPresent("custom_order_no", pageReqVO.getDefaultId())
+                .eqIfPresent("a.customer", pageReqVO.getConsignee())
+                .eqIfPresent("a.custom_order_no", pageReqVO.getDefaultId())
+                .eqIfPresent("a.address", pageReqVO.getConsigneeAddress())
                 .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()} )
-        ;
+                .betweenIfPresent("op.width", new BigDecimal[]{pageReqVO.getWidthMinRang(), pageReqVO.getWidthMaxRang()})
+                .orderByDesc("a.create_time");
         List<Integer> filterTypes = new ArrayList<>();
         if (Objects.nonNull(pageReqVO.getHoleThrough()) && pageReqVO.getHoleThrough()) {
             filterTypes.add(1);