新增耗材分类

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -722,6 +722,7 @@ public class UdiRelevanceController extends BaseController {
         udiRelevanceEntity.setGroupBuy(IntUtil.value(udiProductEntity.getGroupBuy()));
         udiRelevanceEntity.setPurType(udiProductEntity.getPurType());
         udiRelevanceEntity.setAttributeType(udiProductEntity.getAttributeType());
+        udiRelevanceEntity.setHcType(udiProductEntity.getHcType());
         udiRelevanceEntity.setUpdateTime(new Date());
         boolean b = udiRelevanceService.updateUdiRelevance(udiRelevanceEntity);
         if (udiProductEntity.getRelSupId() != null) {

src/main/java/com/glxp/api/controller/thrsys/ThrProductsAddDiController.java

@@ -228,6 +228,7 @@ public class ThrProductsAddDiController {
                     udiRelevanceEntity.setGroupBuy(thrProductsAddDiResponse.getGroupBuy());
                     udiRelevanceEntity.setPurType(thrProductsAddDiResponse.getPurType());
                     udiRelevanceEntity.setAttributeType(thrProductsAddDiResponse.getAttributeType());
+                    udiRelevanceEntity.setHcType(thrProductsAddDiResponse.getHcType());
                     udiProductEntity.setNameCode(null);
                     udiProductService.updateUdiInfoByUuid(udiProductEntity);
                     UdiRelevanceEntity udiRelevanceEntity1 = new UdiRelevanceEntity();

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

@@ -101,4 +101,8 @@ public class UdiProductEntity {
     private Long uid;
     private Integer purType;
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
 }

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

@@ -108,6 +108,12 @@ public class UdiRelevanceEntity {
     @TableField(value = "attributeType")
     private Integer attributeType;
 
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    @TableField(value = "hcType")
+    private Integer hcType;
+
     /**
      * 是否允许多次使用出库
      */

src/main/java/com/glxp/api/entity/thrsys/ThrProductsAddDiEntity.java

@@ -295,6 +295,14 @@ public class ThrProductsAddDiEntity {
      */
     @TableField(value = "attributeType")
     private Integer attributeType;
+
+
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    @TableField(value = "attributeType")
+    private Integer hcType;
+
     /**
      * 1第三方2自增
      */

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

@@ -59,6 +59,10 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
 
     private String corpId;
     private String billType;

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

@@ -53,6 +53,10 @@ public class FilterUdiInfoRequest extends ListPageRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String corpId;
     private String billType;
 

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

@@ -54,6 +54,10 @@ public class FilterUdiRelRequest extends ListPageRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String corpId;
     private String billType;
 

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

@@ -27,4 +27,8 @@ public class SupplementRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
 }

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

@@ -39,6 +39,10 @@ public class UdiRelevanceRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String supName;
     private String originUuid;
     private String price;

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

@@ -30,6 +30,10 @@ public class UdiRelevanceSaveRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private Boolean useMuti;
     private Integer useNum;
     private String supName;

src/main/java/com/glxp/api/req/thrsys/AddThrDiProductsRequest.java

@@ -55,6 +55,10 @@ public class AddThrDiProductsRequest {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
 
 
 }

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

@@ -66,6 +66,10 @@ public class CompanyProductRelevanceResponse {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private String scbssfbhph;
     private String scbssfbhxlh;
     private String scbssfbhscrq;

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

@@ -30,6 +30,14 @@ public class UdiRelevanceResponse {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+
+
+    /**
+     * 耗材分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
+
+
     private Boolean useMuti;
     private Integer useNum;
     private String supName;

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

@@ -68,6 +68,10 @@ public class UdiInfoResponse {
      * 产品属性类型  0:未定义；1：设备（用于设备管理)；2：耗材；3.伴随服务费
      */
     private Integer attributeType;
+    /**
+     * 产品分类高值 ：1：高值耗材；2.普通耗材
+     */
+    private Integer hcType;
     private boolean isDisable;
     private boolean useMuti;
 

src/main/java/com/glxp/api/service/thrsys/impl/ThrProductsAddDiService.java

@@ -133,6 +133,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             thrProductsAddDiEntity.setPrice(thrDiProductsRequest.getPrice());
             thrProductsAddDiEntity.setPurType(thrDiProductsRequest.getPurType());
             thrProductsAddDiEntity.setAttributeType(thrDiProductsRequest.getAttributeType());
+            thrProductsAddDiEntity.setHcType(thrDiProductsRequest.getHcType());
             thrProductsAddDiEntity.setCreateTime(date);
             thrProductsAddDiEntity.setUpdateTime(new Date());
             thrProductsAddDiEntity.setStatus(1); //..
@@ -160,7 +161,7 @@ public class ThrProductsAddDiService extends ServiceImpl<ThrProductsAddDiDao, Th
             udiInfoResponse.setPrice(thrProductsAddDiEntity.getPrice());
             udiInfoResponse.setPurType(thrProductsAddDiEntity.getPurType());
             udiInfoResponse.setAttributeType(thrProductsAddDiEntity.getAttributeType());
-
+            udiInfoResponse.setHcType(thrProductsAddDiEntity.getHcType());
             udiInfoResponse.setBasicPrductRemak1(thrProductsAddDiEntity.getBasicPrductRemak1());
             udiInfoResponse.setBasicPrductRemak2(thrProductsAddDiEntity.getBasicPrductRemak2());
             udiInfoResponse.setBasicPrductRemak3(thrProductsAddDiEntity.getBasicPrductRemak3());

src/main/java/com/glxp/api/util/SupplementVailUtil.java

@@ -91,6 +91,19 @@ public class SupplementVailUtil {
                 }
             }
 
+            basicProductSetEntity = basicProductSetEntityMap.get("attributeType");
+            if (isMustFill(type, basicProductSetEntity)) {
+                if (StrUtil.isEmptyIfStr(supplementRequest.getAttributeType())) {
+                    return "产品属性不能为空";
+                }
+            }
+            basicProductSetEntity = basicProductSetEntityMap.get("hcType");
+            if (isMustFill(type, basicProductSetEntity)) {
+                if (StrUtil.isEmptyIfStr(supplementRequest.getHcType())) {
+                    return "耗材分类不能为空";
+                }
+            }
+
             basicProductSetEntity = basicProductSetEntityMap.get("basicPrductRemak1");
             if (isMustFill(type, basicProductSetEntity)) {
                 if (StrUtil.isEmpty(supplementRequest.getBasicPrductRemak1())) {

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

@@ -99,7 +99,7 @@
                customer_info.companyName,
                basic_udirel.mainId,
                basic_udirel.isAdavence,
-               basic_udirel.purType,basic_udirel.attributeType,
+               basic_udirel.purType,basic_udirel.attributeType,basic_udirel.hcType,
                basic_products.scbssfbhph,
                basic_products.scbssfbhxlh,
                basic_products.scbssfbhscrq,

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

@@ -962,7 +962,7 @@
                 INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, purType, attributeType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 lockStatus, isAdavence, purType, attributeType,hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
                  createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -979,7 +979,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence}, #{purType},#{attributeType},
+                #{isAdavence}, #{purType},#{attributeType},#{hcType}
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -998,7 +998,7 @@
         INTO basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, purType,attributeType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 lockStatus, isAdavence, purType,attributeType,hcType, useMuti, useNum, supName, createTime, updateTime, modifyTime,
                  createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -1015,7 +1015,7 @@
                 #{isDisable},
                 #{isLock},
                 #{lockStatus},
-                #{isAdavence}, #{purType},#{attributeType},
+                #{isAdavence}, #{purType},#{attributeType},#{hcType}
                 #{useMuti},
                 #{useNum},
                 #{supName},
@@ -1095,6 +1095,9 @@
             <if test="attributeType != null">
                 attributeType=#{attributeType},
             </if>
+            <if test="hcType != null">
+                hcType=#{hcType},
+            </if>
 
             <if test="useMuti != null">
                 useMuti=#{useMuti},
@@ -1175,7 +1178,7 @@
                 into basic_udirel
                 (id, uuid, mainId, thirdId, thirdId1, thirdId2, thirdId3, thirdId4, udplatCode, isUseDy, isDisable,
                  isLock,
-                 lockStatus, isAdavence, purType, attributeType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
+                 lockStatus, isAdavence, purType, attributeType,hcType,useMuti, useNum, supName, createTime, updateTime, modifyTime,
                  createUser,
                  updateUser,
                  remark, useExpireTime, dispatch, groupBuy, needCert)
@@ -1195,7 +1198,7 @@
              #{item.isDisable},
              #{item.isLock},
              #{item.lockStatus},
-             #{item.isAdavence}, #{item.purType},#{item.attributeType},
+             #{item.isAdavence}, #{item.purType},#{item.attributeType},#{item.hcType},
              #{item.useMuti},
              #{item.useNum},
              #{item.supName},

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

@@ -46,7 +46,7 @@
                basic_udirel.lockStatus,
                basic_udirel.mainId,
                basic_udirel.isAdavence,
-               basic_udirel.purType,basic_udirel.attributeType,
+               basic_udirel.purType,basic_udirel.attributeType,basic_udirel.hcType,
                basic_udirel.lowStockNum,
                basic_udirel.overStockNum,
                basic_udirel.recentDateTime,

src/main/resources/mybatis/mapper/thrsys/ThrProductsAddDiDao.xml

@@ -16,7 +16,7 @@
                                          qxlb, tyshxydm, zczbhhzbapzbh,
                                          ylqxzcrbarmc, ylqxzcrbarywmc, updateTime,
                                          supName, model, `standard`,
-                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType)
+                                         qtbm, zczyxqz, relId, type, deviceRecordKey, groupBuy, purType,attributeType,hcType)
                 values
         <foreach collection="list" index="index" item="item" separator=",">
             (#{item.uuid},
@@ -42,7 +42,7 @@
                     , #{item.flbm}, #{item.qxlb}, #{item.tyshxydm}, #{item.zczbhhzbapzbh}
                     , #{item.ylqxzcrbarmc}, #{item.ylqxzcrbarywmc}, #{item.updateTime}, #{item.supName}, #{item.model}
                     , #{item.standard}, #{item.qtbm}, #{item.standard}, #{item.zczyxqz}, #{item.type},
-             #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType})
+             #{item.deviceRecordKey}, #{item.groupBuy}, #{item.purType},#{item.attributeType},#{item.hcType})
         </foreach>
     </insert>
 
@@ -133,6 +133,10 @@
             <if test="attributeType != null">
                 `attributeType`=#{attributeType},
             </if>
+            <if test="hcType != null">
+                `hcType`=#{hcType},
+            </if>
+
         </trim>
         WHERE id = #{id}
     </update>

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

@@ -675,13 +675,23 @@ CALL Pro_Temp_ColumnWork('sys_menu_help', 'urlPath', 'varchar(255)', 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);
-
+CALL Pro_Temp_ColumnWork('basic_udirel', 'hcType', 'tinyint   NULL DEFAULT NULL COMMENT ''产品分类高值 ：1：高值耗材；2.普通耗材''', 1);
 CALL Pro_Temp_ColumnWork('thr_products_add_di', 'purType', 'tinyint', 1);
 CALL Pro_Temp_ColumnWork('thr_products_add_di', 'attributeType', 'tinyint', 1);
+CALL Pro_Temp_ColumnWork('thr_products_add_di', 'hcType',
+                         'tinyint  NULL DEFAULT NULL COMMENT ''产品分类高值 ：1：高值耗材；2.普通耗材''', 1);
 INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`,
                                      `sort`, `localEdit`)
 VALUES (33, '采购类型', 'purType', 1, 1, 1, 0, '采购类型是否必填字段', 65, 1);
 
+INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`,
+                                     `sort`, `localEdit`)
+VALUES (44, '产品属性', 'attributeType', 1, 1, 1, 0, '产品属性是否必填字段', 65, 1);
+
+INSERT ignore INTO basic_product_set(`id`, `parmName`, `parmKey`, `enable`, `supSelect`, `supAdd`, `localAdd`, `remark`,
+                                     `sort`, `localEdit`)
+VALUES (45, '耗材分类', 'hcType', 1, 1, 1, 0, '耗材分类是否必填字段', 65, 1);
+
 
 CALL Pro_Temp_ColumnWork('basic_bustype_pre', 'splitOrder', 'tinyint', 1);