From 493b1b6ca65dcaff26f2470b699204a34b957f41 Mon Sep 17 00:00:00 2001
From: chenhc <2369838784@qq.com>
Date: Thu, 21 Mar 2024 10:55:11 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86-?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E7=99=BB=E8=AE=B0-=E5=8A=A8=E6=80=81?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BD=E5=AD=90=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/glxp/api/req/inv/FilterInvProductRequest.java  | 5 +++++
 src/main/resources/mybatis/mapper/inv/invProductDao.xml     | 3 +++
 src/main/resources/schemas/schema_v2.4.sql                  | 6 +++---
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
index 16a4708e8..56a201857 100644
--- a/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
+++ b/src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java
@@ -128,5 +128,10 @@ public class FilterInvProductRequest extends ListPageRequest {
 
     private Long compareId;
 
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
+
 
 }
diff --git a/src/main/resources/mybatis/mapper/inv/invProductDao.xml b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
index 8c3b9db21..141f6af50 100644
--- a/src/main/resources/mybatis/mapper/inv/invProductDao.xml
+++ b/src/main/resources/mybatis/mapper/inv/invProductDao.xml
@@ -87,6 +87,9 @@
             <if test="filterNoInv != null and filterNoInv == 3">
                 AND ip.reCount <![CDATA[ < ]]> 0
             </if>
+            <if test="attributeType != '' and attributeType != null">
+                AND basic_udirel.attributeType =  #{attributeType}
+            </if>
             <if test="invCodes != null and invCodes.size() != 0">
                 AND ip.invCode in
                 <foreach collection="invCodes" item="item" index="index" open="(" close=")" separator=",">
diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql
index 9b12cc7bb..1bf4c20bc 100644
--- a/src/main/resources/schemas/schema_v2.4.sql
+++ b/src/main/resources/schemas/schema_v2.4.sql
@@ -1809,11 +1809,11 @@ values (7, 2, '停用', '1', 'sys_normal_disable', '', 'danger', 'N', '0', 'admi
 insert IGNORE into sys_dict_type
 values (4, '设备来源', 'device_source_type', '0', 'admin', sysdate(), '', null, '设备来源列表');
 insert IGNORE into sys_dict_data
-values (8, 1, '采购', '1', 'device_source_type', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, '采购类型');
+values (8, 1, '采购', '1', 'device_source_type', '', 'primary', 'Y', '0', 'admin', sysdate(), '', null, 'chooseProductFlag');
 insert IGNORE into sys_dict_data
-values (9, 2, '赠与', '2', 'device_source_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '赠与类型');
+values (9, 2, '赠与', '2', 'device_source_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, 'selectInvProductVisible');
 insert IGNORE into sys_dict_data
-values (10, 3, '寄售', '3', 'device_source_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, '寄售类型');
+values (10, 3, '寄售', '3', 'device_source_type', '', 'primary', 'N', '0', 'admin', sysdate(), '', null, 'chooseProductFlag');
 
 
 ALTER TABLE sys_dict_data