Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_sqlserver.sql (revision 15628) @@ -0,0 +1,2 @@ +alter table dbo.ReturnGoodsItem alter column settlementPrice numeric(19,4); +alter table dbo.ReturnMaterialItem alter column settlementPrice numeric(19,4); Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.4.1_4.4.2_oracle.sql (revision 15628) @@ -0,0 +1,12 @@ +execute immediate 'alter table ReturnGoodsItem add settlementPrice1 NUMBER(19,4)'; +execute immediate 'update ReturnGoodsItem set settlementPrice1 = settlementPrice'; +execute immediate 'commit'; +execute immediate 'alter table ReturnGoodsItem drop column settlementPrice'; +execute immediate 'alter table ReturnGoodsItem rename column settlementPrice1 to settlementPrice'; + + +execute immediate 'alter table ReturnMaterialItem add settlementPrice1 NUMBER(19,4)'; +execute immediate 'update ReturnMaterialItem set settlementPrice1 = settlementPrice'; +execute immediate 'commit'; +execute immediate 'alter table ReturnMaterialItem drop column settlementPrice'; +execute immediate 'alter table ReturnMaterialItem rename column settlementPrice1 to settlementPrice'; \ No newline at end of file Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r15489 -r15628 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 15489) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 15628) @@ -18,7 +18,8 @@ public final static String[] SOFTWARE_VERSION_ARRAY = new String[] { "3.3.0","3.3.8", "3.3.9", "3.3.10","3.3.12","3.3.13","3.8.0","3.9.0","3.9.1","3.9.2","4.0.2","4.0.3","4.0.4", "4.0.5","4.0.6","4.0.44","4.0.45","4.1.0","4.1.1","4.1.2","4.1.3","4.1.4","4.1.5","4.1.6","4.1.7","4.1.8","4.1.9","4.2.0","4.2.1","4.2.2", - "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.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"};// 版本列表 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-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java =================================================================== diff -u -r14590 -r15628 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java (.../ReturnMaterialItem.java) (revision 14590) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returnmaterialrecord/ReturnMaterialItem.java (.../ReturnMaterialItem.java) (revision 15628) @@ -95,7 +95,7 @@ this.price = price; } - @Column(scale = 2) + @Column(scale = 4) public BigDecimal getSettlementPrice() { return settlementPrice; } Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java =================================================================== diff -u -r13519 -r15628 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java (.../ReturnGoodsItem.java) (revision 13519) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/returngoodsrecord/ReturnGoodsItem.java (.../ReturnGoodsItem.java) (revision 15628) @@ -224,7 +224,7 @@ this.fluctuationPrice = fluctuationPrice; } //@Column(precision = 24, scale = 2) - @Column(scale = 2) + @Column(scale = 4) public BigDecimal getSettlementPrice() { return settlementPrice; }