通过linsn来区别建档

db/h2/test.sql

@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-

db/mssql/test.sql

@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE [test_data]
-(
-	[id] varchar(64) NOT NULL,
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([id])
-);
-
-
-CREATE TABLE [test_data_child]
-(
-	[id] varchar(64) NOT NULL,
-	[test_sort] int,
-	[test_data_id] varchar(64),
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	PRIMARY KEY ([id])
-);
-
-
-CREATE TABLE [test_tree]
-(
-	[tree_code] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[tree_name] nvarchar(200) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([tree_code])
-);
-
-
-

db/oracle/create_user.sql

@@ -1,15 +0,0 @@
-
-create user jeesite
-	identified by jeesite
-	quota unlimited on users;
-  
-grant connect,resource,create session,select any table,
-		create any view,create any table,create any index,
-		drop any table,drop any view,drop any index
-	to jeesite;
-	
-grant select on sys.dba_pending_transactions to jeesite;
-grant select on sys.pending_trans$ to jeesite;
-grant select on sys.dba_2pc_pending to jeesite;
-grant execute on sys.dbms_system to jeesite;

db/oracle/test.sql

@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE test_data
-(
-	id varchar2(64) NOT NULL,
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_data_child
-(
-	id varchar2(64) NOT NULL,
-	test_sort number(10,0),
-	test_data_id varchar2(64),
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_tree
-(
-	tree_code varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	tree_name nvarchar2(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '测试数据';
-COMMENT ON COLUMN test_data.id IS '编号';
-COMMENT ON COLUMN test_data.test_input IS '单行文本';
-COMMENT ON COLUMN test_data.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data.test_select IS '下拉框';
-COMMENT ON COLUMN test_data.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data.test_radio IS '单选框';
-COMMENT ON COLUMN test_data.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data.test_date IS '日期选择';
-COMMENT ON COLUMN test_data.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data.test_area_name IS '区域名称';
-COMMENT ON COLUMN test_data.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_data.create_by IS '创建者';
-COMMENT ON COLUMN test_data.create_date IS '创建时间';
-COMMENT ON COLUMN test_data.update_by IS '更新者';
-COMMENT ON COLUMN test_data.update_date IS '更新时间';
-COMMENT ON COLUMN test_data.remarks IS '备注信息';
-COMMENT ON TABLE test_data_child IS '测试数据子表';
-COMMENT ON COLUMN test_data_child.id IS '编号';
-COMMENT ON COLUMN test_data_child.test_sort IS '排序号';
-COMMENT ON COLUMN test_data_child.test_data_id IS '父表主键';
-COMMENT ON COLUMN test_data_child.test_input IS '单行文本';
-COMMENT ON COLUMN test_data_child.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data_child.test_select IS '下拉框';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data_child.test_radio IS '单选框';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data_child.test_date IS '日期选择';
-COMMENT ON COLUMN test_data_child.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data_child.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data_child.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data_child.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data_child.test_area_name IS '区域名称';
-COMMENT ON TABLE test_tree IS '测试树表';
-COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
-COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
-COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
-COMMENT ON COLUMN test_tree.tree_names IS '全节点名';
-COMMENT ON COLUMN test_tree.tree_name IS '节点名称';
-COMMENT ON COLUMN test_tree.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_tree.create_by IS '创建者';
-COMMENT ON COLUMN test_tree.create_date IS '创建时间';
-COMMENT ON COLUMN test_tree.update_by IS '更新者';
-COMMENT ON COLUMN test_tree.update_date IS '更新时间';
-COMMENT ON COLUMN test_tree.remarks IS '备注信息';
-
-
-

db/postgresql/test.sql

@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-) WITHOUT OIDS;
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '测试数据';
-COMMENT ON COLUMN test_data.id IS '编号';
-COMMENT ON COLUMN test_data.test_input IS '单行文本';
-COMMENT ON COLUMN test_data.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data.test_select IS '下拉框';
-COMMENT ON COLUMN test_data.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data.test_radio IS '单选框';
-COMMENT ON COLUMN test_data.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data.test_date IS '日期选择';
-COMMENT ON COLUMN test_data.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data.test_area_name IS '区域名称';
-COMMENT ON COLUMN test_data.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_data.create_by IS '创建者';
-COMMENT ON COLUMN test_data.create_date IS '创建时间';
-COMMENT ON COLUMN test_data.update_by IS '更新者';
-COMMENT ON COLUMN test_data.update_date IS '更新时间';
-COMMENT ON COLUMN test_data.remarks IS '备注信息';
-COMMENT ON TABLE test_data_child IS '测试数据子表';
-COMMENT ON COLUMN test_data_child.id IS '编号';
-COMMENT ON COLUMN test_data_child.test_sort IS '排序号';
-COMMENT ON COLUMN test_data_child.test_data_id IS '父表主键';
-COMMENT ON COLUMN test_data_child.test_input IS '单行文本';
-COMMENT ON COLUMN test_data_child.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data_child.test_select IS '下拉框';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data_child.test_radio IS '单选框';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data_child.test_date IS '日期选择';
-COMMENT ON COLUMN test_data_child.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data_child.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data_child.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data_child.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data_child.test_area_name IS '区域名称';
-COMMENT ON TABLE test_tree IS '测试树表';
-COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
-COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
-COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
-COMMENT ON COLUMN test_tree.tree_names IS '全节点名';
-COMMENT ON COLUMN test_tree.tree_name IS '节点名称';
-COMMENT ON COLUMN test_tree.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_tree.create_by IS '创建者';
-COMMENT ON COLUMN test_tree.create_date IS '创建时间';
-COMMENT ON COLUMN test_tree.update_by IS '更新者';
-COMMENT ON COLUMN test_tree.update_date IS '更新时间';
-COMMENT ON COLUMN test_tree.remarks IS '备注信息';
-
-
-

src/main/java/com/jeesite/modules/mes/service/MesLineService.java

@@ -3,7 +3,6 @@ package com.jeesite.modules.mes.service;
 import java.util.List;
 
 import com.alibaba.fastjson.JSON;
-import com.jeesite.common.cache.CacheUtils;
 import com.jeesite.common.service.ServiceException;
 import org.apache.poi.util.StringUtil;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,9 +44,8 @@ public class MesLineService extends CrudService<MesLineDao, MesLine> {
 
 	// 根据产线编号获取工件类型
 	public String findInfoCate(String lineSn) {
-		String cate = CacheUtils.get("product","cate","");
-		if(cate != null && !cate.isEmpty()){
-			return cate;
+		if(StringUtils.isEmpty(lineSn)){
+			return "";
 		}
 		MesLine ml = new MesLine();
 		ml.setSn(lineSn);
@@ -57,7 +55,6 @@ public class MesLineService extends CrudService<MesLineDao, MesLine> {
 			return "";
 		}
 		String catestr = mesLine.getProductCate();
-		CacheUtils.put("product","cate",catestr);
 		return catestr;
 	}
 	
@@ -112,4 +109,4 @@ public class MesLineService extends CrudService<MesLineDao, MesLine> {
 		super.delete(mesLine);
 	}
 	
-}
+}

src/main/java/com/jeesite/modules/mes/web/MesProductRecordController.java

@@ -2877,11 +2877,6 @@ public class MesProductRecordController extends BaseController {
 		String lineSn = request.getParameter("lineSn");
 		String userCode = request.getParameter("ucode");
 		String wsn1 = request.getParameter("wsn1");
-		String oldOprno = oprno;
-		if(oldOprno.length()==5){
-			oldOprno += "A";
-		}
-
 		resp.setResult(Global.FALSE);
 		if(StringUtils.isEmpty(oprno) || StringUtils.isEmpty(lineSn)){
 			resp.setMessage("参数错误");
@@ -4709,14 +4704,23 @@ public class MesProductRecordController extends BaseController {
 	public CommonResp queryProduct(HttpServletRequest request) {
 		CommonResp<String> resp = new CommonResp<>();
 		String sn = request.getParameter("sn");
+		String lineSn = request.getParameter("lineSn");
+		if(StringUtils.isEmpty(lineSn)){
+			lineSn = "XT"; // Compatibility with clients that only submit sn.
+		}
 		if(StringUtils.isEmpty(sn)){
 			resp.setResult(Global.FALSE);
 			resp.setMessage("参数错误");
 			return resp;
 		}
-		String cate = "ZHXT";
-		if(sn.length() == 28){
-			sn = mesProductHmbService.formatHmbSn(sn,"OP130","XT");
+		String cate = mesLineService.findInfoCate(lineSn);
+		if(StringUtils.isEmpty(cate)){
+			resp.setResult(Global.FALSE);
+			resp.setMessage("产线不存在或未绑定产品");
+			return resp;
+		}
+		if("XT".equals(lineSn) && sn.length() == 28){
+			sn = mesProductHmbService.formatHmbSn(sn,"OP130",lineSn);
 		}
 
 		MesProductRecord mesProductRecord = mesProductRecordService.findBySnCate(sn,cate);
@@ -4735,13 +4739,22 @@ public class MesProductRecordController extends BaseController {
 	public CommonResp createProduct(HttpServletRequest request) {
 		CommonResp<String> resp = new CommonResp<>();
 		String sn = request.getParameter("sn");
+		String lineSn = request.getParameter("lineSn");
+		if(StringUtils.isEmpty(lineSn)){
+			lineSn = "XT"; // Compatibility with clients that only submit sn.
+		}
 		if(StringUtils.isEmpty(sn)){
 			resp.setResult(Global.FALSE);
 			resp.setMessage("参数错误");
 			return resp;
 		}
 
-		String cate = "ZHXT";
+		String cate = mesLineService.findInfoCate(lineSn);
+		if(StringUtils.isEmpty(cate)){
+			resp.setResult(Global.FALSE);
+			resp.setMessage("产线不存在或未绑定产品");
+			return resp;
+		}
 
 		// 检验工件码
 		String checkProductSn = Global.getConfig("mes.check.productSn");
@@ -4763,7 +4776,7 @@ public class MesProductRecordController extends BaseController {
 		MesProductRecord mesProductRecord = new MesProductRecord();
 		mesProductRecord.setSn(sn);
 		mesProductRecord.setOprno("OP010");
-		mesProductRecord.setLineSn("XT");
+		mesProductRecord.setLineSn(lineSn);
 		mesProductRecord.setContent("UDF");
 		mesProductRecord.setCateSn(cate);
 

src/main/resources/config/application.yml

@@ -56,8 +56,9 @@ jdbc:
   driver: com.mysql.cj.jdbc.Driver
 
 #  url: jdbc:mysql://39.106.12.131:3306/mes_cloud_xz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
-  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_xz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+#  url: jdbc:mysql://127.0.0.1:3306/mes_cloud_xz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 #  url: jdbc:mysql://192.168.17.170:3306/mes_cloud_xz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+  url: jdbc:mysql://192.168.100.128:3307/mes_cloud_xz?useSSL=false&useUnicode=true&characterEncoding=utf-8&zeroDateTimeBehavior=CONVERT_TO_NULL&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
 
 #  username: mes_cloud_xz
 #  password: 2hNY3YMe2BGbCXLS

src/main/resources/db/create/h2/test.sql

@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date datetime,
-	test_datetime datetime,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date datetime NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date datetime NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-

src/main/resources/db/create/mssql/test.sql

@@ -1,75 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE [test_data]
-(
-	[id] varchar(64) NOT NULL,
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([id])
-);
-
-
-CREATE TABLE [test_data_child]
-(
-	[id] varchar(64) NOT NULL,
-	[test_sort] int,
-	[test_data_id] varchar(64),
-	[test_input] varchar(200),
-	[test_textarea] nvarchar(200),
-	[test_select] varchar(10),
-	[test_select_multiple] varchar(200),
-	[test_radio] varchar(10),
-	[test_checkbox] varchar(200),
-	[test_date] datetime,
-	[test_datetime] datetime,
-	[test_user_code] varchar(64),
-	[test_office_code] varchar(64),
-	[test_area_code] varchar(64),
-	[test_area_name] nvarchar(100),
-	PRIMARY KEY ([id])
-);
-
-
-CREATE TABLE [test_tree]
-(
-	[tree_code] varchar(64) NOT NULL,
-	[parent_code] varchar(64) NOT NULL,
-	[parent_codes] varchar(767) NOT NULL,
-	[tree_sort] decimal(10) NOT NULL,
-	[tree_sorts] varchar(767) NOT NULL,
-	[tree_leaf] char(1) NOT NULL,
-	[tree_level] decimal(4) NOT NULL,
-	[tree_names] varchar(767) NOT NULL,
-	[tree_name] nvarchar(200) NOT NULL,
-	[status] char(1) DEFAULT '0' NOT NULL,
-	[create_by] varchar(64) NOT NULL,
-	[create_date] datetime NOT NULL,
-	[update_by] varchar(64) NOT NULL,
-	[update_date] datetime NOT NULL,
-	[remarks] nvarchar(500),
-	PRIMARY KEY ([tree_code])
-);
-
-
-

src/main/resources/db/create/mysql/test.sql

@@ -1,76 +0,0 @@
-SET SESSION FOREIGN_KEY_CHECKS=0;
-
-
-/* Create Tables */
-
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL COMMENT '编号',
-	test_input varchar(200) COMMENT '单行文本',
-	test_textarea varchar(200) COMMENT '多行文本',
-	test_select varchar(10) COMMENT '下拉框',
-	test_select_multiple varchar(200) COMMENT '下拉多选',
-	test_radio varchar(10) COMMENT '单选框',
-	test_checkbox varchar(200) COMMENT '复选框',
-	test_date datetime COMMENT '日期选择',
-	test_datetime datetime COMMENT '日期时间',
-	test_user_code varchar(64) COMMENT '用户选择',
-	test_office_code varchar(64) COMMENT '机构选择',
-	test_area_code varchar(64) COMMENT '区域选择',
-	test_area_name varchar(100) COMMENT '区域名称',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
-	create_by varchar(64) NOT NULL COMMENT '创建者',
-	create_date datetime NOT NULL COMMENT '创建时间',
-	update_by varchar(64) NOT NULL COMMENT '更新者',
-	update_date datetime NOT NULL COMMENT '更新时间',
-	remarks varchar(500) COMMENT '备注信息',
-	PRIMARY KEY (id)
-) COMMENT = '测试数据';
-
-
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL COMMENT '编号',
-	test_sort int COMMENT '排序号',
-	test_data_id varchar(64) COMMENT '父表主键',
-	test_input varchar(200) COMMENT '单行文本',
-	test_textarea varchar(200) COMMENT '多行文本',
-	test_select varchar(10) COMMENT '下拉框',
-	test_select_multiple varchar(200) COMMENT '下拉多选',
-	test_radio varchar(10) COMMENT '单选框',
-	test_checkbox varchar(200) COMMENT '复选框',
-	test_date datetime COMMENT '日期选择',
-	test_datetime datetime COMMENT '日期时间',
-	test_user_code varchar(64) COMMENT '用户选择',
-	test_office_code varchar(64) COMMENT '机构选择',
-	test_area_code varchar(64) COMMENT '区域选择',
-	test_area_name varchar(100) COMMENT '区域名称',
-	PRIMARY KEY (id)
-) COMMENT = '测试数据子表';
-
-
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL COMMENT '节点编码',
-	parent_code varchar(64) NOT NULL COMMENT '父级编号',
-	parent_codes varchar(767) NOT NULL COMMENT '所有父级编号',
-	tree_sort decimal(10) NOT NULL COMMENT '排序号（升序）',
-	tree_sorts varchar(767) NOT NULL COMMENT '所有排序号',
-	tree_leaf char(1) NOT NULL COMMENT '是否最末级',
-	tree_level decimal(4) NOT NULL COMMENT '层次级别',
-	tree_names varchar(767) NOT NULL COMMENT '全节点名',
-	tree_name varchar(200) NOT NULL COMMENT '节点名称',
-	status char(1) DEFAULT '0' NOT NULL COMMENT '状态（0正常 1删除 2停用）',
-	create_by varchar(64) NOT NULL COMMENT '创建者',
-	create_date datetime NOT NULL COMMENT '创建时间',
-	update_by varchar(64) NOT NULL COMMENT '更新者',
-	update_date datetime NOT NULL COMMENT '更新时间',
-	remarks varchar(500) COMMENT '备注信息',
-	PRIMARY KEY (tree_code)
-) COMMENT = '测试树表';
-
-
-

src/main/resources/db/create/oracle/test.sql

@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE test_data
-(
-	id varchar2(64) NOT NULL,
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_data_child
-(
-	id varchar2(64) NOT NULL,
-	test_sort number(10,0),
-	test_data_id varchar2(64),
-	test_input varchar2(200),
-	test_textarea nvarchar2(200),
-	test_select varchar2(10),
-	test_select_multiple varchar2(200),
-	test_radio varchar2(10),
-	test_checkbox varchar2(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar2(64),
-	test_office_code varchar2(64),
-	test_area_code varchar2(64),
-	test_area_name nvarchar2(100),
-	PRIMARY KEY (id)
-);
-
-
-CREATE TABLE test_tree
-(
-	tree_code varchar2(64) NOT NULL,
-	parent_code varchar2(64) NOT NULL,
-	parent_codes varchar2(767) NOT NULL,
-	tree_sort number(10) NOT NULL,
-	tree_sorts varchar2(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level number(4) NOT NULL,
-	tree_names varchar2(767) NOT NULL,
-	tree_name nvarchar2(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar2(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar2(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks nvarchar2(500),
-	PRIMARY KEY (tree_code)
-);
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '测试数据';
-COMMENT ON COLUMN test_data.id IS '编号';
-COMMENT ON COLUMN test_data.test_input IS '单行文本';
-COMMENT ON COLUMN test_data.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data.test_select IS '下拉框';
-COMMENT ON COLUMN test_data.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data.test_radio IS '单选框';
-COMMENT ON COLUMN test_data.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data.test_date IS '日期选择';
-COMMENT ON COLUMN test_data.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data.test_area_name IS '区域名称';
-COMMENT ON COLUMN test_data.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_data.create_by IS '创建者';
-COMMENT ON COLUMN test_data.create_date IS '创建时间';
-COMMENT ON COLUMN test_data.update_by IS '更新者';
-COMMENT ON COLUMN test_data.update_date IS '更新时间';
-COMMENT ON COLUMN test_data.remarks IS '备注信息';
-COMMENT ON TABLE test_data_child IS '测试数据子表';
-COMMENT ON COLUMN test_data_child.id IS '编号';
-COMMENT ON COLUMN test_data_child.test_sort IS '排序号';
-COMMENT ON COLUMN test_data_child.test_data_id IS '父表主键';
-COMMENT ON COLUMN test_data_child.test_input IS '单行文本';
-COMMENT ON COLUMN test_data_child.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data_child.test_select IS '下拉框';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data_child.test_radio IS '单选框';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data_child.test_date IS '日期选择';
-COMMENT ON COLUMN test_data_child.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data_child.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data_child.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data_child.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data_child.test_area_name IS '区域名称';
-COMMENT ON TABLE test_tree IS '测试树表';
-COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
-COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
-COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
-COMMENT ON COLUMN test_tree.tree_names IS '全节点名';
-COMMENT ON COLUMN test_tree.tree_name IS '节点名称';
-COMMENT ON COLUMN test_tree.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_tree.create_by IS '创建者';
-COMMENT ON COLUMN test_tree.create_date IS '创建时间';
-COMMENT ON COLUMN test_tree.update_by IS '更新者';
-COMMENT ON COLUMN test_tree.update_date IS '更新时间';
-COMMENT ON COLUMN test_tree.remarks IS '备注信息';
-
-
-

src/main/resources/db/create/postgresql/test.sql

@@ -1,132 +0,0 @@
-
-
-/* Create Tables */
-
-CREATE TABLE test_data
-(
-	id varchar(64) NOT NULL,
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
-CREATE TABLE test_data_child
-(
-	id varchar(64) NOT NULL,
-	test_sort int,
-	test_data_id varchar(64),
-	test_input varchar(200),
-	test_textarea varchar(200),
-	test_select varchar(10),
-	test_select_multiple varchar(200),
-	test_radio varchar(10),
-	test_checkbox varchar(200),
-	test_date timestamp,
-	test_datetime timestamp,
-	test_user_code varchar(64),
-	test_office_code varchar(64),
-	test_area_code varchar(64),
-	test_area_name varchar(100),
-	PRIMARY KEY (id)
-) WITHOUT OIDS;
-
-
-CREATE TABLE test_tree
-(
-	tree_code varchar(64) NOT NULL,
-	parent_code varchar(64) NOT NULL,
-	parent_codes varchar(767) NOT NULL,
-	tree_sort decimal(10) NOT NULL,
-	tree_sorts varchar(767) NOT NULL,
-	tree_leaf char(1) NOT NULL,
-	tree_level decimal(4) NOT NULL,
-	tree_names varchar(767) NOT NULL,
-	tree_name varchar(200) NOT NULL,
-	status char(1) DEFAULT '0' NOT NULL,
-	create_by varchar(64) NOT NULL,
-	create_date timestamp NOT NULL,
-	update_by varchar(64) NOT NULL,
-	update_date timestamp NOT NULL,
-	remarks varchar(500),
-	PRIMARY KEY (tree_code)
-) WITHOUT OIDS;
-
-
-
-/* Comments */
-
-COMMENT ON TABLE test_data IS '测试数据';
-COMMENT ON COLUMN test_data.id IS '编号';
-COMMENT ON COLUMN test_data.test_input IS '单行文本';
-COMMENT ON COLUMN test_data.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data.test_select IS '下拉框';
-COMMENT ON COLUMN test_data.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data.test_radio IS '单选框';
-COMMENT ON COLUMN test_data.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data.test_date IS '日期选择';
-COMMENT ON COLUMN test_data.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data.test_area_name IS '区域名称';
-COMMENT ON COLUMN test_data.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_data.create_by IS '创建者';
-COMMENT ON COLUMN test_data.create_date IS '创建时间';
-COMMENT ON COLUMN test_data.update_by IS '更新者';
-COMMENT ON COLUMN test_data.update_date IS '更新时间';
-COMMENT ON COLUMN test_data.remarks IS '备注信息';
-COMMENT ON TABLE test_data_child IS '测试数据子表';
-COMMENT ON COLUMN test_data_child.id IS '编号';
-COMMENT ON COLUMN test_data_child.test_sort IS '排序号';
-COMMENT ON COLUMN test_data_child.test_data_id IS '父表主键';
-COMMENT ON COLUMN test_data_child.test_input IS '单行文本';
-COMMENT ON COLUMN test_data_child.test_textarea IS '多行文本';
-COMMENT ON COLUMN test_data_child.test_select IS '下拉框';
-COMMENT ON COLUMN test_data_child.test_select_multiple IS '下拉多选';
-COMMENT ON COLUMN test_data_child.test_radio IS '单选框';
-COMMENT ON COLUMN test_data_child.test_checkbox IS '复选框';
-COMMENT ON COLUMN test_data_child.test_date IS '日期选择';
-COMMENT ON COLUMN test_data_child.test_datetime IS '日期时间';
-COMMENT ON COLUMN test_data_child.test_user_code IS '用户选择';
-COMMENT ON COLUMN test_data_child.test_office_code IS '机构选择';
-COMMENT ON COLUMN test_data_child.test_area_code IS '区域选择';
-COMMENT ON COLUMN test_data_child.test_area_name IS '区域名称';
-COMMENT ON TABLE test_tree IS '测试树表';
-COMMENT ON COLUMN test_tree.tree_code IS '节点编码';
-COMMENT ON COLUMN test_tree.parent_code IS '父级编号';
-COMMENT ON COLUMN test_tree.parent_codes IS '所有父级编号';
-COMMENT ON COLUMN test_tree.tree_sort IS '排序号（升序）';
-COMMENT ON COLUMN test_tree.tree_sorts IS '所有排序号';
-COMMENT ON COLUMN test_tree.tree_leaf IS '是否最末级';
-COMMENT ON COLUMN test_tree.tree_level IS '层次级别';
-COMMENT ON COLUMN test_tree.tree_names IS '全节点名';
-COMMENT ON COLUMN test_tree.tree_name IS '节点名称';
-COMMENT ON COLUMN test_tree.status IS '状态（0正常 1删除 2停用）';
-COMMENT ON COLUMN test_tree.create_by IS '创建者';
-COMMENT ON COLUMN test_tree.create_date IS '创建时间';
-COMMENT ON COLUMN test_tree.update_by IS '更新者';
-COMMENT ON COLUMN test_tree.update_date IS '更新时间';
-COMMENT ON COLUMN test_tree.remarks IS '备注信息';
-
-
-