Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java =================================================================== diff -u -r26609 -r28232 --- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java (.../BorrowRecordAction.java) (revision 26609) +++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java (.../BorrowRecordAction.java) (revision 28232) @@ -191,6 +191,9 @@ message = "{success:false,msg:'该器械包不属于" + borrowRecord.getDepartName() + "。'}"; } + } else { + // 已归还的借物单再扫包实例条码,提示物品已归还 + message = "{success:false,msg:'借物单物品已全部归还!'}"; } } else { message = "{success:false,msg:'该器械包的状态为" @@ -243,6 +246,9 @@ message = "{success:false,msg:'该高值耗材不属于" + borrowRecord.getDepartName() + "'}"; } + } else { + // 已归还的借物单再扫包实例条码,提示物品已归还 + message = "{success:false,msg:'借物单物品已全部归还!'}"; } } else { message = "{success:false,msg:'该高值耗材的状态为"