Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r29592 -r29597 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 29592) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 29597) @@ -787,8 +787,11 @@ * @param confirmation */ private void splitErrorDamageDetail(RecyclingRecord record,boolean confirmation) { + if(!confirmation){ + return; + } boolean allowPackingWhenUnSupplementMaterial = CssdUtils.getSystemSetConfigByNameBool("allowPackingWhenUnSupplementMaterial"); - if(confirmation && allowPackingWhenUnSupplementMaterial){ + if(allowPackingWhenUnSupplementMaterial){ List recyclingItems = record.getItems(); if(CollectionUtils.isNotEmpty(recyclingItems)){ for (RecyclingItem recyclingItem : recyclingItems) { @@ -3063,24 +3066,31 @@ boolean tousseMaterialsLost = record.isTousseMaterialsLost();// 是否有丢失器械材料 boolean idCardLost = record.isIDCardLost();// 是否有丢失标识牌 boolean tousseMaterialsLostMustConfirm = CssdUtils.getSystemSetConfigByNameBool("tousseMaterialsLostMustConfirm",true); + boolean confirmed = false; if(materialsLost){ if(tousseMaterialsLost){ if(tousseMaterialsLostMustConfirm){ record.setStatus(RecyclingRecord.STATUS_UNCONFIRMED); }else{ // 配置为不需要确认 record.setStatus(RecyclingRecord.STATUS_CONFIRMED); + confirmed = true; } }else if(idCardLost){ // 标识牌丢失不需要确认 record.setStatus(RecyclingRecord.STATUS_CONFIRMED); + confirmed = true; } } if(confirmation){ if (StringUtils.equals(RecyclingRecord.STATUS_UNCONFIRMED,record.getStatus())) { record.setStatus(RecyclingRecord.STATUS_CONFIRMED); + confirmed = true; } } + if(confirmed){ + splitErrorDamageDetail(record, true); + } } private Container getContainerByBarcode(Map containerMap,String containerBarcode){