Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java =================================================================== diff -u -r36751 -r36965 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 36751) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/service/ForeignTousseApplicationManagerImpl.java (.../ForeignTousseApplicationManagerImpl.java) (revision 36965) @@ -3362,6 +3362,15 @@ jsonobj.put("iconCls", "task-folder"); jsonobj.put("expanded", true); jsonobj.put("temporaryPurchase", td.getTemporaryPurchase()); + //增加输出外来器械申请单上的 + InvoicePlan invoicePlan = tousseItem.getInvoicePlan(); + if(invoicePlan instanceof ForeignTousseApplication){ + ForeignTousseApplication foreignTousseApplication = (ForeignTousseApplication)invoicePlan; + //厂家接收人 + jsonobj.put("returneeOfSupplier", foreignTousseApplication.getReturneeOfSupplier()); + //供应室归还人 + jsonobj.put("returnMan", foreignTousseApplication.getReturnMan()); + } //物品终止状态 jsonobj.put("isTerminated", tousseItem.getIsTerminated() == null ? false : tousseItem.getIsTerminated()); UrgentLevel urgentLevelObj = tousseItem.getUrgentLevelObj();