药品字典修改

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

@@ -537,6 +537,28 @@ public class IoCodeTempController extends BaseController {
 
 
         UdiRelevanceResponse udiRelevanceResponse = udiRelevanceService.selectByNameCode(udiEntity.getUdi());
+        //判断层级标识是否正确
+        if (bussinessTypeEntity.isUse()) {
+            if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+
+            if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+            if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+        } else {
+            if (udiRelevanceResponse.getDistributeMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+            if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+        }
+
+
         //近效期提醒
 //        SystemParamConfigEntity recentParamConfigEntity = systemParamConfigService.selectByParamKey("recent_date_tip");
         long recent = 0;
@@ -1042,6 +1064,35 @@ public class IoCodeTempController extends BaseController {
             }
         }
 
+        //判断层级标识是否正确
+        if (bussinessTypeEntity.isUse()) {
+            if (udiRelevanceResponse.getUseMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getUseMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+
+            if (udiRelevanceResponse.getUseMaxLevel() == null && IntUtil.value(udiRelevanceResponse.getPackLevel()) > 1) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+            if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getUseLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+
+        } else {
+            if (udiRelevanceResponse.getDistributeMaxLevel() != null && IntUtil.value(udiRelevanceResponse.getDistributeMaxLevel()) < IntUtil.value(udiRelevanceResponse.getPackLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+            if (IntUtil.value(udiRelevanceResponse.getPackLevel()) < IntUtil.value(udiRelevanceResponse.getDistributeLevel())) {
+                return ResultVOUtils.error(500, "当前产品不支持采集该包装层级追溯码！");
+            }
+        }
+
+        if (IntUtil.value(udiRelevanceResponse.getPackLevel()) == 0) {
+            RelCodeDetailResponse relCodeDetailResponse = relCodeDetailService.findByCode(code);
+            if (relCodeDetailResponse == null) {
+                return ResultVOUtils.error(500, "请先上传关联关系！");
+            }
+        }
+
         //先生成扫码单据
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         String inBatch = "";

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

@@ -38,25 +38,28 @@
     </sql>
 
     <select id="selectDrugsByNameCodes" resultType="int">
-        SELECT count(1) FROM third_ali_drug WHERE nameCode =  #{nameCode}
+        SELECT count(1)
+        FROM third_ali_drug
+        WHERE nameCode = #{nameCode}
     </select>
 
     <!-- 自定义saveOrUpdateBatch方法 -->
     <insert id="saveOrUpdateBatch" parameterType="com.glxp.api.entity.thrsys.ThirdAliDrug">
-        INSERT INTO third_ali_drug (`type`, manufacturer, cpmctymc, form, formSpec, bzgg, spmc, nameCode, packRatio,
+        replace INTO third_ali_drug (`type`, manufacturer, cpmctymc, form, formSpec, bzgg, spmc, nameCode, packRatio,
-                             packLevel, createTime, updateTime,erpId)
+                                     packLevel, createTime, updateTime, erpId, approvalNum)
         VALUES
         <foreach collection="list" item="item" separator="," index="index">
-            (#{item.type}, #{item.manufacturer}, #{item.cpmctymc}, #{item.form}, #{item.formSpec}, #{item.bzgg}, #{item.spmc}, #{item.nameCode},
+            (#{item.type}, #{item.manufacturer}, #{item.cpmctymc}, #{item.form}, #{item.formSpec}, #{item.bzgg},
-             #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId})
+             #{item.spmc}, #{item.nameCode},
+             #{item.packRatio}, #{item.packLevel}, #{item.createTime}, #{item.updateTime}, #{item.erpId},
+             #{item.approvalNum})
         </foreach>
     </insert>
 
 
-
+    <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThirdAliDrugRequest"
-      <select id="filterList" parameterType="com.glxp.api.req.thrsys.ThirdAliDrugRequest" resultType="com.glxp.api.entity.thrsys.ThirdAliDrug">
+            resultType="com.glxp.api.entity.thrsys.ThirdAliDrug">
-    select
+        select id,
-        id,
                `type`,
                manufacturer,
                cpmctymc,
@@ -80,5 +83,4 @@
             </if>
         </where>
     </select>
-
 </mapper>

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

@@ -1045,7 +1045,8 @@ CALL Pro_Temp_ColumnWork('io_code_temp', 'drugLink',
                          ' tinyint NULL DEFAULT b''0''COMMENT ''药品关联关系是否存在 0不存在 1存在''',
                          1);
 
-CREATE TABLE IF NOT EXISTS  `rel_code_batch` (
+CREATE TABLE IF NOT EXISTS `rel_code_batch`
+(
     `id`             int NOT NULL AUTO_INCREMENT,
     `productCode`    varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  DEFAULT NULL COMMENT '产品编码',
     `subTypeNo`      varchar(40) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci  DEFAULT NULL COMMENT '类型编码',
@@ -1067,9 +1068,13 @@ CREATE TABLE IF NOT EXISTS  `rel_code_batch` (
     `uploadFlagDown` tinyint(1)                                                    DEFAULT '0' COMMENT '0 未上传 1已上传 2上传失败',
     `erpId`          varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '供应商ID',
     PRIMARY KEY (`id`) USING BTREE
-    ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci;
 
-CREATE TABLE IF NOT EXISTS  `rel_code_detail` (
+CREATE TABLE IF NOT EXISTS `rel_code_detail`
+(
     `id`         int NOT NULL AUTO_INCREMENT,
     `curCode`    varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '当前条码',
     `packLayer`  tinyint                                                      DEFAULT NULL COMMENT '包装级别',
@@ -1077,7 +1082,10 @@ CREATE TABLE IF NOT EXISTS  `rel_code_detail` (
     `flag`       tinyint                                                      DEFAULT NULL COMMENT '状态',
     `batchIdFk`  int                                                          DEFAULT NULL COMMENT '产品批次ID外键',
     PRIMARY KEY (`id`) USING BTREE
-    ) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci;
+) ENGINE = InnoDB
+  AUTO_INCREMENT = 1
+  DEFAULT CHARSET = utf8mb4
+  COLLATE = utf8mb4_0900_ai_ci;
 
 
 CREATE TABLE if not exists `third_ali_drug`
@@ -1164,7 +1172,13 @@ CALL Pro_Temp_ColumnWork('rel_code_batch', 'threeLevelCount',
                          1);
 
 
+CALL Pro_Temp_ColumnWork('third_ali_drug', 'erpId',
+                         ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''供应商ID''',
+                         1);
 
 CALL Pro_Temp_ColumnWork('third_ali_drug', 'approvalNum',
                          ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''批准文号''',
                          1);
+
+
+call Modify_index('third_ali_drug', 'approvalNum', 'approvalNum', 'BTREE');