Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r34389 -r34416 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 34389) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 34416) @@ -4909,6 +4909,10 @@ } else if (CollectionUtils.matchesAll(needRecycleTousseItemsExcludeTerminated, PredicateUtils.notPredicate(recycledPred))){ // 所有应回收的物品,都未回收 recyclingStatus = InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE; + if(invoicePlan.isForeignTousseAppliaction()){ + //外来器械包申请单回收状态为"待接收" + recyclingStatus = InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVE; + } } else if (CollectionUtils.matchesAll(needRecycleTousseItemsExcludeTerminated, recycledPred)){ //回收时允许保存未入筐的消毒包(必须开启了部分回收功能enablePartRecycle:true) @@ -4924,12 +4928,24 @@ if(recyclingAllowsSaveOfNonBasketDisinfectionTousse && enablePartRecycle && !CollectionUtils.matchesAll(needRecycleTousseItemsExcludeTerminated, recycledPredOfAmount)){ recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE; + if(invoicePlan.isForeignTousseAppliaction()){ + //外来器械包申请单回收状态为"部分接收" + recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTAWAITRECEIVE; + } }else{ recyclingStatus = InvoicePlan.RECYCLINGSTATUS_RECYCLED; + if(invoicePlan.isForeignTousseAppliaction()){ + //外来器械包申请单回收状态为"已接收" + recyclingStatus = InvoicePlan.RECYCLINGSTATUS_AWAITRECEIVED; + } } } else { // 其他情况为部分回收 recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE; + if(invoicePlan.isForeignTousseAppliaction()){ + //外来器械包申请单回收状态为"部分接收" + recyclingStatus = InvoicePlan.RECYCLINGSTATUS_PARTAWAITRECEIVE; + } } invoicePlan.setRecyclingStatus(recyclingStatus); }