Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoodsInstance.java =================================================================== diff -u -r13739 -r19832 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoodsInstance.java (.../DiposableGoodsInstance.java) (revision 13739) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/assestmanagement/DiposableGoodsInstance.java (.../DiposableGoodsInstance.java) (revision 19832) @@ -12,6 +12,7 @@ import org.hibernate.annotations.Cache; import org.hibernate.annotations.CacheConcurrencyStrategy; +import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinitionMaterial; /** @@ -29,6 +30,11 @@ private DisposableGoods diposableGoods; + /** + * 关联的器械包定义 + */ + private TousseDefinition tousse; + private Integer amount; private String type = "一次性物品"; @@ -52,7 +58,17 @@ public void setDiposableGoods(DisposableGoods disposableGoods) { this.diposableGoods = disposableGoods; } + + @ManyToOne + @JoinColumn(name = "tousseDefinition_id") + public TousseDefinition getTousse() { + return tousse; + } + public void setTousse(TousseDefinition tousse) { + this.tousse = tousse; + } + public Integer getAmount() { return amount; } Index: ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java =================================================================== diff -u -r19831 -r19832 --- ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 19831) +++ ssts-userecord/src/main/java/com/forgon/disinfectsystem/useRecord/service/UseRecordManagerImpl.java (.../UseRecordManagerImpl.java) (revision 19832) @@ -2000,6 +2000,8 @@ try { BeanUtils.copyProperties(newForeignTousseDefinition, foreignTousseDefinition); newForeignTousseDefinition.setId(null); + newForeignTousseDefinition.setParentID(foreignTousseDefinition.getId()); + newForeignTousseDefinition.setAncestorID(foreignTousseDefinition.getAncestorID()); newForeignTousseDefinition.setMaterialInstances(null); newForeignTousseDefinition.setDiposableGoodsItems(null); newForeignTousseDefinition.setInvoicePlanID(ra.getId()); @@ -2011,6 +2013,9 @@ MaterialInstance newMaterialInstance = new MaterialInstance(); BeanUtils.copyProperties(newMaterialInstance, materialInstance); newMaterialInstance.setId(null); + newMaterialInstance.setTousse(newForeignTousseDefinition); + newMaterialInstance.setMaterialDefinition(materialInstance.getMaterialDefinition()); + objectDao.save(newMaterialInstance); newMaterialInstanceList.add(newMaterialInstance); } newForeignTousseDefinition.setMaterialInstances(newMaterialInstanceList); @@ -2023,6 +2028,9 @@ DiposableGoodsInstance newDiposableGoodsInstance = new DiposableGoodsInstance(); BeanUtils.copyProperties(newDiposableGoodsInstance, diposableGoodsInstance); newDiposableGoodsInstance.setId(null); + newDiposableGoodsInstance.setTousse(newForeignTousseDefinition); + newDiposableGoodsInstance.setDiposableGoods(diposableGoodsInstance.getDiposableGoods()); + objectDao.save(newDiposableGoodsInstance); newDiposableGoodsInstanceList.add(newDiposableGoodsInstance); } newForeignTousseDefinition.setDiposableGoodsItems(newDiposableGoodsInstanceList); @@ -2127,6 +2135,8 @@ try { BeanUtils.copyProperties(newForeignTousseDefinition, foreignTousseDefinition); newForeignTousseDefinition.setId(null); + newForeignTousseDefinition.setParentID(foreignTousseDefinition.getId()); + newForeignTousseDefinition.setAncestorID(foreignTousseDefinition.getAncestorID()); newForeignTousseDefinition.setMaterialInstances(null); newForeignTousseDefinition.setDiposableGoodsItems(null); newForeignTousseDefinition.setInvoicePlanID(recyclingApplication.getId()); @@ -2138,6 +2148,9 @@ MaterialInstance newMaterialInstance = new MaterialInstance(); BeanUtils.copyProperties(newMaterialInstance, materialInstance); newMaterialInstance.setId(null); + newMaterialInstance.setTousse(newForeignTousseDefinition); + newMaterialInstance.setMaterialDefinition(materialInstance.getMaterialDefinition()); + objectDao.save(newMaterialInstance); newMaterialInstanceList.add(newMaterialInstance); } newForeignTousseDefinition.setMaterialInstances(newMaterialInstanceList); @@ -2150,6 +2163,9 @@ DiposableGoodsInstance newDiposableGoodsInstance = new DiposableGoodsInstance(); BeanUtils.copyProperties(newDiposableGoodsInstance, diposableGoodsInstance); newDiposableGoodsInstance.setId(null); + newDiposableGoodsInstance.setTousse(newForeignTousseDefinition); + newDiposableGoodsInstance.setDiposableGoods(diposableGoodsInstance.getDiposableGoods()); + objectDao.save(newDiposableGoodsInstance); newDiposableGoodsInstanceList.add(newDiposableGoodsInstance); } newForeignTousseDefinition.setDiposableGoodsItems(newDiposableGoodsInstanceList); Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java =================================================================== diff -u -r18655 -r19832 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java (.../MaterialInstance.java) (revision 18655) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/materialinstance/MaterialInstance.java (.../MaterialInstance.java) (revision 19832) @@ -136,16 +136,6 @@ this.tousse = tousse; } - @Transient - public Long getTousseId() { - getTousse(); - return tousse.getId(); - } - - public void setTousseId(Long tousseId) { - - } - @Override @Transient public String getType() { Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java =================================================================== diff -u -r19716 -r19832 --- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 19716) +++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/basedatamanager/toussedefinition/TousseDefinition.java (.../TousseDefinition.java) (revision 19832) @@ -475,9 +475,7 @@ this.materialInstances = materialInstances; } - @OneToMany(fetch = FetchType.LAZY) - @Cascade(value = { org.hibernate.annotations.CascadeType.ALL }) - @JoinColumn(name = "tousseDefinition_id") + @OneToMany(mappedBy = "tousse", fetch = FetchType.LAZY, cascade = { CascadeType.ALL }) @OrderBy("sequence") public List getDiposableGoodsItems() { return diposableGoodsItems;