Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_sqlserver.sql =================================================================== diff -u -r14477 -r14478 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_sqlserver.sql (.../4.2.8_4.2.9_sqlserver.sql) (revision 14477) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_sqlserver.sql (.../4.2.8_4.2.9_sqlserver.sql) (revision 14478) @@ -1,4 +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'); +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 = '消毒物品' 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 = '消毒物品' 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: ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_oracle.sql =================================================================== diff -u --- ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_oracle.sql (revision 0) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.2.8_4.2.9_oracle.sql (revision 14478) @@ -0,0 +1,5 @@ +execute immediate 'create table temp as select td.ancestorID,gs.name,gs.wareHouseId,gs.wareHouseName,gs.orgUnitCode,gs.orgUnitName,sum(gs.amount) amount from GoodsStock gs join TousseDefinition td on gs.tousseDefinitionId=td.id where td.tousseType = ''消毒物品'' and td.forDisplay=''0'' group by td.ancestorID,gs.name,gs.wareHouseId,gs.wareHouseName,gs.orgUnitCode,gs.orgUnitName'; +execute immediate 'delete from GoodsStock where tousseDefinitionId in (select id from TousseDefinition td where td.tousseType = ''消毒物品'' and td.forDisplay=''0'')'; +execute immediate 'insert into GoodsStock(id,goodstype,tousseDefinitionId,name,warehouseid,warehousename,orgunitcode,orgunitname,amount) select HIBERNATE_SEQUENCE.Nextval,''器械包'',t.ancestorId,t.name,t.warehouseid,t.warehousename,t.orgunitcode,t.orgunitname,t.amount from temp t'; +execute immediate 'commit'; +execute immediate 'drop table temp'; \ No newline at end of file