Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r32457 -r32465
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 32457)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 32465)
@@ -966,15 +966,15 @@
 						}
 					}
 				}
-			}else if(idCard == '是' && idCardBarcode !== ''){
+			} else if (idCard == '是' && idCardBarcode !== '') {
 				var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val();
-				if(tousseOrIDCardInstanceBarcodes !== ''){
+				if (tousseOrIDCardInstanceBarcodes !== '') {
 					var arr = tousseOrIDCardInstanceBarcodes.split(';');
 					var index = arr.indexOf(idCardBarcode);
-					arr.splice(index,1);
-					if(arr.length > 0){
+					arr.splice(index, 1);
+					if (arr.length > 0) {
 						$('#tousseOrIDCardInstanceBarcodes' + i).val(arr.join(';'))
-					}else {
+					} else {
 						$('#tousseOrIDCardInstanceBarcodes' + i).val('')
 					}
 				}
@@ -1577,7 +1577,7 @@
 		imageButton = '<img src="/images/btn_query.png" onclick = "basketLoadGoods(\'' + basketName + '\',\'' + basketBarcode + '\',\'' + classifyBasketId + '\');" >';
 	}
 	basketElement += '<font onclick="topScannedBasket(event,this);">' + (sequence && sequence > 0 ? (sequence + '.' + basketName) : basketName) + '</font>' + '<font>' + imageButton + '</font>';
-	if (sumCount) {
+	if (sumCount && sumCount > 0) {
 		basketElement += '<font class="totalAmount"><span class="totalnum">0</span>/<span class="sumCount">' + sumCount + '</span></font>';
 		basketElement += '<span style="display:none" class="hiddenSumCountValue">' + sumCount + '</span>';
 	} else {
@@ -1996,11 +1996,11 @@
 						}
 					}
 
-					if(tousseOrIDCardInstanceBarcodes == ''){
+					if (tousseOrIDCardInstanceBarcodes == '') {
 						$('#tousseOrIDCardInstanceBarcodes' + i).val(barcode);
-					}else {
+					} else {
 						var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + i).val();
-						if(tousseOrIDCardInstanceBarcodes.indexOf(barcode) == -1){
+						if (tousseOrIDCardInstanceBarcodes.indexOf(barcode) == -1) {
 							var str = tousseOrIDCardInstanceBarcodes + ';' + barcode;
 							$('#tousseOrIDCardInstanceBarcodes' + i).val(str);
 						}
@@ -2113,18 +2113,18 @@
 
 					if ($('#appType').val() == "质量监测回收申请单") {
 						var isAlert = true;
-						if(msg.idCardInstance){
+						if (msg.idCardInstance) {
 							$("#tousseItemTable > tbody > tr").each(function (row, element) {
 								var tousseName = $('#tousseName' + row).val();
-								if(tousseName == msg.idCardInstance.tousseName && msg.idCardInstance.barcode !== ''){
+								if (tousseName == msg.idCardInstance.tousseName && msg.idCardInstance.barcode !== '') {
 									isAlert = false;
 								}
 							})
 						}
-						if(isAlert){
+						if (isAlert) {
 							alertDiv('质量监测回收申请单不允许添加新的物品，只能回收申请单中的物品！');
-						    return false;
-						}   
+							return false;
+						}
 					}
 					if ($('#appType').val() == "申请还物单") {
 						alertDiv("申请还物单不允许添加新的物品，只能回收申请单中的物品！");
@@ -2463,7 +2463,7 @@
 }
 
 //显示标识牌条码列表
-function showIDCardBarcodes(row,tousseName,tousseOrIDCardInstanceBarcodes){
+function showIDCardBarcodes(row, tousseName, tousseOrIDCardInstanceBarcodes) {
 	$("#dialogShowIDCardBarcodes").dialog({
 		resizable: false,
 		height: 500,
@@ -2478,10 +2478,10 @@
 			html += '</tr>';
 			html += '</thead>';
 			html += '<tbody>';
-			for(var i=0;i<arr.length;i++){
+			for (var i = 0; i < arr.length; i++) {
 				html += '<tr>';
-				var img = '<span style="vertical-align: middle;cursor: pointer;"><img style="width: 20px;margin-right: 10px;" onclick="openPhotos('+row+',\''+arr[i]+'\');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></span>';
-				html += '<td>'+ img + "<span>"+ tousseName +"</span>" +'</td><td>'+arr[i]+'</td>';
+				var img = '<span style="vertical-align: middle;cursor: pointer;"><img style="width: 20px;margin-right: 10px;" onclick="openPhotos(' + row + ',\'' + arr[i] + '\');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></span>';
+				html += '<td>' + img + "<span>" + tousseName + "</span>" + '</td><td>' + arr[i] + '</td>';
 				html += '</tr>';
 			}
 			html += '</tbody>';
@@ -2499,33 +2499,33 @@
 }
 
 //FSSDERMYY-13:打开拍照的功能
-function openPhotos(row,barcodes) {
+function openPhotos(row, barcodes) {
 	var imageIds = '';
 	var videoIds = '';
-	var tousseDefinitionId = $('#tousseDefinitionID'+row).val();
-	var tousseId = $('#tousseDefinitionID'+row).val();
-	var isThereIdentificationCard = $('#isThereIdentificationCard'+row).val();
-	var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes'+row).val();
+	var tousseDefinitionId = $('#tousseDefinitionID' + row).val();
+	var tousseId = $('#tousseDefinitionID' + row).val();
+	var isThereIdentificationCard = $('#isThereIdentificationCard' + row).val();
+	var tousseOrIDCardInstanceBarcodes = $('#tousseOrIDCardInstanceBarcodes' + row).val();
 	var barcode = barcodes || '';
-	var tousseName = $('#tousseName'+row).val();
-	if(isThereIdentificationCard == '是'){
-		if(tousseOrIDCardInstanceBarcodes == ''){
+	var tousseName = $('#tousseName' + row).val();
+	if (isThereIdentificationCard == '是') {
+		if (tousseOrIDCardInstanceBarcodes == '') {
 			showResult('请先扫描标识牌条码，然后进行拍摄！');
 			return;
-		}else if(tousseOrIDCardInstanceBarcodes.split(';').length == 1){
+		} else if (tousseOrIDCardInstanceBarcodes.split(';').length == 1) {
 			barcode = tousseOrIDCardInstanceBarcodes;
-		}else {
-			if(barcode == ''){
-				showIDCardBarcodes(row,tousseName,tousseOrIDCardInstanceBarcodes);
+		} else {
+			if (barcode == '') {
+				showIDCardBarcodes(row, tousseName, tousseOrIDCardInstanceBarcodes);
 				return
 			}
 		}
 	}
 
-	if(barcode !== ''){
+	if (barcode !== '') {
 		tousseId += ';' + barcode;
 	}
-	if(cameraPhotoInfoMap.has(tousseId)){
+	if (cameraPhotoInfoMap.has(tousseId)) {
 		var cameraPhotoInfo = cameraPhotoInfoMap.get(tousseId);
 		imageIds = cameraPhotoInfo.imageFileIds;
 		videoIds = cameraPhotoInfo.videoFileIds;
@@ -2534,39 +2534,39 @@
 		tousseDefinitionId: '',
 		goodsName: tousseName,
 		isLook: false,
-		barcode:barcode,
+		barcode: barcode,
 		imageType: '回收采集图片',
 		videoType: '回收采集视频',
-		imageIds:imageIds,
-		videoIds:videoIds
+		imageIds: imageIds,
+		videoIds: videoIds
 	}
 	openCameraPhotoWindow(params, function (value) {
-		if(value == true){
+		if (value == true) {
 			var newImageIds = document.getElementById('imageIds').value;
 			var newVideoIds = document.getElementById('videoIds').value;
-			if(newImageIds == '' && newVideoIds == ''){
+			if (newImageIds == '' && newVideoIds == '') {
 				return;
 			}
-			
-			if(newImageIds !== ''){
+
+			if (newImageIds !== '') {
 				imageIds = newImageIds;
 			}
 
-			if(newVideoIds !== ''){
+			if (newVideoIds !== '') {
 				videoIds = newVideoIds;
 			}
 
-			cameraPhotoInfoMap.set(tousseId,{
-				tousseId:tousseDefinitionId,
-				barcode:barcode,
-				imageFileIds:imageIds,
-				videoFileIds:videoIds
+			cameraPhotoInfoMap.set(tousseId, {
+				tousseId: tousseDefinitionId,
+				barcode: barcode,
+				imageFileIds: imageIds,
+				videoFileIds: videoIds
 			})
 
 			document.getElementById('imageIds').value = '';
 			document.getElementById('videoIds').value = '';
-		}else {
-			if(cameraPhotoInfoMap.has(tousseId)){
+		} else {
+			if (cameraPhotoInfoMap.has(tousseId)) {
 				cameraPhotoInfoMap.deletes(tousseId);
 			}
 		}
@@ -2950,7 +2950,7 @@
 }
 
 // 获取已入篮筐的数据
-function getScanedGoods(isCleanedEntirely) {
+function getScanedGoods(isCleanedEntirely, materialIsAdd) {
 	var basketJsonArray = new Array();
 	$("#basketsUl li").each(function () {
 		var hideStr = $(this).find('input').val();
@@ -2977,6 +2977,23 @@
 						idCardBarcode: json.idCardBarcode,
 						putBasketMaxAmount: json.putBasketMaxAmount
 					});
+				} else if (materialIsAdd) {
+					var type = json.type;
+					var name = json.tousseName;
+					if (type == '材料') {
+						name = json.materialName;
+					}
+					scanedGoodsArray.push({
+						name: name,
+						tousseDefinitionID: json.tousseDefinitionID,
+						tousseName: json.tousseName,
+						tousseType: json.tousseType,
+						type: json.type,
+						amount: json.amount,
+						id: json.classifyBasketId,
+						idCardBarcode: json.idCardBarcode,
+						putBasketMaxAmount: json.putBasketMaxAmount
+					});
 				}
 			}
 		});
@@ -3425,46 +3442,46 @@
 }
 
 //判断能否入筐
-function isPutTousseInTheBasket(row, recycleAmountNew){
-	var tousseType = $('#tousseType'+row).val();
+function isPutTousseInTheBasket(row, recycleAmountNew) {
+	var tousseType = $('#tousseType' + row).val();
 	var isApplyEntireTousse = $('#isApplyEntireTousse' + row).val();
 	var tousseDefinitionID = $('#tousseDefinitionID' + row).val();
 	var materials = $('#materials' + row).val();
 	var tousseName = $('#tousseName' + row).val();
-	if(tousseType == '消毒物品' && isApplyEntireTousse == '否'){
-		if(materials == ''){
+	if (tousseType == '消毒物品' && isApplyEntireTousse == '否') {
+		if (materials == '') {
 			$.ajax({
-				type:'post',
-				url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getMaterialInstancesByTousseId.do',
-				data:{id:tousseDefinitionID},
-				dataType:'json',
-				success:function(result){
+				type: 'post',
+				url: WWWROOT + '/disinfectSystem/recyclingRecordAction!getMaterialInstancesByTousseId.do',
+				data: { id: tousseDefinitionID },
+				dataType: 'json',
+				success: function (result) {
 					var sumCount = 0;
-					for(var i=0;i<result.length;i++){
+					for (var i = 0; i < result.length; i++) {
 						var count = parseInt(result[i].count);
 						sumCount += count;
 					}
-					if(sumCount == 0){
-						showResult('【'+tousseName+'】的材料数量全部为0，不允许入筐！');
+					if (sumCount == 0) {
+						showResult('【' + tousseName + '】的材料数量全部为0，不允许入筐！');
 						return;
 					}
 					putTousseInTheBasket(row, recycleAmountNew);
 				}
 			});
-		}else {
+		} else {
 			var obj = JSON.parse(materials);
 			var sumCount = 0;
-			for(var i=0;i<obj.length;i++){
+			for (var i = 0; i < obj.length; i++) {
 				var count = parseInt(obj[i].count);
 				sumCount += count;
 			}
-			if(sumCount == 0){
-				showResult('【'+tousseName+'】的材料数量全部为0，不允许入筐！');
+			if (sumCount == 0) {
+				showResult('【' + tousseName + '】的材料数量全部为0，不允许入筐！');
 				return;
 			}
 			putTousseInTheBasket(row, recycleAmountNew);
 		}
-	}else {
+	} else {
 		putTousseInTheBasket(row, recycleAmountNew);
 	}
 }
@@ -3907,8 +3924,8 @@
 				msg = urgentLevel;
 				fontSize = "16px";
 			}
-			if(sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule){
-				urgentAmountElement += '<div class="cameraPhoto"><img onclick="openPhotos('+row+');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></div>';
+			if (sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule) {
+				urgentAmountElement += '<div class="cameraPhoto"><img onclick="openPhotos(' + row + ');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></div>';
 			}
 			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="background-image:url(urgentBg.png);font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
 		} else {
@@ -3922,8 +3939,8 @@
 			if (sstsConfig.enableUrgentFunction) {
 				fontSize = "16px";
 			}
-			if(sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule){
-				urgentAmountElement += '<div class="cameraPhoto"><img onclick="openPhotos('+row+');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></div>';
+			if (sstsConfig.showCameraPhoto && sstsConfig.showCameraPhotoInRecyclingModule) {
+				urgentAmountElement += '<div class="cameraPhoto"><img onclick="openPhotos(' + row + ');" src="' + WWWROOT + '/images/web/photo_16x16.gif" /></div>';
 			}
 			urgentAmountElement += '<div id="urgentAmountDiv' + row + '" class="divStyle" style="' + bgMsg + 'font-size:' + fontSize + ';" onclick="openSetUrgentAmountPage(' + row + ',' + packed + ');">' + msg + '</div>';
 		}
@@ -4275,9 +4292,9 @@
 }
 
 //FSSDERMYY-13:获取拍摄的图片
-function getCameraPhotoInfo(){
+function getCameraPhotoInfo() {
 	var arr = [];
-	if(cameraPhotoInfoMap.size() > 0){
+	if (cameraPhotoInfoMap.size() > 0) {
 		arr = cameraPhotoInfoMap.values();
 	}
 	return arr;
@@ -5486,10 +5503,14 @@
 		var recycleAmount = parseInt($('#recycleAmount' + i).val(), 10);
 		var loadedAmount = parseInt($('#loadedAmount' + i).val(), 10);
 		var unLoadedAmount = recycleAmount - loadedAmount;
+		var appType = $('#appType').val();
 		if ($('#tousseItemsTr' + i).css('display') == 'none') {
 			return;
 		}
-		if ($('#isCleanedEntirely' + i).val() == '否' && unLoadedAmount > 0) {
+		if (appType == '外来器械包申请单') {
+			var tousseId = $('#tousseDefinitionID' + i).val();
+			addJsonItem(result, tousseId, 1, '否', '');
+		} else if ($('#isCleanedEntirely' + i).val() == '否' && unLoadedAmount > 0) {
 			var isThereIdentificationCard = $('#isThereIdentificationCard' + i).val();
 			var tousseId = $('#tousseDefinitionID' + i).val();
 			var idCardBarcodes = $('#barcodes' + i).val();
@@ -5562,8 +5583,7 @@
 	if (data != "[]") {
 		var url = WWWROOT + '/disinfectsystem/touchScreen/recycle/customIntoBasket.jsp?data=' + data + '&resolution=1980'
 			+ '&tousseIntoBasketInfo=' + tousseIntoBasketInfo + '&recyclingApplicationId=' + $('#recyclingApplicationId').val()
-		var style = 'menubar=no,location=no,directories=no,toolbar=no,statusbar=no,resizable=yes,top=100,left=100,width=1400,height=800,scrollbars=null';
-		var popwin = openFullSizeWindowWithName(url, true, '自定义入框');
+		openFullSizeWindowWithName(url, true, '自定义入框');
 	} else {
 		alertDiv("没有符合条件待装载的物品！");
 	}
@@ -5733,6 +5753,15 @@
 // 自定义入筐保存
 function customIntoBasketFun(data) {
 	if (data != null) {
+		if(params_id == ''){
+			$("#basketsUl").empty();
+			tousseArray = [];
+		}else {
+			$("#basketsUl li").each(function () {
+				deleteAction(this);
+				$(this).remove();
+			});
+		}
 		for (var j = 0; j < data.length; j++) {
 			var materials = data[j].materials;
 			var tousseName = data[j].tousseName;
@@ -5799,6 +5828,9 @@
 
 			$('#tousseItemTable').children().first().children().each(function (i, element) {
 				if ($('#tousseDefinitionID' + i).val() == tousseDefinitionID) {
+					if ($('#tousseType' + i).val() == '外来器械包' && $('#loadedAmount' + i).val() == 1) {
+						return false;
+					}
 					$('#loadedAmount' + i).val(parseInt(recycleAmount, 10) + parseInt($('#loadedAmount' + i).val(), 10));
 
 					var idCard = $('#isThereIdentificationCard' + i).val();
@@ -6548,77 +6580,77 @@
 }
 
 //查询申请单的图片
-function findCameraPhotoInfo(id){
+function findCameraPhotoInfo(id) {
 	$.ajax({
 		type: "post",
 		url: WWWROOT + '/disinfectSystem/recyclingRecordAction!findCameraPhotoInfo.do',
 		data: {
 			recyclingRecordId: id,
-			cameraPhotoType:'回收采集图片,回收采集视频'
+			cameraPhotoType: '回收采集图片,回收采集视频'
 		},
 		dataType: 'json',
 		success: function (result) {
 			if (result.success) {
-				if(result.imageFiles.length > 0){
-					for(var i=0;i<result.imageFiles.length;i++){
+				if (result.imageFiles.length > 0) {
+					for (var i = 0; i < result.imageFiles.length; i++) {
 						var tousseDefinitionId = result.imageFiles[i].tousseDefinitionId;
 						var barcode = result.imageFiles[i].barcode || '';
 						var id = result.imageFiles[i].id;
 						var tousseId = tousseDefinitionId;
-						if(barcode !== ''){
+						if (barcode !== '') {
 							tousseId += ';' + barcode;
 						}
-						if(cameraPhotoInfoMap.has(tousseId)){
+						if (cameraPhotoInfoMap.has(tousseId)) {
 							var imageFileIds = cameraPhotoInfoMap.get(tousseId).imageFileIds + '';
 							var videoFileIds = cameraPhotoInfoMap.get(tousseId).videoFileIds + '';
 							var arr = [];
-							if(imageFileIds !== ''){
+							if (imageFileIds !== '') {
 								arr = imageFileIds.split(',');
 							}
 							arr.push(id);
-							cameraPhotoInfoMap.set(tousseId,{
-								tousseId:tousseDefinitionId,
-								barcode:barcode,
-								imageFileIds:arr.join(','),
-								videoFileIds:videoFileIds
+							cameraPhotoInfoMap.set(tousseId, {
+								tousseId: tousseDefinitionId,
+								barcode: barcode,
+								imageFileIds: arr.join(','),
+								videoFileIds: videoFileIds
 							})
-						}else {
-							cameraPhotoInfoMap.set(tousseId,{
-								tousseId:tousseDefinitionId,
-								barcode:barcode,
-								imageFileIds:id,
-								videoFileIds:''
+						} else {
+							cameraPhotoInfoMap.set(tousseId, {
+								tousseId: tousseDefinitionId,
+								barcode: barcode,
+								imageFileIds: id,
+								videoFileIds: ''
 							})
 						}
 					}
-					for(var i=0;i<result.videoFiles.length;i++){
+					for (var i = 0; i < result.videoFiles.length; i++) {
 						var tousseDefinitionId = result.videoFiles[i].tousseDefinitionId;
 						var barcode = result.videoFiles[i].barcode || '';
 						var id = result.videoFiles[i].id;
 						var tousseId = tousseDefinitionId;
-						if(barcode !== ''){
+						if (barcode !== '') {
 							tousseId += ';' + barcode;
 						}
-						if(cameraPhotoInfoMap.has(tousseId)){
+						if (cameraPhotoInfoMap.has(tousseId)) {
 							var imageFileIds = cameraPhotoInfoMap.get(tousseId).imageFileIds + '';
 							var videoFileIds = cameraPhotoInfoMap.get(tousseId).videoFileIds + '';
 							var arr = [];
-							if(videoFileIds !== ''){
+							if (videoFileIds !== '') {
 								arr = videoFileIds.split(',');
 							}
 							arr.push(id);
-							cameraPhotoInfoMap.set(tousseId,{
-								tousseId:tousseDefinitionId,
-								barcode:barcode,
-								imageFileIds:imageFileIds,
-								videoFileIds:arr.join(',')
+							cameraPhotoInfoMap.set(tousseId, {
+								tousseId: tousseDefinitionId,
+								barcode: barcode,
+								imageFileIds: imageFileIds,
+								videoFileIds: arr.join(',')
 							})
-						}else {
-							cameraPhotoInfoMap.set(tousseId,{
-								tousseId:tousseDefinitionId,
-								barcode:barcode,
-								imageFileIds:'',
-								videoFileIds:id
+						} else {
+							cameraPhotoInfoMap.set(tousseId, {
+								tousseId: tousseDefinitionId,
+								barcode: barcode,
+								imageFileIds: '',
+								videoFileIds: id
 							})
 						}
 					}
@@ -6933,15 +6965,15 @@
 								barcode = ci.tousseInstanceBarcode;
 							}
 							var element = '<input type="hidden" value="">';
-							if(barcode !== ''){
-								if(sessionIDCardBarcodes.has(ci.tousseDefinitionID)){
+							if (barcode !== '') {
+								if (sessionIDCardBarcodes.has(ci.tousseDefinitionID)) {
 									var barcodeArr = sessionIDCardBarcodes.get(ci.tousseDefinitionID);
-									if(barcodeArr.indexOf(barcode) == -1){
+									if (barcodeArr.indexOf(barcode) == -1) {
 										barcodeArr.push(barcode);
-										sessionIDCardBarcodes.set(ci.tousseDefinitionID,barcodeArr);
+										sessionIDCardBarcodes.set(ci.tousseDefinitionID, barcodeArr);
 									}
-								}else {
-									sessionIDCardBarcodes.set(ci.tousseDefinitionID,[barcode]);
+								} else {
+									sessionIDCardBarcodes.set(ci.tousseDefinitionID, [barcode]);
 								}
 							}
 							element += '<dd class="name"><span>' + ci.tousseDefinition.name + '</span></dd>';
@@ -6980,7 +7012,7 @@
 		}
 		$('#tousseItemTable').children().first().children().each(function (i, element) {
 			var tousseDefinitionID = $('#tousseDefinitionID' + i).val();
-			if(sessionIDCardBarcodes.has(tousseDefinitionID)){
+			if (sessionIDCardBarcodes.has(tousseDefinitionID)) {
 				var arr = sessionIDCardBarcodes.get(tousseDefinitionID);
 				$('#tousseOrIDCardInstanceBarcodes' + i).val(arr.join(';'))
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js
===================================================================
diff -u -r32457 -r32465
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 32457)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 32465)
@@ -223,8 +223,8 @@
 function mergedBasket(){
     return false;
 }
-function loadBarcodeDevice(barcodeTempParam){
-    if(barcodeTemp.length >= 9){
+function loadBarcodeDevice(barcodeTempParam,isAddGoods){
+    if(barcodeTempParam.length >= 9){
         //var barcode = barcodeTemp.substring(barcodeTemp.length-9,barcodeTemp.length);
     	//由于条码可能超过9位,所以要取整个条码字符串了
         var barcode = barcodeTempParam;
@@ -279,6 +279,9 @@
                           updateRemoveImplantBtn($("#basketsUl li:first"),false);
                           toggleItems(obj.find('span')[0]);
 					  }
+					  if(isAddGoods){
+						addGoodsForBasket(barcodeTempParam);
+					  }
                       refreshBasketStatus();
                       refreshAllBasketTotalNum();
             	}else{
@@ -902,7 +905,9 @@
 			var currentCount = 0;
 			if($(this).find('.totalAmount').find('.sumCount')){
 				sumCount = $(this).find('.totalAmount').find('.sumCount').text();
+				sumCount = (sumCount == '')?0:sumCount;
 				currentCount = $(this).find('.totalAmount').find('.totalnum').text();
+				currentCount = (currentCount == '')?0:currentCount;
 			}
 	        $(this).children().each(function(){
 	            if($(this).is('input') && $(this).attr('type') == 'hidden'){
@@ -1018,6 +1023,10 @@
 		url : encodeURI(WWWROOT + '/disinfectSystem/recyclingRecordAction!loadUnCleanedEntirelyMaterial.do?data=' + param_data),
 		dataType : 'json',
 		success : function(result) {
+			var goodsData = window.opener.getScanedGoods('否', true);
+			if(goodsData && goodsData.length > 0){
+				getGoodsMaterialData(goodsData);
+			}
 			if(result && result.success){
 				for ( var i = 0; i < result.data.length; i++) {
 					var materialAmount = result.data[i].amount;
@@ -1034,6 +1043,36 @@
 	});
 }
 
+//渲染篮筐和器械包
+function getGoodsMaterialData(goodsData){
+	for(var i=0;i<goodsData.length;i++){
+		var barcode = goodsData[i].barcode;
+		loadBarcodeDevice(barcode,true);
+	}
+	refreshBasketStatus();
+	refreshAllBasketTotalNum();
+}
+
+//篮筐添加器械包
+function addGoodsForBasket(barcodeTempParam){
+	var goodsData = window.opener.getScanedGoods('否', true);
+	for(var i=0;i<goodsData.length;i++){
+		if(goodsData[i].barcode == barcodeTempParam){
+			var scanedGoods = goodsData[i].scanedGoods;
+			if(scanedGoods.length > 0){
+				for(var j=0;j<scanedGoods.length;j++){
+					$('#tousseItemTable').children().first().children().each(function(k,element){
+						if($('#tousseDefinitionID'+k).val() == scanedGoods[j].tousseDefinitionID &&　
+								$('#materialName'+k).val() == scanedGoods[j].name){
+								putMaterialInBasket(k,false);
+						}
+					});
+				}
+			}
+		}
+	}
+}
+
 function encodeAll(text) {
 	var encoded = encodeURI(text);
 	encoded = encoded.replace('#', '%23');// 对#号进行转码