2024年5月22日17:18:12

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/dto/SaleDetail.java

@@ -82,5 +82,17 @@ public class SaleDetail {
 	@ExcelIgnore
 	private String storageId;
 
+	/**
+	 * 品牌
+	 */
+	@ExcelIgnore
+	private String code;
+
+	/**
+	 * 商品编码
+	 */
+	@ExcelIgnore
+	private String brandName;
+
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderItemsMapper.xml

@@ -172,6 +172,12 @@
         <if test="saleDetailDto.customerName !=null and saleDetailDto.customerName != ''">
             and po.customer_name like concat('%', #{saleDetailDto.customerName}, '%')
         </if>
+        <if test="saleDetailDto.code !=null and saleDetailDto.code != ''">
+            and poi.goods_no like concat('%', #{saleDetailDto.code}, '%')
+        </if>
+        <if test="saleDetailDto.brandName !=null and saleDetailDto.brandName != ''">
+            and poi.brand_name like concat('%', #{saleDetailDto.brandName}, '%')
+        </if>
         <if test="saleDetailDto.salerName !=null and saleDetailDto.salerName != ''">
             and po.saler_name like concat('%', #{saleDetailDto.salerName}, '%')
         </if>
@@ -334,6 +340,12 @@
         <if test="customerName !=null and customerName != ''">
             and po.customer_name like concat('%', #{customerName}, '%')
         </if>
+        <if test="code !=null and code != ''">
+            and poi.goods_no like concat('%', #{code}, '%')
+        </if>
+        <if test="brandName !=null and brandName != ''">
+            and poi.brand_name like concat('%', #{brandName}, '%')
+        </if>
         <if test="salerName !=null and salerName != ''">
             and po.saler_name like concat('%', #{salerName}, '%')
         </if>