Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r32320 -r32413
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 32320)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 32413)
@@ -27,6 +27,8 @@
 var lastTousseNames = '';
 //缓存标识牌条码
 var sessionIDCardBarcodes = new newMap();
+//缓存删除材料的数组
+var deleteMaterialMap = new newMap();
 // 是否开启根据科室加载模板
 function openLoadTemplateByUnit() {
 	if (sstsConfig.isOpenLoadTemplateByUnit) {
@@ -966,15 +968,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('')
 					}
 				}
@@ -1049,6 +1051,15 @@
 		tousseInstanceBarcode: item.tousseInstanceBarcode
 	}
 	addOrDelTousse(tousse);
+	if (item.type == '材料') {
+		if (deleteMaterialMap.has(item.tousseDefinitionID)) {
+			var list = deleteMaterialMap.get(item.tousseDefinitionID);
+			list.push(item.materialName);
+			deleteMaterialMap.set(item.tousseDefinitionID, list);
+		} else {
+			deleteMaterialMap.set(item.tousseDefinitionID, [item.materialName]);
+		}
+	}
 	refreshSequence(delElement.parent().parent(), 0);
 	hideElement.remove();
 	nameElement.remove();
@@ -1121,14 +1132,15 @@
 	var idCardBarcode = item.idCardBarcode;
 	var tousseInstanceBarcode = item.tousseInstanceBarcode;
 	var basketGroupBarcodes = item.basketGroupBarcodes;
