Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js
===================================================================
diff -u -r29208 -r29270
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 29208)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionView.js	(.../foreignProxyDisinfectionView.js)	(revision 29270)
@@ -578,16 +578,21 @@
 				anchor : '97%',
 				listeners:{
 					select:function(combo, record, index){
-						combo.setValue(record.data.name);
-						setTimeout(function(){
+						var selectedRecord = selectModel.selections.items[0];
+						var currentName = selectedRecord.data.departCodingName;
+						if(checkItemIsRepeat(selectedRecord.data.tousseName, selectedRecord.data.packageType, selectedRecord.data.sterilingType,top.Ext.getCmp('basketBarcode1').getValue(),selectedRecord.id, record.data.id)){
+							showResult("此记录项在"+entityName+"单明细中已存在");
+							combo.setValue(currentName);
+						}else{
 							for(var i=0,len=foreignItemStore.getCount(); i<len; i++){
 								var records = foreignItemStore.getAt(i);
-								if(selectModel.selections.items[0].data.tousseName == records.data.tousseName){
+								if(selectModel.selections.items[0].data.tousseName == records.data.tousseName && selectModel.selections.items[0].data.departCoding == records.data.departCoding){
 									records.set('departCoding',record.data.id);
 									records.set('departCodingName',record.data.name);
+									combo.setValue(record.data.name);
 								}
 							}
-						}, 500);
+						}
 					}
 				}
 			})
@@ -2129,7 +2134,7 @@
 		if(currentRecordId && record.id == currentRecordId){
 			continue;
 		}
-		if(record.get('tousseName') == tousseName && record.get('packageType') == packageType && record.get('sterilingType') == sterilingType){
+		if((record.get('tousseName') == tousseName && record.get('departCoding') == departCoding) && record.get('packageType') == packageType && record.get('sterilingType') == sterilingType){
 			//增加灭菌筐的判断(经测试不管是否有录入篮筐都可以做到校验)
 			if(record.get('basketBarcode') == basketBarcode){
 				isExist = true;