diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index ec0177de..80542412 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -314,4 +314,15 @@ public class UdiRelevanceEntity { @TableField(value = "detailSort") private Integer detailSort; + + + /** + * 无码类型 0、默认不是无码类型;1、部分早期未赋予追溯码;5、最小包装无追溯码;6、无追溯码;7、其他原因 + */ + private Integer notCodeType; + + /** + * 是否已经人工审核 0:未审核;1:已审核 + */ + private Integer manuReview; } diff --git a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java index 318d4503..614eb39e 100644 --- a/src/main/java/com/glxp/api/req/basic/AddProductRequest.java +++ b/src/main/java/com/glxp/api/req/basic/AddProductRequest.java @@ -300,4 +300,16 @@ public class AddProductRequest { * 明细分类 */ private Integer detailSort; + + + /** + * 无码类型 0、默认不是无码类型;1、部分早期未赋予追溯码;5、最小包装无追溯码;6、无追溯码;7、其他原因 + */ + private Integer notCodeType; + + /** + * 是否已经人工审核 0:未审核;1:已审核 + */ + private Integer manuReview; + private Integer bhxjsl; } diff --git a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java index 397590d5..c79ab085 100644 --- a/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java +++ b/src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java @@ -147,6 +147,7 @@ public class UdiProductServiceImpl implements UdiProductService { return false; return udiProductDao.updateUdiInfoByUuid(udiProductEntity); } + @Override public boolean updateUdiInfoById(UdiProductEntity udiProductEntity) { return udiProductDao.updateUdiInfoById(udiProductEntity); @@ -191,9 +192,12 @@ public class UdiProductServiceImpl implements UdiProductService { udiRelevanceEntity = udiRelevanceDao.selectById(addProductRequest.getRelId()); List udiProductEntities = udiProductDao.findByUuids(udiRelevanceEntity.getUuid()); for (UdiProductEntity udiProductEntity : udiProductEntities) { + if (addProductRequest.getNameCode().equals(udiProductEntity.getNameCode())) { + udiProductEntity.setBhxjsl(addProductRequest.getBhxjsl()); + } addProductRequest.setNameCode(udiProductEntity.getNameCode()); addProductRequest.setId(udiProductEntity.getId()); - BeanUtils.copyProperties(addProductRequest, udiProductEntity,"packRatio"); + BeanUtils.copyProperties(addProductRequest, udiProductEntity, "packRatio", "bhxjsl"); udiProductEntity.setCpmctymc(addProductRequest.getCpmctymc()); udiProductEntity.setProductsType(2); udiProductEntity.setGgxh(addProductRequest.getSpec()); @@ -225,6 +229,8 @@ public class UdiProductServiceImpl implements UdiProductService { udiRelevanceEntity.setDistributeMaxLevel(addProductRequest.getDistributeMaxLevel()); udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime()); udiRelevanceEntity.setDetailSort(addProductRequest.getDetailSort()); + udiRelevanceEntity.setManuReview(addProductRequest.getManuReview()); + udiRelevanceEntity.setNotCodeType(addProductRequest.getNotCodeType()); udiRelevanceEntity.setUpdateTime(new Date()); udiRelevanceDao.updateById(udiRelevanceEntity); updateLevelCount(udiRelevanceEntity); @@ -521,7 +527,7 @@ public class UdiProductServiceImpl implements UdiProductService { List list = ybDrugService.getList(ybHcflDetailFilterRequest); YbDrug ybDrug; - if (thrProductsEntity !=null && !CollUtil.isEmpty(list) + if (thrProductsEntity != null && !CollUtil.isEmpty(list) && !CollUtil.isEmpty(thirdAliDrugList)) { ybDrug = list.get(0); // 多码融合表拼接参数 @@ -538,12 +544,12 @@ public class UdiProductServiceImpl implements UdiProductService { } // 设置新增多玛融合库 - BasicProductsCreateDto basicProductsCreateDto =new BasicProductsCreateDto(); + BasicProductsCreateDto basicProductsCreateDto = new BasicProductsCreateDto(); basicProductsCreateDto.setAddCodeRelMark(true); UdiRelevanceEntity udiRelevanceEntity = new UdiRelevanceEntity(); udiRelevanceEntity.setUuid(thirdAliDrugRequest.getUuid()); - udiContrastService.disposeDrugData(basicProductsCreateDto,thrProductsEntity,ybDrug,thirdAliDrugList,udiRelevanceEntity); + udiContrastService.disposeDrugData(basicProductsCreateDto, thrProductsEntity, ybDrug, thirdAliDrugList, udiRelevanceEntity); return ResultVOUtils.success(detailSort); } diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index ba6d8b5d..c99aa626 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -686,7 +686,8 @@ INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2105, 84, '2', 1, 'code', 'DI产品标识', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2105, 84, '2', 1, 'code', 'DI产品标识', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, @@ -707,7 +708,8 @@ INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2108, 84, '2', 1, 'registerNo', '注册证编号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2108, 84, '2', 1, 'registerNo', '注册证编号', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, @@ -715,7 +717,8 @@ INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) VALUES (2109, 84, '2', 1, 'checkStatus', '审核状态', 'select', NULL, NULL, - '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\",\"\":\"全部\"}', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\",\"\":\"全部\"}', NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, @@ -729,42 +732,48 @@ INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2111, 84, '1', 1, 'code', '物资产品标识', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2111, 84, '1', 1, 'code', '物资产品标识', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2112, 84, '1', 1, 'name', '物资名称', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2112, 84, '1', 1, 'name', '物资名称', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2113, 84, '1', 1, 'spec', '规格型号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2113, 84, '1', 1, 'spec', '规格型号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2114, 84, '1', 1, 'ylqxzcrbarmc', '医疗器械注册人', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, +VALUES (2114, 84, '1', 1, 'ylqxzcrbarmc', '医疗器械注册人', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2115, 84, '1', 1, 'registerNo', '注册证编号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2115, 84, '1', 1, 'registerNo', '注册证编号', 'text', NULL, NULL, NULL, NULL, 1, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2116, 84, '1', 1, 'status', '审核状态', 'laber', '', NULL, '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\"}', NULL, 1, +VALUES (2116, 84, '1', 1, 'status', '审核状态', 'laber', '', NULL, + '{\"1\":\"未审核\",\"2\":\"已审核\",\"3\":\"未通过\"}', NULL, 1, '', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, @@ -816,7 +825,8 @@ INSERT ignore INTO sys_custom_config_detail (`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2118, 32, '1', 1, 'internalMaterialCode', '内部物资编码', 'text', NULL, NULL, NULL, NULL, 1, NULL, 99, NULL, NULL, +VALUES (2118, 32, '1', 1, 'internalMaterialCode', '内部物资编码', 'text', NULL, NULL, NULL, NULL, 1, NULL, 99, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_param_config (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) @@ -826,14 +836,16 @@ INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2019, 18, '2', 1, 'mainId', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2019, 18, '2', 1, 'mainId', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, `columnType`, `colorRule`, `sort`, `lableRule`, `width`, `tooltip`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2020, 22, '2', 1, 'internalMaterialCode', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2020, 22, '2', 1, 'internalMaterialCode', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `columnName`, `columnDesc`, @@ -841,12 +853,14 @@ INSERT ignore INTO sys_custom_config_detail(`id`, `configId`, `type`, `isShow`, `buttonRule`, `number`, `lineNumber`, `clickFuc`, `size`, `style`, `disabled`, `checkRules`, `inputType`, `disabledFuc`, `expression`, `dataFuc`, `isShowXx`) -VALUES (2021, 8, '2', 1, 'mainIdLike', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, +VALUES (2021, 8, '2', 1, 'mainIdLike', '内部物资编码', 'input', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, + NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL); CALL Pro_Temp_ColumnWork('basic_bussiness_type', 'codeCheck', - 'tinyint NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 :0:不校验;1:只允许录入扫码产品;2:只允许录入不扫码产品''', 1); + 'tinyint NULL DEFAULT NULL COMMENT '' 是否开启校验扫码 :0:不校验;1:只允许录入扫码产品;2:只允许录入不扫码产品''', + 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1); CALL Pro_Temp_ColumnWork('basic_products', 'productsType', @@ -985,7 +999,8 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'isStack', 'tinyint', 1); # 2024 1015增加字段 CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadFlag', ' tinyint DEFAULT NULL', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'uploadMsg', ' varchar(1024) DEFAULT NULL', 1); -CALL Pro_Temp_ColumnWork('basic_udirel', 'distributeMaxLevel', ' int DEFAULT NULL COMMENT ''配送时允许采集的最大层级:''', 1); +CALL Pro_Temp_ColumnWork('basic_udirel', 'distributeMaxLevel', + ' int DEFAULT NULL COMMENT ''配送时允许采集的最大层级:''', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'useMaxLevel', ' int DEFAULT NULL COMMENT ''使用时允许采集的最大层级''', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'splitEnable', ' tinyint DEFAULT NULL', 1); CALL Pro_Temp_ColumnWork('basic_udirel', 'useLevel', ' int DEFAULT NULL COMMENT ''使用层级''', 1); @@ -1009,7 +1024,8 @@ CALL Pro_Temp_ColumnWork('thr_products', 'catalogname3', 1); CALL Pro_Temp_ColumnWork('thr_products', 'catalogCode1', 'bigint DEFAULT NULL COMMENT ''一级分类名称(学科,品名)''', 1); CALL Pro_Temp_ColumnWork('thr_products', 'catalogCode2', 'bigint DEFAULT NULL COMMENT ''二级分类名称(用途、品目)''', 1); -CALL Pro_Temp_ColumnWork('thr_products', 'catalogCode3', 'bigint DEFAULT NULL COMMENT ''三级分类名称(部位、功能、品种)''', 1); +CALL Pro_Temp_ColumnWork('thr_products', 'catalogCode3', 'bigint DEFAULT NULL COMMENT ''三级分类名称(部位、功能、品种)''', + 1); CALL Pro_Temp_ColumnWork('thr_products', 'matrial', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''耗材材质''', 1); @@ -1270,38 +1286,47 @@ CALL Pro_Temp_ColumnWork('basic_udirel', 'detailSort', ' tinyint DEFAULT NULL', CALL Pro_Temp_ColumnWork('basic_corp', 'adSickNum', ' varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL', 1); -INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) VALUES (400, 'aliRelCodeDetailTask', '0 0/30 * * * ?', NULL, '阿里关联关系轮询定时'); +INSERT ignore INTO `sys_scheduled`(`id`, `cronName`, `cron`, `customerId`, `remark`) +VALUES (400, 'aliRelCodeDetailTask', '0 0/30 * * * ?', NULL, '阿里关联关系轮询定时'); ALTER TABLE rel_code_batch MODIFY COLUMN `batchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '批次号'; -INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) -VALUES (20101, 0, '新增送货单立即提交前置通过参数设置', 'create_order_pass_type', '3', 1, 0, '1:必须全部扫齐,才可以通过 2:必须选择了马上放心才能提交 3:必须有码才可以', NULL); +INSERT ignore INTO `sys_param_config` (`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, + `paramType`, `paramExplain`, `updateTime`) +VALUES (20101, 0, '新增送货单立即提交前置通过参数设置', 'create_order_pass_type', '3', 1, 0, + '1:必须全部扫齐,才可以通过 2:必须选择了马上放心才能提交 3:必须有码才可以', NULL); -INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, `paramType`, `paramExplain`, `updateTime`) VALUES (90001, 0, '是否调用阿里关联关系模式', 'aliRelCodeDetail', '1', 1, 1, '值为0 是关闭 1是开启',now()); +INSERT ignore INTO `sys_param_config`(`id`, `parentId`, `paramName`, `paramKey`, `paramValue`, `paramStatus`, + `paramType`, `paramExplain`, `updateTime`) +VALUES (90001, 0, '是否调用阿里关联关系模式', 'aliRelCodeDetail', '1', 1, 1, '值为0 是关闭 1是开启', now()); -CREATE TABLE IF NOT EXISTS `basic_products_registration_cert` ( - `id` bigint NOT NULL AUTO_INCREMENT, - `uuid` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'UUID', - `nameCode` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最小销售产品标识', - `zczbhhzbapzbh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '"注册/备案证号,', - `createTime` datetime DEFAULT NULL COMMENT '创建时间', - `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人', - PRIMARY KEY (`id`) -) ENGINE=InnoDB AUTO_INCREMENT=1 DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_0900_ai_ci; +CREATE TABLE IF NOT EXISTS `basic_products_registration_cert` +( + `id` bigint NOT NULL AUTO_INCREMENT, + `uuid` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT 'UUID', + `nameCode` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '最小销售产品标识', + `zczbhhzbapzbh` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '"注册/备案证号,', + `createTime` datetime DEFAULT NULL COMMENT '创建时间', + `createUser` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT '创建人', + PRIMARY KEY (`id`) +) ENGINE = InnoDB + AUTO_INCREMENT = 1 + DEFAULT CHARSET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci; CALL Pro_Temp_ColumnWork('basic_products', 'zczbhhzbapzbhSys', - 'varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''注册/备案证号系统使用''', - 1); + 'varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''注册/备案证号系统使用''', + 1); CALL Pro_Temp_ColumnWork('basic_corp', 'aliEntId', - 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阿里供应商ID''', - 1); + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阿里供应商ID''', + 1); CALL Modify_index('io_order', 'action,invCode', 'idex_order_query', 'BTREE'); CALL Modify_index('io_order', 'mainAction', 'idex_order_query_mainAction', 'BTREE'); @@ -1320,6 +1345,14 @@ CALL Modify_index('rel_code_batch', 'curCode', 'rel_code_batch_curCode', 'BTREE' CALL Modify_index('rel_code_batch', 'packageSpec', 'rel_code_batch_packageSpec', 'BTREE'); +CALL Pro_Temp_ColumnWork('basic_udirel', 'manuReview', + 'tinyint NULL DEFAULT b''0'' COMMENT ''是否已人工审核''', 1); + +CALL Pro_Temp_ColumnWork('basic_udirel', 'notCodeType', + ' tinyint NULL DEFAULT b''0''COMMENT ''无码类型 0、默认不是无码类型;1、部分早期未赋予追溯码;5、最小包装无追溯码;6、无追溯码;7、其他原因''', + 1); + + CALL Pro_Temp_ColumnWork('basic_udirel', 'notCodeType', ' tinyint NULL DEFAULT b''0''COMMENT ''无码类型''', 1);