Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r38962 -r39024
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 38962)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 39024)
@@ -693,7 +693,7 @@
 var dataInfoWin;
 
 //GYSDERMYY-24：第三方器械包
-function loadTousseInstanceByBarcode(barcode,isThirdPartyTousse){
+function loadTousseInstanceByBarcode(barcode,tousseName,isThirdPartyTousse){
 	Ext.Ajax.request({
 		url: WWWROOT + '/disinfectSystem/baseData/thirdPartyTousseReceiveRecordController/loadTousseInstanceByBarcode.mhtml',
 		params: { barcode: barcode, isThirdPartyTousse: isThirdPartyTousse},
@@ -708,7 +708,11 @@
 						showMultiDataInfoWin(result.data);
 					}
 				}else {
-					loadScanGoods(true);
+					if(isThirdPartyTousse == '是'){
+						showResult(tousseName + '('+ barcode +')未接收入库，无法使用。');
+					}else {
+						loadScanGoods(true,barcode);
+					}
 				}
 			}else {
 				showResult(result.message);
@@ -3953,7 +3957,7 @@
 							c.getEl().on('keypress', function (e) {
 								if (e.getKey() == 13) {
 									//判断是否开启有加急级别功能,并且还未加载过
-									var barcode = top.Ext.getCmp('tempBarcode2').getValue();
+									var value = top.Ext.getCmp('tempBarcode2').getValue();
 									if (sstsConfig.enableUrgentFunction && !urgentLevelData.hasLoaded) {
 										Ext.Ajax.request({
 											url: WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
@@ -3967,11 +3971,14 @@
 													urgentLevelData.data = result.data;
 													if(sstsConfig.enbaleThirdPartyTousseManagementFunction && barcode !== ''){
 														var isThirdPartyTousse = '否';
+														var tousseName = '';
+														var barcode = value;
 														if(barcode.indexOf('@@') >= 0){
-															barcode = barcode.split('@@')[0];
+															barcode = value.split('@@')[0];
 															isThirdPartyTousse = '是';
+															tousseName = value.split('@@')[1];
 														}
-														loadTousseInstanceByBarcode(barcode,isThirdPartyTousse);
+														loadTousseInstanceByBarcode(barcode,tousseName,isThirdPartyTousse);
 														return
 													}else {
 														loadScanGoods(true);
@@ -3989,11 +3996,14 @@
 									} else {
 										if(sstsConfig.enbaleThirdPartyTousseManagementFunction && barcode !== ''){
 											var isThirdPartyTousse = '否';
+											var tousseName = '';
+											var barcode = value;
 											if(barcode.indexOf('@@') >= 0){
-												barcode = barcode.split('@@')[0];
+												barcode = value.split('@@')[0];
 												isThirdPartyTousse = '是';
+												tousseName = value.split('@@')[1];
 											}
-											loadTousseInstanceByBarcode(barcode,isThirdPartyTousse);
+											loadTousseInstanceByBarcode(barcode,tousseName,isThirdPartyTousse);
 											return
 										}else {
 											loadScanGoods(true);