Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp =================================================================== diff -u -r24702 -r24792 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 24702) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.jsp (.../recycleForTouchScreen.jsp) (revision 24792) @@ -207,7 +207,7 @@ - +

Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java =================================================================== diff -u -r24758 -r24792 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24758) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/service/RecyclingRecordManagerImpl.java (.../RecyclingRecordManagerImpl.java) (revision 24792) @@ -4220,6 +4220,16 @@ //设置所有页的数据记录 printData.setPages(pagesJsonArray); list.add(printData); + + //将对应的申请单及申请项设为已打印 + if(ip != null){ + if(CollectionUtils.isNotEmpty(ip.getApplicationItems())){ + for (TousseItem ti : ip.getApplicationItems()) { + ti.setIsPrinted(true); + } + } + ip.setPrinted(InvoicePlan.PRINT_STATUS_PRINTED); + } } } return list;