diff --git a/docs/jsh_erp.sql b/docs/jsh_erp.sql index 69923089..13f24121 100644 --- a/docs/jsh_erp.sql +++ b/docs/jsh_erp.sql @@ -1762,10 +1762,10 @@ INSERT INTO `jsh_userbusiness` VALUES ('65', 'UserRole', '129', '[10]', null, '0 INSERT INTO `jsh_userbusiness` VALUES ('66', 'UserRole', '130', '[10]', null, '0'); -- ---------------------------- --- Table structure for tbl_sequence +-- Table structure for jsh_sequence -- ---------------------------- -DROP TABLE IF EXISTS `tbl_sequence`; -CREATE TABLE `tbl_sequence` ( +DROP TABLE IF EXISTS `jsh_sequence`; +CREATE TABLE `jsh_sequence` ( `seq_name` varchar(50) NOT NULL COMMENT '序列名称', `min_value` bigint(20) NOT NULL COMMENT '最小值', `max_value` bigint(20) NOT NULL COMMENT '最大值', @@ -1776,9 +1776,9 @@ CREATE TABLE `tbl_sequence` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COMMENT='sequence表'; -- ---------------------------- --- Records of tbl_sequence +-- Records of jsh_sequence -- ---------------------------- -INSERT INTO `tbl_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '304', '1', '单据编号sequence'); +INSERT INTO `jsh_sequence` VALUES ('depot_number_seq', '1', '999999999999999999', '304', '1', '单据编号sequence'); -- ---------------------------- -- Table structure for jsh_tenant diff --git a/docs/数据库更新记录-方便升级.txt b/docs/数据库更新记录-方便升级.txt index 5dc2b0e9..2314a779 100644 --- a/docs/数据库更新记录-方便升级.txt +++ b/docs/数据库更新记录-方便升级.txt @@ -669,4 +669,10 @@ ROW_FORMAT=COMPACT -- ---------------------------- drop table databasechangelog; drop table databasechangeloglock; -drop table jsh_app; \ No newline at end of file +drop table jsh_app; + +-- ---------------------------- +-- 时间:2019年11月28日 +-- 单据编号表-改表名 +-- ---------------------------- +ALTER TABLE tbl_sequence RENAME TO jsh_sequence; \ No newline at end of file diff --git a/src/main/java/com/jsh/erp/config/TenantConfig.java b/src/main/java/com/jsh/erp/config/TenantConfig.java index d697a93d..b75017a0 100644 --- a/src/main/java/com/jsh/erp/config/TenantConfig.java +++ b/src/main/java/com/jsh/erp/config/TenantConfig.java @@ -61,7 +61,7 @@ public class TenantConfig { return true; } else { // 这里可以判断是否过滤表 - if ("jsh_materialproperty".equals(tableName) || "tbl_sequence".equals(tableName) + if ("jsh_materialproperty".equals(tableName) || "jsh_sequence".equals(tableName) || "jsh_userbusiness".equals(tableName) || "jsh_functions".equals(tableName) || "jsh_tenant".equals(tableName)) { return true; diff --git a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml index c5f5bf5b..40c19df4 100644 --- a/src/main/resources/mapper_xml/DepotHeadMapperEx.xml +++ b/src/main/resources/mapper_xml/DepotHeadMapperEx.xml @@ -436,11 +436,11 @@ - update tbl_sequence set current_val = current_val + 1 where seq_name = 'depot_number_seq' + update jsh_sequence set current_val = current_val + 1 where seq_name = 'depot_number_seq'