Index: ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java =================================================================== diff -u -r33011 -r33012 --- ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33011) +++ ssts-sterile/src/main/java/com/forgon/disinfectsystem/sterilizationmanager/proxydisinfection/service/ProxyDisinfectionManagerImpl.java (.../ProxyDisinfectionManagerImpl.java) (revision 33012) @@ -775,6 +775,16 @@ ReviewedBasket reviewedBasket) { Set tis = tousseInstanceManager.getReviewedTousseInstance(reviewedBasket); if(CollectionUtils.isNotEmpty(tis)){ + + //判断篮筐或者装配记录上面,灭菌方式是否相同 + Set sterilizationModeSet = new HashSet(); + for (TousseInstance ti : tis) { + sterilizationModeSet.add(ti.getSterilingMode()); + if(sterilizationModeSet.size() > 1){ + throw new SystemException("该篮筐有多种不同灭菌方式的物品,不能装载物品,请先将筐内灭菌方式不同的物品移除"); + } + } + String orgUnitCode = AcegiHelper.getCurrentOrgUnitCode(); List list = new ArrayList(); for(TousseInstance ti : tis){