Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r34770 -r34838 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 34770) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 34838) @@ -6156,6 +6156,16 @@ if(StringUtils.equals(tousseItem.getHideRecycling(), Constants.STR_YES)){ continue; } + ////待二次回收”、“待归还”和“已归还 + if(InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION.equals(invoicePlan.getType())){ + if(InvoicePlan.RECYCLINGSTATUS_AWAITRECYCLE.equals(invoicePlan.getRecyclingStatus()) || InvoicePlan.RECYCLINGSTATUS_PARTRECYCLE.equals(invoicePlan.getRecyclingStatus())){ + if(!(InvoicePlan.RECYCLINGSTATUS_AWAIT_SECOND_RECEIVE.equals(tousseItem.getPackageStatus()) + || ForeignTousseApplication.APPLICATION_STATUS_TOBERETURNED.equals(tousseItem.getPackageStatus()) + || ForeignTousseApplication.APPLICATION_STATUS_RETRUN.equals(tousseItem.getPackageStatus()))){ + continue; + } + } + } TousseItemVo itemVo = tousseItemManager.tousseItem2TousseItemVo(tousseItem); itemVo.setErrorRemark(tousseInstanceManager.mergeErrorRemark(tousseItemIdMapTousseInstances.get(tousseItem.getId()))); itemVo.setDamageRemark(tousseInstanceManager.mergeDamageRemark(tousseItemIdMapTousseInstances.get(tousseItem.getId())));