Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r38764 -r38962
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 38764)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 38962)
@@ -690,6 +690,81 @@
 	}
 }
 
+var dataInfoWin;
+
+//GYSDERMYY-24：第三方器械包
+function loadTousseInstanceByBarcode(barcode,isThirdPartyTousse){
+	Ext.Ajax.request({
+		url: WWWROOT + '/disinfectSystem/baseData/thirdPartyTousseReceiveRecordController/loadTousseInstanceByBarcode.mhtml',
+		params: { barcode: barcode, isThirdPartyTousse: isThirdPartyTousse},
+		success: function (response, options) {
+			var result = Ext.decode(response.responseText);
+			if(result.data){
+				top.Ext.getCmp('tempBarcode2').setValue("");
+				if(result.data.length > 0){
+					if(result.data.length == 1){
+						loadScanGoods(true,result.data[0].barcode);
+					}else {
+						showMultiDataInfoWin(result.data);
+					}
+				}else {
+					loadScanGoods(true);
+				}
+			}else {
+				showResult(result.message);
+			}
+		}
+	});
+}
+
+//GYSDERMYY-24：显示多个第三方器械包
+function showMultiDataInfoWin(dataInfoArray){
+	var dataInfoStore = new top.Ext.data.Store({
+		data:dataInfoArray,
+		reader : new top.Ext.data.JsonReader({
+			fields : [
+				{name: 'barcode'},	
+				{name: 'thirdPartyBarcode'},	
+				{name: 'tousseName'}
+			]
+		})
+	});
+	var dataInfoGrid = new top.Ext.grid.GridPanel({
+		store:dataInfoStore,
+		columns: [
+			{header: "器械包名称", width: 130, dataIndex: 'tousseName'},
+			{header: "条码", width: 80,dataIndex: 'barcode'},
+			{header: "第三方条码", width: 80,dataIndex: 'thirdPartyBarcode'},
+			{header: "操作", width: 70,dataIndex: 'id',renderer : function(v, p, record){
+				var barcode = record.data.barcode;
+				return "<a href=\"#\" onclick=\"getCurrentTab().getdataInfo('"+ barcode +"');return false;\">选择</a>";
+			}}
+		],
+		stripeRows: true,
+		viewConfig: {
+			forceFit:true
+		},
+		height:200,
+		width:600
+	});
+	dataInfoWin = new top.Ext.Window({
+		autoHeight:true,
+		title : '器械包选择',
+		width:615,
+		draggable:true,
+		modal:true,
+		closeAction:'close',
+		items:[dataInfoGrid]
+   	});
+   	dataInfoWin.show();
+}
+
+//GYSDERMYY-24：选择第三方器械包
+function getdataInfo(barcode){
+	loadScanGoods(true,barcode);
+	dataInfoWin.close();
+}
+
 var useAmount = 0;
 /**
  * 扫描条码
@@ -705,6 +780,7 @@
 			var barcodeArray = barcode.split(",");
 			barcode = barcodeArray[barcodeArray.length - 1];
 		}
+		
 		if (checkBarcodeIsExist(barcode)) {
 			showResult('条码为：' + barcode + '的物品已在当前扫描物品里！');
 			top.Ext.getCmp('tempBarcode2').setValue('');
@@ -3877,6 +3953,7 @@
 							c.getEl().on('keypress', function (e) {
 								if (e.getKey() == 13) {
 									//判断是否开启有加急级别功能,并且还未加载过
+									var barcode = top.Ext.getCmp('tempBarcode2').getValue();
 									if (sstsConfig.enableUrgentFunction && !urgentLevelData.hasLoaded) {
 										Ext.Ajax.request({
 											url: WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
@@ -3888,7 +3965,17 @@
 												if (result.success) {
 													urgentLevelData.hasLoaded = true;
 													urgentLevelData.data = result.data;
-													loadScanGoods(true);
+													if(sstsConfig.enbaleThirdPartyTousseManagementFunction && barcode !== ''){
+														var isThirdPartyTousse = '否';
+														if(barcode.indexOf('@@') >= 0){
+															barcode = barcode.split('@@')[0];
+															isThirdPartyTousse = '是';
+														}
+														loadTousseInstanceByBarcode(barcode,isThirdPartyTousse);
+														return
+													}else {
+														loadScanGoods(true);
+													}
 												} else {
 													if (!result.message) {
 														showResult("加载加急级别失败.");
@@ -3900,7 +3987,17 @@
 											}
 										});
 									} else {
-										loadScanGoods(true);
+										if(sstsConfig.enbaleThirdPartyTousseManagementFunction && barcode !== ''){
+											var isThirdPartyTousse = '否';
+											if(barcode.indexOf('@@') >= 0){
+												barcode = barcode.split('@@')[0];
+												isThirdPartyTousse = '是';
+											}
+											loadTousseInstanceByBarcode(barcode,isThirdPartyTousse);
+											return
+										}else {
+											loadScanGoods(true);
+										}
 									}
 								}
 							});