Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java =================================================================== diff -u -r30325 -r30459 --- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 30325) +++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java (.../PackingManagerImpl.java) (revision 30459) @@ -6023,6 +6023,14 @@ Map tidPackIdMap = new HashMap(); // 按清洗时间组合器械包,不同清洗时间的器械包,创建不同的装配任务 for(TousseInstance toussei : tousseInstanceList){ + // 只有状态为已装配、已审核、已灭菌的外部代理灭菌包允许登记质量监测或者定期监测时勾选重新装配或者重新发货 + if(StringUtils.equals(tousseDefinition.getTousseType(), TousseDefinition.PACKAGE_TYPE_FOREIGNPROXY)){ + if(!StringUtils.equals(toussei.getStatus(), TousseInstance.STATUS_PACKED) + && !StringUtils.equals(toussei.getStatus(), TousseInstance.STATUS_REVIEWED) + && !StringUtils.equals(toussei.getStatus(), TousseInstance.STATUS_STERILED)){ + throw new SystemException(toussei.getTousseName() + "已经发货,暂不支持对已发货的外部代理灭菌包进行重新装配和重新发货,请重新填写申请单!"); + } + } WashAndDisinfectRecord wRecord = tousseInstanceManager.getLastWashRecord(toussei); if( wRecord != null ){ String washStartTime = wRecord.getStartDateStr();