Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_sqlserver.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_sqlserver.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_sqlserver.sql (revision 14477) @@ -0,0 +1,4 @@ +select td.ancestorID,gs.name,gs.wareHouseId,gs.wareHouseName,gs.orgUnitCode,gs.orgUnitName,sum(gs.amount) amount into temp from GoodsStock gs join TousseDefinition td on gs.tousseDefinitionId=td.id where td.tousseType not in ('器械包','敷料包','外来器械拆分小包') and td.forDisplay='0' group by td.ancestorID,gs.name,gs.wareHouseId,gs.wareHouseName,gs.orgUnitCode,gs.orgUnitName; +delete from GoodsStock where tousseDefinitionId in (select id from TousseDefinition td where td.tousseType not in ('器械包','敷料包','外来器械拆分小包') and td.forDisplay='0'); +insert into GoodsStock(goodstype,tousseDefinitionId,name,warehouseid,warehousename,orgunitcode,orgunitname,amount) select '器械包',t.ancestorId,t.name,t.warehouseid,t.warehousename,t.orgunitcode,t.orgunitname,t.amount from temp t; +drop table temp; \ No newline at end of file Index: forgon-core/src/main/java/com/forgon/Constants.java =================================================================== diff -u -r14407 -r14477 --- forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 14407) +++ forgon-core/src/main/java/com/forgon/Constants.java (.../Constants.java) (revision 14477) @@ -18,7 +18,7 @@ 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.3","4.2.4","4.2.5","4.2.6","4.2.7","4.2.8","4.2.9"};// 版本列表 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];// 软件最新版本