+	var hasOtherMaterial = false;
 	//删除材料所在包 内的 全部删除
 	if (type == "材料") {
 		name = item.materialName;
 		tousseNameForMaterial = item.tousseName;
+		deleteMaterialItem(deleteButton, basket.barcode, basket.classifyBasketId);
 		$('dl[class="sed clearfix"]').each(function () {
 			var basketEle = $(this).parent().find('input').eq(0).val();
 			if (basketEle !== '') {
-				var basketJSON = eval('(' + basketEle + ')');
 				$(this).children().each(function () {
 					if ($(this).attr('type') == 'hidden') {
 						var hideValue = $(this).val();
@@ -1137,9 +1149,7 @@
 							if (obj.type == '材料' && obj.tousseDefinitionID == item.tousseDefinitionID &&
 								obj.basketGroupBarcodes == basketGroupBarcodes &&
 								obj.idCardBarcode == idCardBarcode && obj.tousseInstanceBarcode == tousseInstanceBarcode) {
-
-								var delButton = $(this).next().next().next().next().find('a');
-								deleteMaterialItem(delButton, basketJSON.barcode, basketJSON.classifyBasketId);
+								hasOtherMaterial = true;
 							}
 						}
 					}
@@ -1148,6 +1158,9 @@
 		});
 	}
 	var tousseAmountForMaterial = item.tousseAmount;
+	if (hasOtherMaterial) {
+		tousseAmountForMaterial = 0;
+	}
 	if (type == '材料') {
 		unloadStaff(item.tousseDefinitionID, tousseAmountForMaterial, idCardBarcode);
 	} else {
@@ -1996,11 +2009,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 +2126,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 +2476,7 @@
 }
 
 //显示标识牌条码列表
-function showIDCardBarcodes(row,tousseName,tousseOrIDCardInstanceBarcodes){
+function showIDCardBarcodes(row, tousseName, tousseOrIDCardInstanceBarcodes) {
 	$("#dialogShowIDCardBarcodes").dialog({
 		resizable: false,
 		height: 500,
@@ -2478,10 +2491,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 +2512,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 +2547,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 +2963,7 @@
 }
 
 // 获取已入篮筐的数据
-function getScanedGoods(isCleanedEntirely) {
+function getScanedGoods(isCleanedEntirely, materialIsAdd) {
 	var basketJsonArray = new Array();
 	$("#basketsUl li").each(function () {
 		var hideStr = $(this).find('input').val();
@@ -2977,6 +2990,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 +3455,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 +3937,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 +3952,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 +4305,9 @@
 }
 
 //FSSDERMYY-13:获取拍摄的图片
-function getCameraPhotoInfo(){
+function getCameraPhotoInfo() {
 	var arr = [];
-	if(cameraPhotoInfoMap.size() > 0){
+	if (cameraPhotoInfoMap.size() > 0) {
 		arr = cameraPhotoInfoMap.values();
 	}
 	return arr;
@@ -4558,34 +4588,6 @@
 		openApplicationTousseSplitByOrgUnit(newTousseArray, tousseArray);
 		return '';
 	}
-	// var map = {}, dest = [], arr = [], arr1 = [];
-	// for (var i = 0, k = 0, z = 0; i < tousseArray.length; i++) {
-	// 	var ai = tousseArray[i];
-	// 	if (ai.itemType == '材料' && ai.tousseInstanceBarcode !== '') {
-	// 		if (!map[ai.tousseName]) {
-	// 			dest.push(tousseArray[i]);
-	// 			map[ai.tousseName] = ai;
-	// 		} else {
-	// 			for (var j = 0; j < dest.length; j++) {
-	// 				var dj = dest[j];
-	// 				if (dj.tousseNameForMaterial == ai.tousseNameForMaterial && dj.basketGroupBarcodes == ai.basketGroupBarcodes && dj.basketBarcode == ai.basketBarcode && dj.tousseName == ai.tousseName) {
-	// 					dj.tousseAmountForMaterial = dj.tousseAmountForMaterial + dj.tousseAmountForMaterial;
-	// 					arr[k] = dj.tousseAmountForMaterial;
-	// 					k++;
-	// 					break;
-	// 				}
-	// 			}
-	// 		}
-	// 	} else if (ai.itemType == '材料' && ai.tousseInstanceBarcode == '') {
-	// 		arr1[z] = ai.tousseAmountForMaterial;
-	// 	}
-	// }
-	// if (arr.length > 0) {
-	// 	var len = parseInt(arr[0]) + parseInt(arr1[0] || 0);
-	// 	for (var i = 0; i < tousseArray.length; i++) {
-	// 		tousseArray[i].tousseAmountForMaterial = len;
-	// 	}
-	// }
 	var paramJson = {};
 	paramJson.tousseJson = tousseArray;
 	paramJson.splitTousseJson = newSplitTousseArray;
@@ -4865,6 +4867,10 @@
 var IntheBoxState = false;
 function submitFormFunction(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm) {
 	isConfirm = isConfirm || false;
+	if (!canOpenCustomInfoBasket()) {
+		showResult('还有部分材料未入筐，不允许保存！');
+		return;
+	}
 	var jsonStr = getJsonParams(confirmation, isConfirm);
 	if (jsonStr == '') { return; }
 	var jSONe = JSON.parse(jsonStr);
@@ -5106,6 +5112,10 @@
  */
 function submitFormFunctionForInventoryConfirm(confirmation, saveAndNew, autoReturnTheBorrowingTousse, print, recyclingAmountConfirm, isConfirm) {
 	isConfirm = isConfirm || false;
+	if (!canOpenCustomInfoBasket()) {
+		showResult('还有部分材料未入筐，不允许保存！');
+		return;
+	}
 	var jsonStr = getJsonParams(confirmation, isConfirm);
 	if (jsonStr == '') { return; }
 	alertDiv("保存中,请稍候......", true);
@@ -5486,10 +5496,17 @@
 		var recycleAmount = parseInt($('#recycleAmount' + i).val(), 10);
 		var loadedAmount = parseInt($('#loadedAmount' + i).val(), 10);
 		var unLoadedAmount = recycleAmount - loadedAmount;
+		var tousseType = $('#tousseType' + i).val();
 		if ($('#tousseItemsTr' + i).css('display') == 'none') {
 			return;
 		}
-		if ($('#isCleanedEntirely' + i).val() == '否' && unLoadedAmount > 0) {
+		if (tousseType == '外来器械包') {
+			var tousseId = $('#tousseDefinitionID' + i).val();
+			if (deleteMaterialMap.has(tousseId) || unLoadedAmount > 0) {
+				var goodsData = getScanedGoods('否', true);
+				addJsonItem(result, tousseId, 1, '否', '', goodsData);
+			}
+		} else if ($('#isCleanedEntirely' + i).val() == '否' && unLoadedAmount > 0) {
 			var isThereIdentificationCard = $('#isThereIdentificationCard' + i).val();
 			var tousseId = $('#tousseDefinitionID' + i).val();
 			var idCardBarcodes = $('#barcodes' + i).val();
@@ -5527,12 +5544,13 @@
 }
 
 // 转换为json
-function addJsonItem(result, tousseId, unLoadedAmount, isIdCard, idCardBarcode) {
+function addJsonItem(result, tousseId, unLoadedAmount, isIdCard, idCardBarcode, goodsData) {
 	var obj = {};
 	obj.tousseId = tousseId;
 	obj.recycleAmount = unLoadedAmount;
 	obj.isThereIdentificationCard = isIdCard;
 	obj.idCardBarcode = idCardBarcode;
+	obj.goodsData = goodsData || [];
 	var len = result.length;
 	result[len] = obj;
 }
@@ -5557,6 +5575,7 @@
 
 // 打开自定义入筐
 function openCustomIntoBasketPage() {
+	canOpenCustomInfoBasket();
 	var data = getUnCleanedEntirelyTousseInfo();
 	var tousseIntoBasketInfo = JSON.stringify(getTousseIntoBasketInfo());
 	if (data != "[]") {
@@ -5730,6 +5749,36 @@
 	});
 }
 
+//判断能否打开自定义入筐
+function canOpenCustomInfoBasket() {
+	$("#basketsUl li").each(function () {
+		$(this).find('dl').children().each(function (i, element) {
+			if ($(this).attr('type') == 'hidden') {
+				var obj = $(this).val();
+				var tousseItem = JSON.parse(obj);
+				var tousseDefinitionID = tousseItem.tousseDefinitionID;
+				var materialName = tousseItem.materialName;
+				if (deleteMaterialMap.get(tousseDefinitionID)) {
+					var list = deleteMaterialMap.get(tousseDefinitionID)
+					if (list.indexOf(materialName) >= 0) {
+						list.splice(list.indexOf(materialName), 1);
+						if (list.length > 0) {
+							deleteMaterialMap.set(tousseDefinitionID, list);
+						} else {
+							deleteMaterialMap.deletes(tousseDefinitionID, list);
+						}
+					}
+				}
+			}
+		});
+	});
+	if (deleteMaterialMap.size() == 0) {
+		return true;
+	} else {
+		return false;
+	}
+}
+
 // 自定义入筐保存
 function customIntoBasketFun(data) {
 	if (data != null) {
@@ -5763,7 +5812,6 @@
 							return false;
 						}
 					});
-
 					if (!isBasketLoaded) {
 						createBasketUiElement(item.basketBarcode, item.basketId, item.containerName, item.washClassifyType, item.sequence, false, item.sumCount);
 						$("#scanContainerBarcodeTipUl").hide();
@@ -5794,11 +5842,29 @@
 					putBasketMaxAmount: item.putBasketMaxAmount,
 					basketGroupBarcodes: basketGroupBarcodeArray.join(";")
 				};
-				addBasketItemElement(basketItem);
+				var filtersItem = false;
+				$("#basketsUl li").each(function (i) {
+					$(this).find('dl').children().each(function (i, element) {
+						if ($(this).attr('type') == 'hidden') {
+							var hideStr = $(this).val();
+							var json = JSON.parse(hideStr);
+							if (json.basketGroupBarcodes.indexOf(item.basketBarcode) >= 0 && item.tousseDefinitionID == json.tousseDefinitionID && item.materialName == json.materialName) {
+								filtersItem = true;
+								return false;
+							}
+						}
+					});
+				});
+				if (!filtersItem) {
+					addBasketItemElement(basketItem);
+				}
 			}
 
 			$('#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 +6614,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 +6999,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 +7046,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 -r29203 -r32413
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 29203)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/customIntoBasket.js	(.../customIntoBasket.js)	(revision 32413)
@@ -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'){
@@ -931,7 +936,7 @@
 		 					 obj.tousseDefinitionID = json.tousseDefinitionID;
 		 					 obj.idCardBarcode = json.idCardBarcode;
 							 obj.putBasketMaxAmount = json.putBasketMaxAmount;
-							 obj.sumCount = parseInt(sumCount)-parseInt(currentCount);
+							 obj.sumCount = Math.abs(parseInt(sumCount)-parseInt(currentCount));
 		 					 var isExist = false;
 							 var len = array.length;
 		 					 for(var j = 0;j < len;j++){
@@ -1018,6 +1023,12 @@
 		url : encodeURI(WWWROOT + '/disinfectSystem/recyclingRecordAction!loadUnCleanedEntirelyMaterial.do?data=' + param_data),
 		dataType : 'json',
 		success : function(result) {
+			var obj = JSON.parse(param_data);
+			if(obj.length > 0){
+				if(obj[0].goodsData && obj[0].goodsData.length > 0){
+					getGoodsMaterialData(obj[0].goodsData);
+				}
+			}
 			if(result && result.success){
 				for ( var i = 0; i < result.data.length; i++) {
 					var materialAmount = result.data[i].amount;
@@ -1034,6 +1045,37 @@
 	});
 }
 
+//渲染篮筐和器械包
+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 obj = JSON.parse(param_data);
+	var goodsData = obj[0].goodsData;
+	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');// 对#号进行转码