Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r16475 -r16529
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 16475)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 16529)
@@ -582,7 +582,7 @@
 					select : function(combo, record, index) {
 						var selectedRecord = top.Ext.getCmp('foreignProxyDisinfectionGrid').getSelectionModel().getSelected();
 						var currentPackageType = selectedRecord.data.packageType;
-						if(checkItemIsRepeat(selectedRecord.data.tousseName, record.data.typeName, selectedRecord.data.sterilingType, selectedRecord.id)){
+						if(checkItemIsRepeat(selectedRecord.data.tousseName, record.data.typeName, selectedRecord.data.sterilingType,top.Ext.getCmp('basketBarcode1').getValue(), selectedRecord.id)){
 							showResult("此记录项在"+entityName+"单明细中已存在");
 							combo.setValue(currentPackageType);
 						}else{
@@ -616,7 +616,7 @@
 					select : function(combo, record, index) {
 						var selectedRecord = top.Ext.getCmp('foreignProxyDisinfectionGrid').getSelectionModel().getSelected();
 						var currentSterilingType = selectedRecord.data.sterilingType;
-						if(checkItemIsRepeat(selectedRecord.data.tousseName, selectedRecord.data.packageType, record.data.typeName, selectedRecord.id)){
+						if(checkItemIsRepeat(selectedRecord.data.tousseName, selectedRecord.data.packageType, record.data.typeName,top.Ext.getCmp('basketBarcode1').getValue(), selectedRecord.id)){
 							showResult("此记录项在"+entityName+"单明细中已存在");
 							combo.setValue(currentSterilingType);
 						}else{
@@ -1912,23 +1912,26 @@
 }
 
 //tousseName, packageType, sterileType 当三项同时存在某一个记录里isExist才是true
-function checkItemIsRepeat(tousseName, packageType, sterilingType, currentRecordId){
+function checkItemIsRepeat(tousseName, packageType, sterilingType,basketBarcode, currentRecordId){
 	var isExist = false;
 	for(var i=0,len=foreignItemStore.getCount(); i<len; i++){
 		var record = foreignItemStore.getAt(i);
 		if(currentRecordId && record.id == currentRecordId){
 			continue;
 		}
 		if(record.get('tousseName') == tousseName && record.get('packageType') == packageType && record.get('sterilingType') == sterilingType){
-			isExist = true;
-			break;
+			//增加灭菌筐的判断(经测试不管是否有录入篮筐都可以做到校验)
+			if(record.get('basketBarcode') == basketBarcode){
+				isExist = true;
+				break;
+			}
 		}
 	}
 	return isExist;
 }
 
 function addItemToGrid(tousseName,count,packageType,sterilingType,sterileStartDate,basketName,basketBarcode,tousseType){
-	if(checkItemIsRepeat(tousseName, packageType, sterilingType, '')){
+	if(checkItemIsRepeat(tousseName, packageType, sterilingType,basketBarcode, '')){
 		showResult("此记录项在"+entityName+"单明细中已存在");
 		return;
 	}