新增产品属性

src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java

@@ -103,6 +103,11 @@ public class UdiRelevanceEntity {
      */
     @TableField(value = "purType")
     private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    @TableField(value = "attributeType")
+    private Integer attributeType;
     /**
      * 是否允许多次使用出库
      */

src/main/java/com/glxp/api/req/basic/CompanyProductRelevanceRequest.java

@@ -54,7 +54,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
-
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String corpId;
     private String billType;
     private String manufactory;

src/main/java/com/glxp/api/req/basic/FilterUdiInfoRequest.java

@@ -50,6 +50,10 @@ public class FilterUdiInfoRequest extends ListPageRequest {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String corpId;
     private String billType;
 

src/main/java/com/glxp/api/req/basic/FilterUdiRelRequest.java

@@ -55,6 +55,10 @@ public class FilterUdiRelRequest extends ListPageRequest {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String corpId;
     private String billType;
 

src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java

@@ -34,6 +34,10 @@ public class UdiRelevanceRequest {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String supName;
     private String originUuid;
     private String price;

src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java

@@ -26,6 +26,11 @@ public class UdiRelevanceSaveRequest {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
+
     private Boolean useMuti;
     private Integer useNum;
     private String supName;

src/main/java/com/glxp/api/res/basic/CompanyProductRelevanceResponse.java

@@ -6,7 +6,7 @@ import lombok.Data;
 public class CompanyProductRelevanceResponse {
 
     private Long id;
-    private Long  rlId;
+    private Long rlId;
     private String thirdId;
     private String thirdName;
     private String uuid;
@@ -62,7 +62,10 @@ public class CompanyProductRelevanceResponse {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
-
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private String scbssfbhph;
     private String scbssfbhxlh;
     private String scbssfbhscrq;

src/main/java/com/glxp/api/res/basic/UdiRelevanceResponse.java

@@ -27,6 +27,10 @@ public class UdiRelevanceResponse {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private Boolean useMuti;
     private Integer useNum;
     private String supName;

src/main/java/com/glxp/api/res/thrsys/UdiInfoResponse.java

@@ -64,6 +64,10 @@ public class UdiInfoResponse {
      * 采购类型  1:入账产品；2：预验收产品；3：寄售产品
      */
     private Integer purType;
+    /**
+     * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
+     */
+    private Integer attributeType;
     private boolean isDisable;
     private boolean useMuti;
 

src/main/resources/mybatis/mapper/basic/CompanyProductRelevanceDao.xml

@@ -100,6 +100,7 @@
                basic_udirel.mainId,
                basic_udirel.isAdavence,
                basic_udirel.purType,
+               basic_udirel.attributeType,
                basic_products.scbssfbhph,
                basic_products.scbssfbhxlh,
                basic_products.scbssfbhscrq,

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1228,7 +1228,7 @@
                 INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence,purType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+                 lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
@@ -1244,7 +1244,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence},#{purType},
+                #{isAdavence},#{purType},#{attributeType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -1263,7 +1263,7 @@
         INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence,purType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+                 lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
         values (#{id},
@@ -1279,7 +1279,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence},#{purType},
+                #{isAdavence},#{purType},#{attributeType},
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -1356,6 +1356,9 @@
             <if test="purType != null">
                 purType=#{purType},
             </if>
+            <if test="attributeType != null">
+                attributeType=#{attributeType},
+            </if>
             <if test="useMuti != null">
                 useMuti=#{useMuti},
             </if>
@@ -1435,7 +1438,7 @@
         into basic_udirel
         (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
         isLock,
-        lockStatus, isAdavence,purType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
+        lockStatus, isAdavence,purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime, createUser,
         updateUser,
         remark, useExpireTime, dispatch, groupBuy, needCert)
         values
@@ -1454,7 +1457,7 @@
             #{item.isDisable},
             #{item.isLock},
             #{item.lockStatus},
-            #{item.isAdavence},#{item.purType},
+            #{item.isAdavence},#{item.purType},#{item.attributeType},
             #{item.useMuti},
             #{item.useNum},
             #{item.supName},

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -47,6 +47,7 @@
                basic_udirel.mainId,
                basic_udirel.isAdavence,
                basic_udirel.purType,
+               basic_udirel.attributeType,
                basic_udirel.lowStockNum,
                basic_udirel.overStockNum,
                basic_udirel.recentDateTime,

src/main/resources/schemas/schema_v2.4.sql

@@ -504,6 +504,7 @@ SET FOREIGN_KEY_CHECKS = 1;
 
 CALL Pro_Temp_ColumnWork('thr_corp', 'kfdm', 'varchar(255)', 1);
 CALL Pro_Temp_ColumnWork('basic_udirel', 'purType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('basic_udirel', 'attributeType', 'tinyint', 1);
 
 
 INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`,