diff --git a/src/main/resources/schemas/schema_v2.4.sql b/src/main/resources/schemas/schema_v2.4.sql index 457190941..0acf363a8 100644 --- a/src/main/resources/schemas/schema_v2.4.sql +++ b/src/main/resources/schemas/schema_v2.4.sql @@ -4935,7 +4935,6 @@ ALTER TABLE io_collect_order_backup - CALL Pro_Temp_ColumnWork('sys_workplace_document', 'autoHandle', ' tinyint NULL DEFAULT b''0''COMMENT ''是否自动处理''', 1); @@ -5269,8 +5268,8 @@ ALTER TABLE rel_code_batch 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'); @@ -5321,9 +5320,7 @@ CALL Modify_index('io_code_temp', 'code', 'idex_code_temp_query', 'BTREE'); CALL Pro_Temp_ColumnWork('sys_workplace', 'jobMode', ' tinyint NULL DEFAULT b''0''COMMENT ''作业模式 0:药房发药模式 1:药库统一模式''', 1); -CALL Pro_Temp_ColumnWork('sys_workplace', 'productType', - 'tinyint NULL DEFAULT b''1''COMMENT ''业务类型 1器械业务 2药品业务''', - 1); + CALL Pro_Temp_ColumnWork('sys_workplace_document', 'productType', 'tinyint NULL DEFAULT b''1''COMMENT ''业务类型 1器械业务 2药品业务''', @@ -5334,6 +5331,9 @@ CALL Pro_Temp_ColumnWork('sys_workplace', 'isUseMinUnit', ' tinyint NULL DEFAULT b''0''COMMENT ''是否只允许采集最小销售单元''', 1); +CALL Pro_Temp_ColumnWork('sys_workplace', 'productType', + 'tinyint NULL DEFAULT b''1''COMMENT ''业务类型 1器械业务 2药品业务''', + 1); CALL Pro_Temp_ColumnWork('io_collect_order_backup', 'preInBillNo', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''预入库单号''', 1); @@ -5357,36 +5357,68 @@ CALL Pro_Temp_ColumnWork('io_order', 'ycBillNo', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''阳光采购单号''', 1); -CALL Pro_Temp_ColumnWork('io_collect_order_code_auto','nameCode', +CALL Pro_Temp_ColumnWork('io_collect_order_code_auto', 'nameCode', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''标识''', 1); -CALL Pro_Temp_ColumnWork('io_split_fifo_code ','ybbm', +CALL Pro_Temp_ColumnWork('io_split_fifo_code ', 'ybbm', 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''ybbm''', 1); -CALL Pro_Temp_ColumnWork('io_collect_order_code_auto','count', - 'int NULL DEFAULT NULL COMMENT ''数量''', +CALL Pro_Temp_ColumnWork('io_collect_order_code_auto', 'count', + 'int NULL DEFAULT NULL COMMENT ''数量''', 1); -CALL Pro_Temp_ColumnWork('io_collect_order_code_auto','reCount', - 'int NULL DEFAULT NULL COMMENT ''数量''', +CALL Pro_Temp_ColumnWork('io_collect_order_code_auto', 'reCount', + 'int NULL DEFAULT NULL COMMENT ''数量''', 1); -CALL Pro_Temp_ColumnWork( 'io_code_temp','groupNumber', - 'int NULL DEFAULT NULL COMMENT ''分组''', +CALL Pro_Temp_ColumnWork('io_code_temp', 'groupNumber', + 'int NULL DEFAULT NULL COMMENT ''分组''', 1); -CALL Pro_Temp_ColumnWork( 'io_code_temp','queueCode', - 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''queueCode''', +CALL Pro_Temp_ColumnWork('io_code_temp', 'queueCode', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''queueCode''', 1); -CALL Pro_Temp_ColumnWork( 'io_order_detail_biz','ycBizNo', - 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''ycBizNo''', +CALL Pro_Temp_ColumnWork('io_order_detail_biz', 'ycBizNo', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''ycBizNo''', 1); -CALL Pro_Temp_ColumnWork( 'sys_workplace_layer','name', - 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''name''', +CALL Pro_Temp_ColumnWork('sys_workplace_layer', 'name', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''name''', 1); + +CALL Pro_Temp_ColumnWork('io_split_code ', 'ybbm', + 'varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci DEFAULT NULL COMMENT ''ybbm''', + 1); + + + +CREATE TABLE IF NOT EXISTS `inv_product_batch` +( + `id` int NOT NULL AUTO_INCREMENT, + `inBatchNo` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '内部批号', + `orderId` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '入库单号', + `relIdFk` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '产品ID', + `nameCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '最小销售标识', + `batchNo` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '批次号', + `price` decimal(10, 3) NULL DEFAULT NULL COMMENT '价格', + `produceDate` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '生产日期', + `expireDate` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '失效日期', + `inCount` int NULL DEFAULT NULL COMMENT '入库数量', + `reCount` int NULL DEFAULT NULL COMMENT '剩余数量', + `supId` varchar(60) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '供应商ID', + `deptCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '部门编码', + `createTime` datetime NULL DEFAULT NULL COMMENT '创建时间', + `updateTime` datetime NULL DEFAULT NULL COMMENT '更新时间', + `invCode` varchar(255) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '仓库编码', + PRIMARY KEY (`id`) USING BTREE +) ENGINE = InnoDB + AUTO_INCREMENT = 8052 + CHARACTER SET = utf8mb4 + COLLATE = utf8mb4_0900_ai_ci + ROW_FORMAT = Dynamic; +