Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/St_tousse_detail.java =================================================================== diff -u -r23492 -r38802 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/St_tousse_detail.java (.../St_tousse_detail.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/St_tousse_detail.java (.../St_tousse_detail.java) (revision 38802) @@ -5,6 +5,8 @@ import javax.persistence.Entity; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -45,6 +47,7 @@ this.id = id; } + @Column(name = "yearMonth") public String getYear_month() { return year_month; } Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_sqlserver.sql =================================================================== diff -u -r38722 -r38802 --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_sqlserver.sql (.../5.0.28_5.0.29_sqlserver.sql) (revision 38722) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_sqlserver.sql (.../5.0.28_5.0.29_sqlserver.sql) (revision 38802) @@ -1,4 +1,8 @@ update TousseDefinition set tdExplain = explain where explain is not null; update ForeignTousseApplication set ftaExplain = explain where explain is not null; +update St_material_detail set yearMonth = year_month where year_month is not null; +update St_tousse_detail set yearMonth = year_month where year_month is not null; alter table TousseDefinition drop column explain; -alter table ForeignTousseApplication drop column explain; \ No newline at end of file +alter table ForeignTousseApplication drop column explain; +alter table St_material_detail drop column year_month; +alter table St_tousse_detail drop column year_month; \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_tidb.sql =================================================================== diff -u -r38722 -r38802 --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_tidb.sql (.../5.0.28_5.0.29_tidb.sql) (revision 38722) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_tidb.sql (.../5.0.28_5.0.29_tidb.sql) (revision 38802) @@ -1,4 +1,8 @@ update TousseDefinition set tdExplain = `explain` where `explain` is not null; update ForeignTousseApplication set ftaExplain = `explain` where `explain` is not null; +update St_material_detail set yearMonth = `year_month` where `year_month` is not null; +update St_tousse_detail set yearMonth = `year_month where `year_month` is not null; alter table TousseDefinition drop column `explain`; -alter table ForeignTousseApplication drop column `explain`; \ No newline at end of file +alter table ForeignTousseApplication drop column `explain`; +alter table St_material_detail drop column `year_month`; +alter table St_tousse_detail drop column `year_month`; \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_oracle.sql =================================================================== diff -u -r38722 -r38802 --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_oracle.sql (.../5.0.28_5.0.29_oracle.sql) (revision 38722) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_oracle.sql (.../5.0.28_5.0.29_oracle.sql) (revision 38802) @@ -1,4 +1,8 @@ execute immediate 'update TousseDefinition set tdExplain = explain where explain is not null'; execute immediate 'update ForeignTousseApplication set ftaExplain = explain where explain is not null'; +execute immediate 'update St_material_detail set yearMonth = year_month where year_month is not null'; +execute immediate 'update St_tousse_detail set yearMonth = year_month where year_month is not null'; execute immediate 'alter table TousseDefinition drop column explain'; -execute immediate 'alter table ForeignTousseApplication drop column explain'; \ No newline at end of file +execute immediate 'alter table ForeignTousseApplication drop column explain'; +execute immediate 'alter table St_material_detail drop column year_month'; +execute immediate 'alter table St_tousse_detail drop column year_month'; \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/St_material_detail.java =================================================================== diff -u -r23492 -r38802 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/St_material_detail.java (.../St_material_detail.java) (revision 23492) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/stocktakerecordmanager/St_material_detail.java (.../St_material_detail.java) (revision 38802) @@ -8,6 +8,8 @@ import javax.persistence.Entity; import org.hibernate.annotations.DynamicInsert; import org.hibernate.annotations.DynamicUpdate; + +import javax.persistence.Column; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; import javax.persistence.Id; @@ -52,6 +54,7 @@ this.id = id; } + @Column(name = "yearMonth") public String getYear_month() { return year_month; } Index: ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_mysql.sql =================================================================== diff -u -r38722 -r38802 --- ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_mysql.sql (.../5.0.28_5.0.29_mysql.sql) (revision 38722) +++ ssts-web/src/main/webapp/dataUpdater/sqls/5.0.28_5.0.29_mysql.sql (.../5.0.28_5.0.29_mysql.sql) (revision 38802) @@ -1,4 +1,8 @@ update TousseDefinition set tdExplain = `explain` where `explain` is not null; update ForeignTousseApplication set ftaExplain = `explain` where `explain` is not null; +update St_material_detail set yearMonth = `year_month` where `year_month` is not null; +update St_tousse_detail set yearMonth = `year_month where `year_month` is not null; alter table TousseDefinition drop column `explain`; -alter table ForeignTousseApplication drop column `explain`; \ No newline at end of file +alter table ForeignTousseApplication drop column `explain`; +alter table St_material_detail drop column `year_month`; +alter table St_tousse_detail drop column `year_month`; \ No newline at end of file