Index: ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java =================================================================== diff -u -r19824 -r20001 --- ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 19824) +++ ssts-tousse/src/main/java/com/forgon/disinfectsystem/tousse/toussedefinition/service/TousseDefinitionManagerImpl.java (.../TousseDefinitionManagerImpl.java) (revision 20001) @@ -481,6 +481,7 @@ diposableGoodsInstance.setDiposableGoods(disposableGoods); diposableGoodsInstance.setAmount(Integer.valueOf(count)); diposableGoodsInstance.setSequence(sequence); + diposableGoodsInstance.setTousse(td); diposableGoodsInstances.add(diposableGoodsInstance); Double referencePrice = 0.0; @@ -2694,6 +2695,7 @@ DiposableGoodsInstance newItem = new DiposableGoodsInstance(); newItem.setDiposableGoods(item.getDiposableGoods()); newItem.setAmount(item.getAmount()); + newItem.setTousse(td); diposableGoodsItems.add(newItem); } td.setDiposableGoodsItems(diposableGoodsItems); Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java =================================================================== diff -u -r19963 -r20001 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 19963) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBasedataManagerImpl.java (.../ImportBasedataManagerImpl.java) (revision 20001) @@ -65,6 +65,7 @@ import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition; import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinitionMaterial; import com.forgon.disinfectsystem.entity.basedatamanager.warehouse.WareHouse; +import com.forgon.disinfectsystem.entity.invoicemanager.DiposableGoodsItem; import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntry; import com.forgon.disinfectsystem.entity.materialmanager.MaterialEntryItem; import com.forgon.disinfectsystem.exception.ImportDataException; @@ -1517,7 +1518,7 @@ tousseDefinition = setPersistenceTousseDefinitionPropertyValueWithOtherTousseDefinition( persistenceTousseDefinition, tousseDefinition); } - bindTousseDefinition(materialInstanceList, tousseDefinition); + bindTousseDefinition(tousseDefinition , materialInstanceList , null); tousseDefinition.setMaterialInstances(materialInstanceList); // 类型是外来器械包 tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGN); @@ -1631,7 +1632,7 @@ tousseDefinition = setPersistenceTousseDefinitionPropertyValueWithOtherTousseDefinition( persistenceTousseDefinition, tousseDefinition); } - bindTousseDefinition(materialInstanceList, tousseDefinition); + bindTousseDefinition(tousseDefinition , materialInstanceList , null); tousseDefinition.setMaterialInstances(materialInstanceList); // 类型是外来器械包 tousseDefinition.setTousseType(TousseDefinition.PACKAGE_TYPE_FOREIGN); @@ -1883,7 +1884,7 @@ }else{ isNewTousse = true; } - bindTousseDefinition(materialInstanceList, tousseDefinition); + bindTousseDefinition(tousseDefinition,materialInstanceList,diposableGoodsInstanceList); tousseDefinition.setMaterialInstances(materialInstanceList); tousseDefinition .setDiposableGoodsItems(diposableGoodsInstanceList); @@ -2365,7 +2366,7 @@ }else { isNewTousse = true; } - bindTousseDefinition(materialInstanceList, tousseDefinition); + bindTousseDefinition(tousseDefinition , materialInstanceList,diposableGoodsInstanceList); tousseDefinition.setMaterialInstances(materialInstanceList); tousseDefinition.setDiposableGoodsItems(diposableGoodsInstanceList); // 设置材料的顺序 @@ -2422,14 +2423,19 @@ return cleanMethodNames; } - private void bindTousseDefinition( - List materialInstanceList, - TousseDefinition tousseDefinition) { - if (materialInstanceList != null) { - for (MaterialInstance m : materialInstanceList) { + private void bindTousseDefinition(TousseDefinition tousseDefinition + , List MaterialInstances + , List diposableGoodsInstances) { + if (MaterialInstances != null) { + for (MaterialInstance m : MaterialInstances) { m.setTousse(tousseDefinition); } } + if (diposableGoodsInstances != null) { + for (DiposableGoodsInstance di : diposableGoodsInstances) { + di.setTousse(tousseDefinition); + } + } } private void deleteMaterialInstanceByTousseDefinition( Index: ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java =================================================================== diff -u -r15559 -r20001 --- ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java (.../ImportBaseDataFromZipManagerImpl.java) (revision 15559) +++ ssts-maintain/src/main/java/com/forgon/disinfectsystem/maintain/importbasedata/service/ImportBaseDataFromZipManagerImpl.java (.../ImportBaseDataFromZipManagerImpl.java) (revision 20001) @@ -1295,6 +1295,7 @@ diposableGoodsItems.add(dgi); dgi.setDiposableGoods(disposableGoods); dgi.setAmount(entry.getValue().getAsInt()); + dgi.setTousse(target); } target.setDiposableGoodsItems(diposableGoodsItems); }