1、未排贴皮订单列表接口增加订单类型查询入参；2、获取未排贴皮板件数据接口增加查询入参；

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

@@ -2,7 +2,9 @@ package com.cf.imes.module.executor.controller.admin.veneer.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -22,4 +24,37 @@ public class UnplannedVeneerPlateDataReqVO {
 
     @Schema(description = "柜体ID列表")
     private List<Long> bodyIds;
+
+    @Schema(description = "贴皮编号")
+    @Length(max = 64, message = "{veneer.unplanned.plate.query.veneerNo.length.max}")
+    private String veneerNo;
+
+    @Schema(description = "板件编号")
+    @Length(max = 64, message = "{veneer.unplanned.plate.query.plateNo.length.max}")
+    private String plateNo;
+
+    @Schema(description = "贴皮商品编号")
+    @Length(max = 32, message = "{veneer.unplanned.plate.query.sourceVeneerNo.length.max}")
+    private String sourceVeneerNo;
+
+    @Schema(description = "贴皮材质")
+    @Length(max = 64, message = "{veneer.unplanned.plate.query.material.length.max}")
+    private String material;
+
+    @Schema(description = "贴皮颜色")
+    @Length(max = 32, message = "{veneer.unplanned.plate.query.color.length.max}")
+    private String color;
+
+    @Schema(description = "板名称")
+    @Length(max = 64, message = "{veneer.unplanned.plate.query.plateName.length.max}")
+    private String plateName;
+
+    @Schema(description = "长度范围(mm)，依次为最小值、最大值")
+    private BigDecimal[] length;
+
+    @Schema(description = "宽度范围(mm)，依次为最小值、最大值")
+    private BigDecimal[] width;
+
+    @Schema(description = "厚度范围(mm)，依次为最小值、最大值")
+    private BigDecimal[] thickness;
 }

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

