Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r21756 -r22007 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 21756) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 22007) @@ -21,7 +21,8 @@ "4.2.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9","4.3.0","4.3.1","4.3.2","4.3.3","4.3.4","4.3.5","4.3.6","4.3.7","4.3.8","4.3.9", "4.4.0","4.4.1","4.4.2","4.4.3","4.4.4","4.4.5","4.4.6","4.4.7","4.4.8","4.4.9","4.5.0","4.5.1","4.5.2","4.5.3","4.5.4","4.5.5","4.5.6","4.5.7","4.5.8", "4.5.9","4.6.0","4.6.1","4.6.2","4.6.3","4.6.4","4.6.5","4.6.6","4.6.7","4.6.8","4.6.9","4.7.0","4.7.1","4.7.2","4.7.3","4.7.4","4.7.5","4.7.6","4.7.7", - "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6"};// 版本列表 + "4.7.8","4.7.9","4.8.0","4.8.1","4.8.2","4.8.3","4.8.4","4.8.5","4.8.6","4.8.7","4.8.8","4.8.9","4.9.0","4.9.1","4.9.2","4.9.3","4.9.4","4.9.5","4.9.6", + "4.9.7"};// 版本列表 public final static List SOFTWARE_VERSION_LIST = Arrays .asList(SOFTWARE_VERSION_ARRAY); public final static String SOFTWARE_VERSION = SOFTWARE_VERSION_ARRAY[SOFTWARE_VERSION_ARRAY.length - 1];// 软件最新版本 Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_oracle.sql (revision 22007) @@ -0,0 +1 @@ +alter table PackingTask modify(sourceTousseInstanceIds varchar2(4000 char)); \ No newline at end of file Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java =================================================================== diff -u -r20451 -r22007 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 20451) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java (.../PackingTask.java) (revision 22007) @@ -4,6 +4,7 @@ import java.util.Date; import java.util.List; +import javax.persistence.Column; import javax.persistence.Entity; import javax.persistence.GeneratedValue; import javax.persistence.GenerationType; @@ -148,10 +149,11 @@ private Long sourceId; /** - * 源包实例id(多个之间用逗号分隔) + * 源包实例id(多个之间用逗号分隔)(长度暂时改成4000,本来应该要用大对象的) * 仅用于taskType为退货重装及质量监测重新装配时,对应的包实例id集 * taskType为申请单及回收记录时,该字段暂不赋值 */ + @Column(length=4000) private String sourceTousseInstanceIds; /** Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.6_4.9.7_sqlserver.sql (revision 22007) @@ -0,0 +1 @@ +alter table PackingTask alter column sourceTousseInstanceIds varchar(4000); \ No newline at end of file