feat: 设备管理-设备登记-动态加载子组件

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;
+
 
 }

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=",">

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