Index: ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js
===================================================================
diff -u -r14326 -r14346
--- ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js	(.../borrowRecordView.js)	(revision 14326)
+++ ssts-web/src/main/webapp/disinfectsystem/borrowRecord/borrowRecordView.js	(.../borrowRecordView.js)	(revision 14346)
@@ -196,7 +196,7 @@
 													nodesAmount++;
 												}
 											});
-											if(nodesAmount >= borrowNode.attributes.amount){
+											if(nodesAmount > borrowNode.attributes.amount){
 												if(result.type == "归还"){
 													showResult('归还物品数量不能大于借物数量！');
 													return false;
Index: ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java
===================================================================
diff -u -r14326 -r14346
--- ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 14326)
+++ ssts-web/src/main/java/com/forgon/disinfectsystem/borrowrecord/action/BorrowRecordAction.java	(.../BorrowRecordAction.java)	(revision 14346)
@@ -168,6 +168,7 @@
 							type = "归还";
 							if (StringUtils.equals(borrowRecord.getDepartCode(),
 									tousseInstance.getLocation())) {
+								boolean matched = false;
 								for (TousseItem item : borrowRecord.getItems()) {
 									if (StringUtils.equals(item.getTousseName(),
 											tousseInstance
@@ -178,9 +179,13 @@
 												+ "',barcode:'"
 												+ tousseInstance.getBarcode()
 												+ "',type:'" + type + "'}";
+										matched = true;
 										break;
 									}
 								}
+								if(!matched){
+									message = "{success:false,msg:\"未借出" + tousseInstance.getTousseName() + ",不能归还\"}";
+								}
 							} else {
 								message = "{success:false,msg:'该器械包不属于"
 										+ borrowRecord.getDepartName() + "。'}";
@@ -216,6 +221,7 @@
 								BorrowRecord.STATUS_BORROWED)) {
 							type = "归还";
 							if (StringUtils.equals(borrowRecord.getDepartCode(), expensiveDisposablegoods.getLocation())) {
+								boolean matched = false;
 								for (TousseItem item : borrowRecord.getItems()) {
 									if (StringUtils.equals(item.getTousseName(),
 											goodsName)) {
@@ -224,9 +230,13 @@
 												+ "',barcode:'"
 												+ expensiveDisposablegoods.getBarcode()
 												+ "',type:'" + type + "'}";
+										matched = true;
 										break;
 									}
 								}
+								if(!matched){
+									message = "{success:false,msg:\"未借出" + goodsName + ",不能归还\"}";
+								}
 							} else {
 								message = "{success:false,msg:'该高值耗材不属于"
 										+ borrowRecord.getDepartName() + "'}";