Index: ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java =================================================================== diff -u -r33937 -r33954 --- ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 33937) +++ ssts-webservice/src/main/java/com/forgon/disinfectsystem/webservice/service/ServiceManagerImpl.java (.../ServiceManagerImpl.java) (revision 33954) @@ -6682,6 +6682,9 @@ if(!matched){ throw new RuntimeException("未借出" + tousseInstance.getTousseName() + ",不能归还"); } + } else { + // 已归还的借物单再扫包实例条码,提示物品已归还 + throw new RuntimeException("借物单物品已全部归还"); } }else if (barcodeDevice instanceof ExpensiveDisposablegoods) { ExpensiveDisposablegoods expensiveDisposablegoods = (ExpensiveDisposablegoods) barcodeDevice; @@ -6719,6 +6722,9 @@ if(!matched){ throw new RuntimeException("未借出" + goodsName + ",不能归还"); } + } else { + // 已归还的借物单再扫包实例条码,提示物品已归还 + throw new RuntimeException("借物单物品已全部归还"); } } else { throw new RuntimeException("该高值耗材的状态为" + expensiveDisposablegoods.getStatus() + ",不能借出。");