Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java =================================================================== diff -u -r14440 -r14443 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14440) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/RecyclingApplicationManagerImpl.java (.../RecyclingApplicationManagerImpl.java) (revision 14443) @@ -4231,6 +4231,19 @@ itemVo.setUrgent(com.forgon.Constants.STR_NO); itemVo.setUrgentAmount(0); + //消毒物品,生成材料 + if(tousseInstance.getTousseDefinition().isDisinfection()){ + JSONArray array = new JSONArray(); + JSONObject obj = new JSONObject(); + for(MaterialInstance mi : tousseInstance.getTousseDefinition().getMaterialInstances()){ + obj.put("name", mi.getMaterialName()); + obj.put("tousseType", "器械"); + obj.put("count", mi.getCount()); + array.add(obj); + } + itemVo.setDisinfectMaterilas(array.toString()); + } + itemvos.add(itemVo); createQualityMonitorRecyclingApplication(itemvos); Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java =================================================================== diff -u -r14435 -r14443 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 14435) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/recyclingapplication/service/InvoicePlanManagerImpl.java (.../InvoicePlanManagerImpl.java) (revision 14443) @@ -1077,7 +1077,8 @@ InvoicePlan.TYPE_FOREIGNTOUSSEAPPLIACTION, InvoicePlan.TYPE_CUSTOM_TOUSSE_APPLIACTION_FORM, InvoicePlan.TYPE_SECOND_SUPPLY_ROOM, - InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION).contains(invoicePlan.getType())) { + InvoicePlan.TYPE_RECYCLINGCREATE_APPLICATION, + InvoicePlan.TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION).contains(invoicePlan.getType())) { // 需回收的物品,包括已终止的 Collection needRecycleTousseItemsIncludeTerminated = CollectionUtils .select(invoicePlan.getApplicationItems(),