楚江ERP：订货单、撤销单列表新增订货单位或订单编号模糊搜索

@@ -93,4 +93,10 @@ public class QueryPurchaseOrderInfoVo extends PageVo implements BaseVo, Serializ
     @ApiModelProperty("订货单类型")
     @ApiModelProperty("订货单类型")
     private String type;
     private String type;
 
 
+    /**
+     * 订货单位或订单编号
+     */
+    @ApiModelProperty("订货单位或订单编号")
+    private String orderingUnitNameOrOrderNo;
+
 }
 }

@@ -68,4 +68,9 @@ public class QueryPurchaseOrderRevokeVo extends PageVo implements BaseVo, Serial
     @ApiModelProperty("状态")
     @ApiModelProperty("状态")
     private String status;
     private String status;
 
 
+    /**
+     * 订货单位或订单编号
+     */
+    @ApiModelProperty("订货单位或订单编号")
+    private String orderingUnitNameOrOrderNo;
 }
 }

@@ -141,6 +141,10 @@
             <if test="vo.type != null and vo.type != ''">
             <if test="vo.type != null and vo.type != ''">
                 AND tb.type = #{vo.type}
                 AND tb.type = #{vo.type}
             </if>
             </if>
+            <if test="vo.orderingUnitNameOrOrderNo != null and vo.orderingUnitNameOrOrderNo != ''">
+                AND (cu.name LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%')
+                or tb.order_no LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%'))
+            </if>
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>

@@ -83,6 +83,10 @@
             <if test="vo.status != null and vo.status != ''">
             <if test="vo.status != null and vo.status != ''">
                 AND tb.status = #{vo.status}
                 AND tb.status = #{vo.status}
             </if>
             </if>
+            <if test="vo.orderingUnitNameOrOrderNo != null and vo.orderingUnitNameOrOrderNo != ''">
+                AND (cu.name LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%')
+                or tb.order_no LIKE CONCAT('%', #{vo.orderingUnitNameOrOrderNo},'%'))
+            </if>
         </where>
         </where>
         ORDER BY tb.update_time DESC
         ORDER BY tb.update_time DESC
     </select>
     </select>