Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r32930 -r32974 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 32930) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 32974) @@ -53,6 +53,7 @@ import com.forgon.directory.model.OrgUnit; import com.forgon.directory.service.OrgUnitManager; import com.forgon.directory.vo.LoginUserData; +import com.forgon.disinfectsystem.adverseeventrecord.service.AdverseEventRecordManager; import com.forgon.disinfectsystem.basedatamanager.goodsstock.service.GoodsStockManager; import com.forgon.disinfectsystem.basedatamanager.supplier.service.SupplierManager; import com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager; @@ -208,7 +209,14 @@ private ProjectDao projectDaoMybatis; private OperationManager operationManager; + + private AdverseEventRecordManager adverseEventRecordManager; + public void setAdverseEventRecordManager( + AdverseEventRecordManager adverseEventRecordManager) { + this.adverseEventRecordManager = adverseEventRecordManager; + } + public void setOperationManager(OperationManager operationManager) { this.operationManager = operationManager; } @@ -534,6 +542,8 @@ } } } + //删除申请单关联的不良事件GYEY-758 + adverseEventRecordManager.deleteInvoicePlanAdverseEventRecord(invoicePlan); logDeleteInvoicePlan(invoicePlan); objectDao.delete(invoicePlan); }