@@ -21,6 +21,9 @@ public class VeneerManageOrderPageReqVO extends PageParam {
     @Schema(description = "自定义单号")
     private String customOrderNo;
 
+    @Schema(description = "订单类型")
+    private Integer orderType;
+
     @Schema(description = "客户")
     private String customer;
 

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/veneer/VeneerManageMapper.xml

@@ -63,6 +63,9 @@
         <if test="req.customOrderNo != null and req.customOrderNo != ''">
             AND o.custom_order_no LIKE CONCAT('%', #{req.customOrderNo}, '%')
         </if>
+        <if test="req.orderType != null">
+            AND o.order_type = #{req.orderType}
+        </if>
         <if test="req.customer != null and req.customer != ''">
             AND o.customer LIKE CONCAT('%', #{req.customer}, '%')
         </if>
@@ -118,6 +121,9 @@
         <if test="req.customOrderNo != null and req.customOrderNo != ''">
             AND o.custom_order_no LIKE CONCAT('%', #{req.customOrderNo}, '%')
         </if>
+        <if test="req.orderType != null">
+            AND o.order_type = #{req.orderType}
+        </if>
         <if test="req.customer != null and req.customer != ''">
             AND o.customer LIKE CONCAT('%', #{req.customer}, '%')
         </if>
@@ -181,6 +187,9 @@
         <if test="req.customOrderNo != null and req.customOrderNo != ''">
             AND o.custom_order_no LIKE CONCAT('%', #{req.customOrderNo}, '%')
         </if>
+        <if test="req.orderType != null">
+            AND o.order_type = #{req.orderType}
+        </if>
         <if test="req.customer != null and req.customer != ''">
             AND o.customer LIKE CONCAT('%', #{req.customer}, '%')
         </if>
@@ -265,6 +274,9 @@
         <if test="req.customOrderNo != null and req.customOrderNo != ''">
             AND o.custom_order_no LIKE CONCAT('%', #{req.customOrderNo}, '%')
         </if>
+        <if test="req.orderType != null">
+            AND o.order_type = #{req.orderType}
+        </if>
         <if test="req.customer != null and req.customer != ''">
             AND o.customer LIKE CONCAT('%', #{req.customer}, '%')
         </if>
@@ -451,6 +463,33 @@
                 </foreach>
             </otherwise>
         </choose>
+        <if test="req.veneerNo != null and req.veneerNo != ''">
+            AND opv.veneer_no LIKE CONCAT('%', #{req.veneerNo}, '%')
+        </if>
+        <if test="req.plateNo != null and req.plateNo != ''">
+            AND opv.plate_no LIKE CONCAT('%', #{req.plateNo}, '%')
+        </if>
+        <if test="req.sourceVeneerNo != null and req.sourceVeneerNo != ''">
+            AND opv.source_veneer_no LIKE CONCAT('%', #{req.sourceVeneerNo}, '%')
+        </if>
+        <if test="req.material != null and req.material != ''">
+            AND opv.material LIKE CONCAT('%', #{req.material}, '%')
+        </if>
+        <if test="req.color != null and req.color != ''">
+            AND opv.color LIKE CONCAT('%', #{req.color}, '%')
+        </if>
+        <if test="req.plateName != null and req.plateName != ''">
+            AND opv.plate_name LIKE CONCAT('%', #{req.plateName}, '%')
+        </if>
+        <if test="req.length != null and req.length.length == 2">
+            AND opv.plate_height BETWEEN #{req.length[0]} AND #{req.length[1]}
+        </if>
+        <if test="req.width != null and req.width.length == 2">
+            AND opv.plate_width BETWEEN #{req.width[0]} AND #{req.width[1]}
+        </if>
+        <if test="req.thickness != null and req.thickness.length == 2">
+            AND opv.plate_thickness BETWEEN #{req.thickness[0]} AND #{req.thickness[1]}
+        </if>
         <if test="req.roomIds != null and req.roomIds.size() > 0">
             AND oi.room_id IN
             <foreach collection="req.roomIds" item="roomId" open="(" close=")" separator=",">

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_cht.properties

@@ -37,6 +37,12 @@ veneer.save.veneerNo.not.null=貼皮編號不能為空
 veneer.save.width.not.null=寬度不能為空
 veneer.save.veneerName.not.null=貼皮名稱不能為空
 veneer.save.veneerName.length.max=貼皮名稱不能超过64个字元
+veneer.unplanned.plate.query.veneerNo.length.max=貼皮編號不能超過64個字元
+veneer.unplanned.plate.query.plateNo.length.max=板件編號不能超過64個字元
+veneer.unplanned.plate.query.sourceVeneerNo.length.max=貼皮商品編號不能超過32個字元
+veneer.unplanned.plate.query.material.length.max=貼皮材質不能超過64個字元
+veneer.unplanned.plate.query.color.length.max=貼皮顏色不能超過32個字元
+veneer.unplanned.plate.query.plateName.length.max=板名稱不能超過64個字元
 veneer.defect.save.id.not.null=貼皮ID不能為空
 veneer.classification.name.save.name.not.null=分類名稱不能為空
 veneer.classification.name.save.name.length.max=分類名稱不能超過64個字元

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_en.properties

@@ -37,6 +37,12 @@ veneer.save.veneerNo.not.null=veener no cannot be empty
 veneer.save.width.not.null=width cannot be empty
 veneer.save.veneerName.not.null=veneer name cannot be empty
 veneer.save.veneerName.length.max=veneer name length cannot exceed 64 characters
+veneer.unplanned.plate.query.veneerNo.length.max=veneer number cannot exceed 64 characters
+veneer.unplanned.plate.query.plateNo.length.max=plate number cannot exceed 64 characters
+veneer.unplanned.plate.query.sourceVeneerNo.length.max=veneer product number cannot exceed 32 characters
+veneer.unplanned.plate.query.material.length.max=veneer material cannot exceed 64 characters
+veneer.unplanned.plate.query.color.length.max=veneer color cannot exceed 32 characters
+veneer.unplanned.plate.query.plateName.length.max=plate name cannot exceed 64 characters
 veneer.defect.save.id.not.null=veneer id cannot be empty
 veneer.classification.name.save.name.not.null=classification name cannot be empty
 veneer.classification.name.save.name.length.max=classification name length cannot exceed 64 characters

cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/message_zh.properties

@@ -37,6 +37,12 @@ veneer.save.veneerNo.not.null=贴皮编号不能为空
 veneer.save.width.not.null=宽度不能为空
 veneer.save.veneerName.not.null=贴皮名称不能为空
 veneer.save.veneerName.length.max=贴皮名称不能超过64个字符
+veneer.unplanned.plate.query.veneerNo.length.max=贴皮编号不能超过64个字符
+veneer.unplanned.plate.query.plateNo.length.max=板件编号不能超过64个字符
+veneer.unplanned.plate.query.sourceVeneerNo.length.max=贴皮商品编号不能超过32个字符
+veneer.unplanned.plate.query.material.length.max=贴皮材质不能超过64个字符
+veneer.unplanned.plate.query.color.length.max=贴皮颜色不能超过32个字符
+veneer.unplanned.plate.query.plateName.length.max=板名称不能超过64个字符
 veneer.defect.save.id.not.null=贴皮ID不能为空
 veneer.classification.name.save.name.not.null=分类名称不能为空
 veneer.classification.name.save.name.length.max=分类名称长度不能超过64