新增耗材类别校验

src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java

@@ -429,6 +429,18 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
+        //是否校验耗材材质  1：高值耗材；2.普通耗材
+        if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+            if (IntUtil.value(udiInfoEntity.getHcType()) != 1) {
+                return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
+            }
+        } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+            if (IntUtil.value(udiInfoEntity.getHcType()) != 2) {
+                return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+            }
+        }
+
+
         String orderId = addOrderRequest.getBillNo();
 
         //三期校验

src/main/java/com/glxp/api/controller/inout/IoOrderDetailBizController.java

@@ -201,6 +201,17 @@ public class IoOrderDetailBizController extends BaseController {
                 }
             }
 
+            //是否校验耗材材质  1：高值耗材；2.普通耗材
+            if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 1)) {
+                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 1) {
+                    return ResultVOUtils.error(500, "单据只允许录入高值耗材" + ",请检查后重试！");
+                }
+            } else if (IntUtil.value(bussinessTypeEntity.getVailHcType() == 2)) {
+                if (IntUtil.value(udiRelevanceResponse.getHcType()) != 2) {
+                    return ResultVOUtils.error(500, "单据只允许录入普通耗材" + ",请检查后重试！");
+                }
+            }
+
             if (IntUtil.value(bussinessTypeEntity.getCheckCertExpire()) == 2 && udiRelevanceResponse.isNeedCert()) {
                 SupProductEntity supProductEntity = supProductService.findExitByManufactury(udiRelevanceResponse.getCpmctymc(), udiRelevanceResponse.getManufactory(), authAdmin.getCustomerId());
                 if (supProductEntity != null && (supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_PASS || supProductEntity.getAuditStatus() == ConstantStatus.AUDIT_CHANGE_PASS)) {

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

@@ -453,4 +453,12 @@ public class BasicBussinessTypeEntity {
     @TableField(value = "vailProductAttributes")
     private Integer vailProductAttributes;
 
+
+    /**
+     * 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材
+     */
+    @TableField(value = "vailHcType")
+    private Integer vailHcType;
+
+
 }

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

@@ -159,4 +159,6 @@ public class UdiProductEntity {
     @TableField(value = "catalogCode3")
     @ApiModelProperty(value = "三级分类名称(部位、功能、品种）")
     private Integer catalogCode3;
+
+
 }

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

@@ -311,4 +311,8 @@ public class BussinessTypeSaveRequest {
     private Integer inPreInBack;
 
     private Integer vailProductAttributes;
+    /**
+     * 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材
+     */
+    private Integer vailHcType;
 }

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

@@ -86,4 +86,11 @@ public class CompanyProductRelevanceRequest extends ListPageRequest {
 
     private List<Long> customerIds;
 
+
+    /**
+     * 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材
+     */
+    private Integer vailHcType;
+
+
 }

src/main/java/com/glxp/api/req/inv/FilterInvProductRequest.java

@@ -105,6 +105,6 @@ public class FilterInvProductRequest extends ListPageRequest {
 
 
     private Integer filterNoInv;
-
+    private Integer highValue;
 
 }

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

@@ -179,5 +179,9 @@ public class BasicBussinessTypeResponse {
 
     private Integer vailProductAttributes;
 
+    /**
+     * 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材
+     */
+    private Integer vailHcType;
 
 }

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

@@ -173,7 +173,7 @@
 
     <select id="findByNameCode" parameterType="java.lang.String"
             resultType="com.glxp.api.entity.basic.UdiProductEntity">
-        SELECT basic_products.*,basic_udirel.purType
+        SELECT basic_products.*, basic_udirel.purType, basic_udirel.hcType
         FROM basic_products
                      LEFT JOIN basic_udirel ON basic_udirel.uuid = basic_products.uuid
         WHERE (basic_products.nameCode = #{nameCode})
@@ -956,7 +956,6 @@
             <if test="catalogCode3 != null">
                 catalogCode3=#{catalogCode3},
             </if>
-
         </trim>
         where id = #{id}
     </update>

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

@@ -819,8 +819,52 @@ CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailProductAttributes',
 CALL Pro_Temp_ColumnWork('auth_user', 'lastUpdatePwdTime', 'datetime', 1);
 
 
-call Modify_UNIQUE_index('thr_products_add_di', '`uuid`, `customerId`', 'uniqueUuid', 'BTREE');
-
+/*创建定义唯一索引函数*/
+DROP PROCEDURE IF EXISTS Modify_UNIQUE_index;
+
+CREATE PROCEDURE Modify_UNIQUE_index(
+    TableName VARCHAR(50),
+    ColumnNames VARCHAR(500),
+    idx_name VARCHAR(50),
+    idx_type VARCHAR(50))
+BEGIN
+    DECLARE
+        Rows1 int;
+    DECLARE
+        SqlStr VARCHAR(4000);
+    DECLARE
+        target_database VARCHAR(100);
+    SELECT DATABASE
+               ()
+    INTO target_database;
+
+    SET Rows1 = 0;
+    SELECT COUNT(*)
+    INTO Rows1
+    FROM information_schema.statistics
+    WHERE table_schema = DATABASE()
+      AND upper(table_name) = upper(TableName)
+      AND upper(index_name) = upper(idx_name);
+    IF Rows1 <= 0 THEN
+        SET SqlStr :=
+                CONCAT('alter table ', TableName, ' ADD UNIQUE INDEX ', idx_name, '(', ColumnNames, ') USING ',
+                       idx_type);
+    END IF;
+    IF
+        (SqlStr <> '') THEN
+
+        SET @SQL1 = SqlStr;
+        PREPARE stmt1
+            FROM
+            @SQL1;
+        EXECUTE stmt1;
+
+    END IF;
+
+END;
 
+call Modify_UNIQUE_index('thr_products_add_di', '`uuid`, `customerId`', 'uniqueUuid', 'BTREE');
 
 
+CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'vailHcType',
+                         'tinyint    NULL DEFAULT NULL COMMENT '' 校验耗材类型 ：0:不耗材；1:高值耗材；2:无普通耗材''', 1);