Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40.sql =================================================================== diff -u -r27368 -r31165 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40.sql (.../4.9.39_4.9.40.sql) (revision 27368) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.39_4.9.40.sql (.../4.9.39_4.9.40.sql) (revision 31165) @@ -1,8 +1,8 @@ -update TousseItem set materialAmount=(select sum(mi.count) amount from TousseItem ti inner join TousseDefinition td on td.id = ti.tousseDefinitionId inner join MaterialInstance mi on mi.tousse_id = td.id where TousseItem.id=ti.id); -update RecyclingItem set materialAmount=(select sum(mi.count) amount from RecyclingItem ri inner join TousseDefinition td on td.id = ri.tousseDefinitionId inner join MaterialInstance mi on mi.tousse_id = td.id where RecyclingItem.id=ri.id); -update ClassifiedItem set materialAmount=(select sum(mi.count) amount from ClassifiedItem ci inner join TousseDefinition td on td.id = ci.toussedefinition_id inner join MaterialInstance mi on mi.tousse_id = td.id where ClassifiedItem.id=ci.id); -update PackingRecord set materialAmount=(select sum(mi.count) amount from PackingRecord pr inner join TousseDefinition td on td.id = pr.tousseDefinitionId inner join MaterialInstance mi on mi.tousse_id = td.id where PackingRecord.id=pr.id); -update TousseInstance set materialAmount=(select sum(mi.count) amount from TousseInstance ti inner join TousseDefinition td on td.id = ti.toussedefinition_id inner join MaterialInstance mi on mi.tousse_id = td.id where TousseInstance.id=ti.id); -update InvoiceItem set materialAmount=(select sum(mi.count) amount from InvoiceItem ii inner join TousseDefinition td on td.id = ii.tousseDefinitionId inner join MaterialInstance mi on mi.tousse_id = td.id where InvoiceItem.id=ii.id); -update ReturnGoodsItem set materialAmountAtThatTime=(select sum(mi.count) amount from ReturnGoodsItem ri inner join TousseDefinition td on td.id = ri.toussedefinition_id inner join MaterialInstance mi on mi.tousse_id = td.id where ReturnGoodsItem.id=ri.id); -update TousseDefinition set materialAmount=(select sum(mi.count) amount from MaterialInstance mi where mi.tousse_id = TousseDefinition.id); \ No newline at end of file +update TousseItem set materialAmount=(select sum(mi.count) from TousseDefinition td inner join MaterialInstance mi on mi.tousse_id = td.id where tousseitem.toussedefinitionid=td.id); +update RecyclingItem set materialAmount=(select sum(mi.count) from TousseDefinition td inner join MaterialInstance mi on mi.tousse_id = td.id where recyclingitem.toussedefinitionid=td.id); +update ClassifiedItem set materialAmount=(select sum(mi.count) from TousseDefinition td inner join MaterialInstance mi on mi.tousse_id = td.id where classifieditem.toussedefinition_id=td.id); +update PackingRecord set materialAmount=(select sum(mi.count) from TousseDefinition td inner join MaterialInstance mi on mi.tousse_id = td.id where PackingRecord.tousseDefinitionId=td.id); +update TousseInstance set materialAmount=(select sum(mi.count) from TousseDefinition td inner join MaterialInstance mi on mi.tousse_id = td.id where TousseInstance.toussedefinition_id=td.id); +update InvoiceItem set materialAmount=(select sum(mi.count) from TousseDefinition td inner join MaterialInstance mi on mi.tousse_id = td.id where InvoiceItem.tousseDefinitionId=td.id); +update ReturnGoodsItem set materialAmountAtThatTime=(select sum(mi.count) from TousseDefinition td inner join MaterialInstance mi on mi.tousse_id = td.id where ReturnGoodsItem.toussedefinition_id=td.id); +update TousseDefinition set materialAmount=(select sum(mi.count) from MaterialInstance mi where mi.tousse_id = TousseDefinition.id); \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_oracle.sql =================================================================== diff -u -r31049 -r31165 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_oracle.sql (.../4.9.72_4.9.73_oracle.sql) (revision 31049) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_oracle.sql (.../4.9.72_4.9.73_oracle.sql) (revision 31165) @@ -1,2 +1,8 @@ -insert into SterilizationFrequecyRemind (id, frequency, remindMode, sterilisation_id, sterilizer_id) select HIBERNATE_SEQUENCE.nextval, 1, '非强制提醒', ss.id, s.id from sterilizer s join sterilisation ss on s.needNoticeSterilisation = ss.sterilisation where s.needNoticeSterilisation is not null; -update Sterilizer set needNoticeSterilisation = null where needNoticeSterilisation is not null; \ No newline at end of file + declare resultcount int; + begin + select count(0) into resultcount from user_tab_columns where upper(table_name)=upper('Sterilizer') and upper(column_name)=upper('needNoticeSterilisation'); + if resultcount >= 1 then + execute immediate 'insert into SterilizationFrequecyRemind (id, frequency, remindMode, sterilisation_id, sterilizer_id) select HIBERNATE_SEQUENCE.nextval, 1, ''非强制提醒'', ss.id, s.id from sterilizer s join sterilisation ss on s.needNoticeSterilisation = ss.sterilisation where s.needNoticeSterilisation is not null'; + execute immediate 'update Sterilizer set needNoticeSterilisation = null where needNoticeSterilisation is not null'; + end if; + end; \ No newline at end of file Index: ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_sqlserver.sql =================================================================== diff -u -r31049 -r31165 --- ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_sqlserver.sql (.../4.9.72_4.9.73_sqlserver.sql) (revision 31049) +++ ssts-web/src/main/webapp/dataUpdater/sqls/4.9.72_4.9.73_sqlserver.sql (.../4.9.72_4.9.73_sqlserver.sql) (revision 31165) @@ -1,2 +1,7 @@ -insert into SterilizationFrequecyRemind (frequency, remindMode, sterilisation_id, sterilizer_id) select 1, '非强制提醒', ss.id, s.id from sterilizer s join sterilisation ss on s.needNoticeSterilisation = ss.sterilisation where s.needNoticeSterilisation is not null and s.needNoticeSterilisation <> ''; -update Sterilizer set needNoticeSterilisation = null where needNoticeSterilisation is not null; \ No newline at end of file +declare @resultCount numeric(10); +select @resultCount=count(0) from sysobjects so join syscolumns sc on so.id=sc.id +where so.xtype='u' and so.name='Sterilizer' and sc.name='needNoticeSterilisation'; +if @resultCount >= 1 begin + execute sp_executesql 'insert into SterilizationFrequecyRemind (frequency, remindMode, sterilisation_id, sterilizer_id) select 1, ''非强制提醒'', ss.id, s.id from sterilizer s join sterilisation ss on s.needNoticeSterilisation = ss.sterilisation where s.needNoticeSterilisation is not null and s.needNoticeSterilisation <> '''''; + execute sp_executesql 'update Sterilizer set needNoticeSterilisation = null where needNoticeSterilisation is not null'; +end; \ No newline at end of file