From fdaef6479a6366b5f668fe3abeba563e0b58477d Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 2 Aug 2024 19:13:47 +0800
Subject: [PATCH] =?UTF-8?q?8/02=201.1=20=E8=8D=AF=E5=93=81=E5=87=BA?=
 =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=98=8E=E7=BB=86=E6=9F=A5=E8=AF=A2=E8=8D=AF?=
 =?UTF-8?q?=E5=93=81=E5=87=BA=E5=85=A5=E5=BA=93=E5=8D=95=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/glxp/api/req/inout/FilterOrderDetailResultRequest.java | 2 ++
 .../resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml  | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
index 00006be2..ba50fc9c 100644
--- a/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
+++ b/src/main/java/com/glxp/api/req/inout/FilterOrderDetailResultRequest.java
@@ -56,4 +56,6 @@ public class FilterOrderDetailResultRequest extends ListPageRequest {
     private String invoiceEncode;
     private List<String> actions;
     private List<IoOrderDetailResultResponse> list;
+
+    private Integer productType = 1;//默认耗材
 }
diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
index 44675d22..e300fbee 100644
--- a/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
+++ b/src/main/resources/mybatis/mapper/inout/IoOrderDetailResultDao.xml
@@ -49,6 +49,9 @@
             <if test="supId != null and supId != ''">
                 AND a2.supId = #{supId}
             </if>
+            <if test="productType != null and productType != ''">
+                AND bp.productsType = #{productType}
+            </if>
             <if test="nameCode != null and nameCode != ''">
                 AND a2.nameCode = #{nameCode}
             </if>