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 @@
AND ip.reCount 0
+
+ AND basic_udirel.attributeType = #{attributeType}
+
AND ip.invCode in
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