Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/pic_bg4.png
===================================================================
diff -u
Binary files differ
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp
===================================================================
diff -u -r27263 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 27263)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingErrors.jsp	(.../recyclingErrors.jsp)	(revision 28969)
@@ -34,6 +34,7 @@
 <script type="text/javascript">
 	var WWWROOT = '${ctx}';
 	var row = '${param.row}';
+	var param_errorType = '${param.errorType}';
 	var resolution = '${param.resolution}';
 	var tousseName = '${param.tousseName}';
 	var tousseDefinitionID = '${param.tousseDefinitionID}';
@@ -48,28 +49,39 @@
 
 	function add(row) {
 		var materialName = $('#materialName' + row).html();
+		var errorAmount = parseInt($('#errorAmount' + row).html(), 10)
+		var errorCount = parseInt($('#errorCount' + row).val());
+		var unconfirmedAmount = $('#unconfirmedAmount' + row).val();
 		//编辑回收记录时不允许修改标志牌丢失数量
 		if(materialName == '器械包标识牌' && isEditIDCardError == 'false'){
 			return;
 		}else{
 			var totalCount = parseInt($('#totalCount' + row).html(), 10);
-			if (parseInt($('#errorAmount' + row).html(), 10) < totalCount) {
-				$('#errorAmount' + row).html(
-						parseInt($('#errorAmount' + row).html(), 10) + 1);
+			if (errorAmount < totalCount) {
+				$('#errorAmount' + row).html(parseInt($('#errorAmount' + row).html(), 10) + 1);
+				$('#unconfirmedAmount'+row).val(errorAmount-errorCount);
 			}
 		}
 		
 	}
 
 	function reduce(row) {
 		var materialName = $('#materialName' + row).html();
+		var errorCount = parseInt($('#errorCount' + row).val(),10);
+		var unconfirmedAmount = parseInt($('#unconfirmedAmount' + row).val(),10);
+		var errorAmount = parseInt($('#errorAmount' + row).html(), 10);
+		var status = parseInt($('#status' + row).val(),10);
 		if(materialName == '器械包标识牌' && !isEditIDCardError == 'false'){
 			return;
 		}else{
 			var totalCount = parseInt($('#totalCount' + row).html(), 10);
-			if (parseInt($('#errorAmount' + row).html(), 10) > 0) {
-				$('#errorAmount' + row).html(
-						parseInt($('#errorAmount' + row).html(), 10) - 1);
+			if(errorAmount > 0){
+				if((errorAmount-1) < errorCount && status !== 2){
+					parent.layer.msg('减少到的最小数量不能超过已有的丢失数量！');
+					return;
+				}
+				$('#errorAmount' + row).html(errorAmount - 1);
+				$('#unconfirmedAmount'+row).val(unconfirmedAmount - 1)
 			}
 		}
 	}
@@ -97,58 +109,133 @@
 		  }
 	}
 
+	function newArray(arr){
+		var newArr = [];
+		var map = {},dest = [];
+		var newArr2 = [];
+		var map2 = {},dest2 = [];
+		for(var i = 0; i < arr.length; i++){
+			var ai = arr[i];
+			if(ai.status !== 2){
+				newArr.push(arr[i])
+			}else {
+				if(!map[ai.materialDefinitionId]){
+					dest.push(ai);
+					map[ai.materialDefinitionId] = ai;
+				}else {
+					for(var j = 0; j < dest.length; j++){
+						var dj = dest[j];
+						if(dj.materialDefinitionId == ai.materialDefinitionId){
+							var amount = parseInt(ai.amount);
+							dj.amount += amount;
+						}
+					}
+				}
+			}
+		}
+		for(var i = 0; i < newArr.length; i++){
+			var ai = newArr[i];
+			if(!map2[ai.materialDefinitionId]){
+				dest2.push(ai);
+				map2[ai.materialDefinitionId] = ai;
+			}else {
+				for(var j = 0; j < dest2.length; j++){
+					var dj = dest2[j];
+					if(dj.materialDefinitionId == ai.materialDefinitionId){
+						var amount = parseInt(ai.amount);
+						dj.amount += amount;
+					}
+				}
+			}
+		}
+		for(var i=0,k=0;i<dest.length;i++){
+			if(dest[i].amount !== 0){
+				newArr2[k] = dest[i];
+				k++
+			}
+		}
+		for(var i=0;i<dest2.length;i++){
+			for(var j=0;j<newArr2.length;j++){
+				if(dest2[i].materialDefinitionId == newArr2[j].materialDefinitionId){
+					dest2[i].unconfirmedAmount += newArr2[j].amount;
+					newArr2.splice(j,1);
+				}
+			}
+		}
+		dest2 = dest2.concat(newArr2);
+		return dest2;
+	}
+
 	function submit() {
 		var isErrorExist = false;
 		var newJsonArray = new Array(); 
-		
+		var newDamageJsonArray = [];
+
 		var recyclingErrorJson = window.parent.getTousseItemRecyclingError(row);
+		var recyclingDamageJson = window.parent.getTousseItemRecyclingDamage(row);
 		var isErrorAmountZero = true;
 		if(recyclingErrorJson != ""){
 			newJsonArray = JSON.parse(recyclingErrorJson);
 		}
+		if(recyclingDamageJson != ""){
+			newDamageJsonArray = JSON.parse(recyclingDamageJson);
+		}
 		var length = $("#recyclingErrorTable tbody tr").length;
 		for ( var i = 0; i < length; i++) {
 			if ($('#errorAmount' + i).html() != '0') {
 				isErrorExist = true;
 				isErrorAmountZero =  false;
 			}
-			var amount = parseInt($('#errorAmount' + i).html());
+			var amountSum = parseInt($('#errorAmount' + i).html());
+			var errorCount = parseInt($('#errorCount' + i).val());
+			var errorAmount = parseInt($('#errorAmount' + i).val());
+			var unconfirmedAmount = parseInt($('#unconfirmedAmount' + i).val());
 			var materialDefinitionId = $('#materialDefinitionId' + i).attr('value');
 			var tousseBarcode = $('#tousseBarcode' + i).val();
 			var materialName = $('#materialName' + i).attr('value');
 			var errorType = $('#errorType' + i).val();
+			var detailId = $('#detailId' + i).val();
 			var exist = false;
+			var newUnconfirmedAmount = 0;
+			var amountNotNull = false;
 			for(var j = 0 ; j < newJsonArray.length ; j++){
 				if(newJsonArray[j].materialDefinitionId == materialDefinitionId && newJsonArray[j].tousseBarcode == tousseBarcode){
-					newJsonArray[j].amount = amount;
-					newJsonArray[j].errorType = errorType;
-					exist = true;
-					break;
+					newUnconfirmedAmount += newJsonArray[j].amount;
 				}
 			}
-			if(!exist){
-				if(amount > 0){
-					var item = {
-						detailId: "",
-	                	tousseDefinitionID: tousseDefinitionID,
-	                	materialDefinitionId: materialDefinitionId,
-	                	materialName: materialName,
-	                	amount: amount,
-	                	errorType: errorType,
-	                	tousseBarcode : tousseBarcode,
-	                	intoBasketAmount : 0,
-	                	errorDamageQmKey : errorDamageQmKey
-		            };
-					newJsonArray.push(item);
+			if(amountSum !== newUnconfirmedAmount){
+				var item = {
+					detailId : "",
+					tousseDefinitionID: parseInt(tousseDefinitionID),
+					materialDefinitionId: parseInt(materialDefinitionId),
+					materialName: materialName,
+					errorType: errorType,
+					status:2,
+					tousseBarcode : tousseBarcode,
+					amount: amountSum-newUnconfirmedAmount,
+					errorDamageQmKey : errorDamageQmKey,
+					unconfirmedAmount:0
+				};
+				newJsonArray.push(item);
+			}
+		}
+		//newJsonArray = newArray2(newJsonArray);
+		if (isErrorExist) {
+			window.parent.document.getElementById('showTousseName' + row).className = 'input-a-yellow';
+			window.parent.document.getElementById('recyclingErrorButton' + row).className = 'btn-b-edit';
+		} else {
+			var sumAmount = 0;
+			if(newDamageJsonArray.length > 0){
+				for(var i=0;i<newDamageJsonArray.length;i++){
+					sumAmount += newDamageJsonArray[i].amount;
 				}
 			}
-			if (isErrorExist) {
-				window.parent.document.getElementById('showTousseName' + row).className = 'input-a-yellow';
-				window.parent.document.getElementById('recyclingErrorButton' + row).className = 'btn-b-edit';
-			} else {
+			if(sumAmount == 0){
 				window.parent.document.getElementById('showTousseName' + row).className = 'input-a';
-				window.parent.document.getElementById('recyclingErrorButton' + row).className = 'btn-b';
+			}else {
+				window.parent.document.getElementById('showTousseName' + row).className = 'input-a-brown';
 			}
+			window.parent.document.getElementById('recyclingErrorButton' + row).className = 'btn-b';
 		}
 		if(isErrorAmountZero && $("#errorRemark").val() != ""){
 			alert("填写了备注,请选择丢失的材料!");
@@ -258,38 +345,59 @@
 		});
 	}
 	
-	function buildTableTR(amontPerTousse,materialDefinitionId,materialName,totalCount,errorCount,tousseBarcode){
+	function buildTableTR(amontPerTousse,materialDefinitionId,materialName,totalCount,errorCount,tousseBarcode,unconfirmedAmount,detailId,status){
 		var i = $("#recyclingErrorTable tbody tr").length;
 		var sourceMaterialName = materialName;
 		if(tousseBarcode != ""){
 			materialName += "<br>" + tousseBarcode;
 		}
-		var errorElement = $('<tr><input type="hidden" id="amountPerTousse'+i+'" value="' + amontPerTousse + '"/>'
+		errorCount = parseInt(errorCount || 0);
+		unconfirmedAmount = parseInt(unconfirmedAmount || 0);
+		var trColor = ((errorCount+unconfirmedAmount) == 0)?'':'yellow';
+		var html = '<tr class="'+trColor+'"><input type="hidden" id="amountPerTousse'+i+'" value="' + amontPerTousse + '"/>'
 				+ '<input type="hidden" id="materialDefinitionId'+i+'" value="' + materialDefinitionId + '"/>'
 				+ '<input type="hidden" id="tousseBarcode' + i + '" value="' + tousseBarcode +'"/>'
 				+ '<input type="hidden" id="sourceMaterialName' + i + '" value="' + sourceMaterialName +'"/>'
 				+ '<input type="hidden" id="materialName' + i + '" value="' + materialName +'"/>'
+				+ '<input type="hidden" id="errorCount' + i + '" value="' + errorCount +'"/>'
+				+ '<input type="hidden" id="unconfirmedAmount' + i + '" value="' + unconfirmedAmount +'"/>'
+				+ '<input type="hidden" id="detailId' + i + '" value="' + detailId +'"/>'
+				+ '<input type="hidden" id="status' + i + '" value="' + status +'"/>'
 				+ '<td class="w1" onclick="openMaterialImage(\''+materialName+'\',\''+ materialDefinitionId+ '\');">' + materialName + '</td>'
 				+ '<td id="totalCount'+i+'" class="w2">' + totalCount + '</td>'
 				+ '<td class="w3">'
-				+ '<div class="selblog">'
-				+ '<select id="errorType'+i+'" name="errorType'+i+'">'
+				+ '<div class="selblog">';
+		if(param_errorType == '增加'){
+			html += '<select id="errorType'+i+'" name="errorType'+i+'">'
 				+ '<option value="缺失">缺失</option>'
+				+ '<option value="增加" selected>增加</option>'
+				+ '</select>';
+		}else if(param_errorType == '缺失'){
+			html += '<select id="errorType'+i+'" name="errorType'+i+'">'
+				+ '<option value="缺失" selected>缺失</option>'
 				+ '<option value="增加">增加</option>'
-				+ '</select>'
-				+ '</div>'
-				+ '</td>'
-				+ '<td id="errorAmount'+i+'" class="w4" onclick="openUpdateAmount(this,'
-				+ row
-				+ ')">'
-				+ errorCount
-				+ '</td>'
-				+ '<td><a href="javascript:void(0);" class="add" id="addButton' + i + '" onclick="add('
-				+ i
-				+ ');">+</a><a href="javascript:void(0);" class="minus" id="reduceButton' + i + '" onclick="reduce('
-				+ i
-				+ ');">-</a></td>'
-				+ '</tr>');
+				+ '</select>';
+		}else {
+			html += '<select id="errorType'+i+'" name="errorType'+i+'">'
+				+ '<option value="缺失" >缺失</option>'
+				+ '<option value="增加">增加</option>'
+				+ '</select>';
+		}
+		html += '</div>'
+			+ '</td>'
+			+ '<td id="errorAmount'+i+'" class="w4" onclick="openUpdateAmount(this,'
+			+ row
+			+ ')">'
+			+ (errorCount+unconfirmedAmount)
+			+ '</td>'
+			+ '<td><a href="javascript:void(0);" class="add" id="addButton' + i + '" onclick="add('
+			+ i
+			+ ');">+</a><a href="javascript:void(0);" class="minus" id="reduceButton' + i + '" onclick="reduce('
+			+ i
+			+ ');">-</a></td>'
+			+ '</tr>';
+		
+		var errorElement = $(html);
 		$("#recyclingErrorTable").append(errorElement);
 	}
 	//打开编辑数量页面
@@ -322,26 +430,30 @@
 			dataType : 'json',
 			success : function(msg) {
 				var recyclingErrorJson = window.parent.getTousseItemRecyclingError(row);
+				var json = [];
+				if(recyclingErrorJson != ""){
+					json = JSON.parse(recyclingErrorJson);
+					json = newArray(json);
+				}
 				for ( var i = 0; i < msg.length; i++) {
 					//缺失数量
 					var errorCount = 0;
+					var unconfirmedAmount = 0;
 					//有丢失的器械包数量
 					var totalCount = msg[i].totalCount;
-					if (recyclingErrorJson != "") {
-						var json = JSON.parse(recyclingErrorJson);
-						for ( var j = 0; j < json.length; j++) {
-							if (msg[i].materialDefinitionId == json[j].materialDefinitionId) {
-								if(json[j].tousseBarcode != ""){
-									buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,msg[i].amontPerTousse,json[j].amount,json[j].tousseBarcode);
-									totalCount -= msg[i].amontPerTousse;
-								}else{
-									errorCount += json[j].amount;
-								}
+					for ( var j = 0; j < json.length; j++) {
+						if (msg[i].materialDefinitionId == json[j].materialDefinitionId) {
+							if(json[j].tousseBarcode != "" || json[j].status == 0){
+								buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,totalCount,json[j].amount,json[j].tousseBarcode,json[j].unconfirmedAmount,json[j].id,json[j].status);
+								totalCount = 0;
+							}else{
+								errorCount += json[j].amount;
+								unconfirmedAmount += json[j].unconfirmedAmount;
 							}
 						}
 					}
 					if(totalCount > 0){
-						buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,totalCount,errorCount,"");
+						buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,totalCount,errorCount,"",unconfirmedAmount,'',2);
 					}
 				}
 				selects = document.getElementsByTagName('select');
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css
===================================================================
diff -u -r27423 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 27423)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/style.css	(.../style.css)	(revision 28969)
@@ -56,6 +56,7 @@
 .data-table .box table{ margin:0 45px; width:1045px}
 .data-table .input-a{ background:url(pic_bg.jpg) no-repeat 0 -206px; border:none; width:349px; height:62px; font-size:26px; padding:0 10px; line-height:62px;line-height:62px\9;}
 .data-table .input-a-yellow{ background:url(pic_bg2.png) no-repeat 0 -2px; border:none; width:335px; height:62px; font-size:26px; padding:0 2px; line-height:62px;line-height:62px\9;}
+.data-table .input-a-brown{ background:url(pic_bg4.png) no-repeat 0 -2px; border:none; width:335px; height:62px; font-size:26px; padding:0 2px; line-height:62px;line-height:62px\9;}
 .data-table .input-b{ background:url(pic_bg.jpg) no-repeat -246px 0; border:none; width:52px; height:62px; font-size:26px; padding:0 5px; line-height:62px;line-height:62px\9;}
 .data-table .add{ background:url(pic_bg.jpg) no-repeat -318px 0; width:44px; height:64px; display:block; line-height:200px; overflow:hidden;}
 .data-table .add:hover{ background-position:-318px -64px}
@@ -468,4 +469,11 @@
 }
 .mbody.on_1024 .zhuangzai-table .box{
 	height: 1048px;
+}
+
+.yellow {
+	background: yellow;
+}
+.brown {
+	background: #fc7e24;
 }
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp
===================================================================
diff -u -r28784 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 28784)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.jsp	(.../useRecordView.jsp)	(revision 28969)
@@ -5,6 +5,7 @@
 <%@ page contentType="text/html; charset=UTF-8"%>
 <%@ include file="/common/taglibs.jsp"%>
 <%@ page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseInstance,com.forgon.disinfectsystem.entity.useRecord.UseRecord" %>
+<%@page import="com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail" %>
 <%
 	String userName = AcegiHelper.getLoginUser().getUserFullName();
 	String currentOrgUnitName = AcegiHelper.getLoginUser().getCurrentOrgUnitName();
@@ -193,7 +194,10 @@
 var awaitRecycle = '<%=UseRecord.RECYCLINGSTATUS_AWAITRECYCLE %>';
 var partRecycle = '<%=UseRecord.RECYCLINGSTATUS_PARTRECYCLE %>';
 var recycled = '<%=UseRecord.RECYCLINGSTATUS_RECYCLED %>';
-
+//器械丢失
+var TYPE_ERROR = '<%=MaterialErrorDamageDetail.TYPE_ERROR%>';
+//器械报损
+var TYPE_DAMAGE = '<%=MaterialErrorDamageDetail.TYPE_DAMAGE%>';
 //httpOption的optionListId:丢失报损备注
 var errorDamageRemark = '<%=HttpOption.SYSTEMSETTING_ERROR_DAMAGE_REMARK %>';
 
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js
===================================================================
diff -u -r28821 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28821)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recycleForTouchScreen.js	(.../recycleForTouchScreen.js)	(revision 28969)
@@ -453,7 +453,7 @@
 }
 function loadUnSupplementMaterial(msg,tmpRow,tousseBarcode){
 	if(msg.unSupplementMaterials != null){
-
+		var materials = msg.unSupplementMaterials;
 		var errorStr =  $('#recyclingError' + tmpRow).val();
 		var damageStr = $('#recyclingDamage' + tmpRow).val();
 		
@@ -475,9 +475,8 @@
 				}
 			}
 		}
-       	
-       	for(var m = 0 ; m < msg.unSupplementMaterials.length ; m++){
-           	var detail = msg.unSupplementMaterials[m];
+       	for(var m = 0 ; m < materials.length ; m++){
+           	var detail = materials[m];
            	if(detail.amount <= 0){
            		continue;
            	}
@@ -490,7 +489,8 @@
                   	amount: detail.amount,
                   	errorType: detail.errorType,
                   	tousseBarcode:detail.tousseBarcode,
-                  	intoBasketAmount:detail.amount,
+					intoBasketAmount:detail.amount,
+					unconfirmedAmount:detail.unconfirmedAmount,
                   	errorDamageQmKey : detail.errorDamageQmKey
           	    };
            		recyclingErrorJsonArray.push(errorObj);
@@ -501,23 +501,35 @@
                    	materialDefinitionId: detail.materialDefinitionId,
                    	materialName: detail.materialName,
                    	tousseBarcode:detail.tousseBarcode,
-                   	amount: detail.amount,
+					amount: detail.amount,
+					unconfirmedAmount:detail.unconfirmedAmount,
                    	errorDamageQmKey : detail.errorDamageQmKey
                    };
                 recyclingDamageJsonArray.push(item);
            	}
-       	}
+		}
        	if(recyclingErrorJsonArray.length > 0){
-       		setTousseItemRecyclingError(tmpRow,JSON.stringify(recyclingErrorJsonArray));
-       	    document.getElementById('recyclingErrorButton'+tmpRow).className = 'btn-b-edit';
+			setTousseItemRecyclingError(tmpRow,JSON.stringify(recyclingErrorJsonArray));
+			if(document.getElementById('recyclingErrorButton'+tmpRow)){
+				document.getElementById('recyclingErrorButton'+tmpRow).className = 'btn-b-edit';
+			}
        	}
        	if(recyclingDamageJsonArray.length > 0){
-       		setTousseItemRecyclingDamage(tmpRow,JSON.stringify(recyclingDamageJsonArray));
-       	    document.getElementById('recyclingDamageButton'+tmpRow).className = 'btn-c-edit';
+			setTousseItemRecyclingDamage(tmpRow,JSON.stringify(recyclingDamageJsonArray));
+			if(document.getElementById('recyclingDamageButton'+tmpRow)){
+				document.getElementById('recyclingDamageButton'+tmpRow).className = 'btn-c-edit';
+			}
        	}
-        if(recyclingErrorJsonArray.length > 0 || recyclingDamageJsonArray.length > 0){
-       	   document.getElementById('showTousseName'+tmpRow).className = 'input-a-yellow';
-        }
+        if(recyclingErrorJsonArray.length > 0){
+			if(document.getElementById('showTousseName'+tmpRow)){
+				document.getElementById('showTousseName'+tmpRow).className = 'input-a-yellow';
+			}
+		}
+		if(recyclingDamageJsonArray.length > 0){
+			if(document.getElementById('showTousseName'+tmpRow)){
+				document.getElementById('showTousseName'+tmpRow).className = 'input-a-brown';
+			}
+	  }
     }
 }
 
@@ -1699,14 +1711,15 @@
 							//清除已删除的包
 							cleanDeleteTousseItem(td.id);
 							addErrorDamageRemark(ti,tmpRow);
-							//未补充的丢失报损
-							loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
 							var orgUnitName = $('#depart').val();
 							if(sstsConfig.enableAutoIntoWashBasketWhenScanTousseBarcode){
 								var loadedAmount2 = tousseIntoBasketFunction(ti.id,td.id,td.name,1,td.isCleanedEntirely,orgUnitName,"",ti.barcode,td.tousseType,-1,'否',2,msg);
 							}else {
 								addToussItem(toussItem,sstsConfig.addTousseAtLastForRecycle);
 							}
+
+							//未补充的丢失报损
+							loadUnSupplementMaterial(msg,tmpRow,ti.barcode);
 						}
 					}else{  //扫描标识牌实例条码
 						barcode = msg.idCardInstance.barcode;
@@ -1753,7 +1766,7 @@
 									}
 								}else {
 									if(!isUndefinedOrNullOrEmpty(tousseDepart) && $('#depart').attr('value') != tousseDepart && msg.tousseInstance.status != '已废弃'){
-										alertDiv('该器械包不属于该科室。');
+										alertDiv('该器械包不属��该科室。');
 										return;
 									}
 									shareDepartsArr.push({
@@ -3737,6 +3750,46 @@
     return true;
 }
 
+function newArray(arr){
+	var newArr = [];
+	var map = {},dest = [];
+	var newArr2 = [];
+	for(var i = 0; i < arr.length; i++){
+		var ai = arr[i];
+		if(ai.status !== 2){
+			newArr.push(arr[i])
+		}else {
+			if(!map[ai.materialDefinitionId+','+ai.itemType]){
+				dest.push(ai);
+				map[ai.materialDefinitionId+','+ai.itemType] = ai;
+			}else {
+				for(var j = 0; j < dest.length; j++){
+					var dj = dest[j];
+					if(dj.materialDefinitionId == ai.materialDefinitionId && dj.itemType == ai.itemType){
+						var amount = parseInt(ai.amount);
+						dj.amount += amount;
+					}
+				}
+			}
+		}
+	}
+	for(var i=0,k=0;i<dest.length;i++){
+		if(dest[i].amount !== 0 || dest[i].detailId !== ''){
+			newArr2[k] = dest[i];
+			k++
+		}
+	}
+	for(var i=0;i<newArr.length;i++){
+		for(var j=0;j<newArr2.length;j++){
+			if(newArr[i].materialDefinitionId == newArr2[j].materialDefinitionId){
+				newArr[i].unconfirmedAmount += newArr2[j].amount;
+			}
+		}
+	}
+	newArr = newArr.concat(newArr2);
+	return newArr;
+}
+
 /**
  * 获取此次回收的数据.
  * @param confirmation
@@ -3801,7 +3854,7 @@
 	paramJson.delToussItems = deleteTousseItemArray;
 	paramJson.unrecycleTousseItemArray = unrecycleTousseItemArray;
 	paramJson.tousseIntoBasketInfo = getTousseIntoBasketInfo();
-	paramJson.errorDamageDetail = getMaterialErrorDamageDetail();
+	paramJson.errorDamageDetail = newArray(getMaterialErrorDamageDetail() || []);
 	paramJson.urgentTousseItems = getUrgentTousseItems();
 	paramJson.confirmation = confirmation;
 	paramJson.tally = false;
@@ -4079,6 +4132,7 @@
 	var jsonStr = getJsonParams(confirmation,isConfirm);
 	if(jsonStr == '') {return;}
 	var jSONe = JSON.parse(jsonStr);
+	//console.log(jSONe);return
 	alertDiv("保存中,请稍候......", true);
 	if(IntheBoxState == true){
         jSONe.tally = true;
@@ -5689,6 +5743,9 @@
 		var appType = $("#appType").val();
 		if(appType == ""){//为空代表是回收申请单
 			$('.departmentTemplate').show();
+			if(sstsConfig.recycleAddQualityMonitoring){
+				$('.departmentTemplate').css('right','540px');
+			}
 		}
 	}
 	$('.btn-box').css('display','block');
@@ -5734,7 +5791,7 @@
 		}
 }
 /**
- * 根据回收记录id加载回收记录的数据.
+ * 根据回收记录id加载回收记录的数据. 方便测试
  * @param id
  */
 function loadRecyclingRecordById(id){
@@ -5833,13 +5890,14 @@
                    var successAdd = addToussItem(toussItem,false);
                    if(!successAdd){
                 	   continue;
-                   }
-                   var errorLen = tousseItem.recyclingErrors.length;
+				   }
+				   var recyclingErrors = tousseItem.recyclingErrors;
+				   var errorLen = recyclingErrors.length;
                    if(errorLen > 0){
                         var recyclingErrorJsonArray = new Array();
                         for(var j = 0;j < errorLen;j++){
-                        	var error = tousseItem.recyclingErrors[j];
-                        	if(error.amount <= 0){
+                        	var error = recyclingErrors[j];
+                        	if(error.amount < 0){
                         		continue;
                         	}
                         	var errorObj = {
@@ -5851,7 +5909,9 @@
                             	errorType: error.errorType,
                             	tousseBarcode:error.tousseBarcode,
                             	intoBasketAmount:error.amount,
-                            	errorDamageQmKey : error.errorDamageQmKey
+								errorDamageQmKey : error.errorDamageQmKey,
+								status:error.status,
+								unconfirmedAmount:error.unconfirmedAmount || 0
                 	        };
                         	recyclingErrorJsonArray.push(errorObj);
                         }
@@ -5860,13 +5920,14 @@
                         	document.getElementById('showTousseName'+row).className = 'input-a-yellow';
                             document.getElementById('recyclingErrorButton'+row).className = 'btn-b-edit';
                         }
-                    }
-                    var damageLen = tousseItem.recyclingDamages.length;
+					}
+					var recyclingDamages = tousseItem.recyclingDamages;
+					var damageLen = recyclingDamages.length;
                     if(damageLen > 0){
                         var recyclingDamageJsonArray = new Array();
                         for(var j = 0;j < damageLen ; j++){
-                        	var damage = tousseItem.recyclingDamages[j];
-                        	if(damage.amount <= 0){
+                        	var damage = recyclingDamages[j];
+                        	if(damage.amount < 0){
                         		continue;
                         	}
                         	var item = {
@@ -5875,11 +5936,13 @@
                             	materialDefinitionId: damage.materialDefinitionId,
                             	materialName: damage.materialName,
                             	tousseBarcode:damage.tousseBarcode,
-                            	amount: damage.amount,
-                            	errorDamageQmKey : damage.errorDamageQmKey
+								amount: damage.amount,
+								status:damage.status,
+								errorDamageQmKey : damage.errorDamageQmKey,
+								unconfirmedAmount:damage.unconfirmedAmount || 0
                             };
                         	recyclingDamageJsonArray.push(item);
-                        }
+						}
                         setTousseItemRecyclingDamage(row,JSON.stringify(recyclingDamageJsonArray));
                         if(recyclingDamageJsonArray.length > 0){
                         	 document.getElementById('showTousseName'+row).className = 'input-a-yellow';
Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js
===================================================================
diff -u -r28945 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 28945)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordForm.js	(.../useRecordForm.js)	(revision 28969)
@@ -220,6 +220,7 @@
 						foreignTousseApp_id : '',
 						includeImplant : '否',
 						actualUsed:'是',
+						urgentLevel:goodsInfo.urgentLevel,
 						haveUnSupplementMaterials : false
 					});
 					useItemsStore.add(record);
@@ -331,7 +332,8 @@
 										isRecycling : goodsInfo.isRecycling,
 										isConvertApplyGoods : goodsInfo.isConvertApplyGoods,
 										haveUnSupplementMaterials : goodsInfo.haveUnSupplementMaterials,
-										recyclingStatus : goodsInfo.recyclingStatus
+										recyclingStatus : goodsInfo.recyclingStatus,
+										urgentLevel:goodsInfo.urgentLevel
 									});
 									useItemsStore.insert(0 , record);
 									useAmount++;
@@ -355,7 +357,8 @@
 												amount : subTousse.amount,
 												tousseDefinitionName : subTousse.showTousseName,
 												showTousseName : subTousse.showTousseName,
-												comboTousseInstanceId : subTousse.comboTousseInstanceId
+												comboTousseInstanceId : subTousse.comboTousseInstanceId,
+												urgentLevel:subTousse.urgentLevel
 											});
 											useItemsStore.insert(i+1 , record);
 										}
@@ -388,6 +391,7 @@
 							foreignTousseApp_id : '',
 							includeImplant : '否',
 							actualUsed:'是',
+							urgentLevel:goodsInfo.urgentLevel,
 							haveUnSupplementMaterials : false
 						});
 						useItemsStore.add(record);
@@ -412,6 +416,7 @@
 							foreignTousseApp_id : '',
 							includeImplant : '否',
 							actualUsed:'是',
+							urgentLevel:goodsInfo.urgentLevel,
 							haveUnSupplementMaterials : false
 						});
 						useItemsStore.add(record);
@@ -811,6 +816,22 @@
 	if(top.Ext.getCmp('departNameOfpatient').getRawValue() == ''){
 		top.Ext.getCmp('departCodeOfpatient').setValue("");
 	}
+	var tousseInstanceMaterialErrorDamageItems = top.Ext.getCmp('tousseInstanceMaterialErrorDamageItems').getValue();
+	if(tousseInstanceMaterialErrorDamageItems !== ''){
+		tousseInstanceMaterialErrorDamageItems = JSON.parse(tousseInstanceMaterialErrorDamageItems);
+		for(var i=0;i<tousseInstanceMaterialErrorDamageItems.length;i++){
+			var errorData = tousseInstanceMaterialErrorDamageItems[i].errorData || [];
+			var damageData = tousseInstanceMaterialErrorDamageItems[i].damageData || [];
+			for(var j=0;j<errorData.length;j++){
+				errorData[j].errorAmount = errorData[j].unconfirmedAmount
+			}
+			for(var k=0;k<damageData.length;k++){
+				damageData[k].errorAmount = damageData[k].unconfirmedAmount;
+			}
+		}
+		top.Ext.getCmp('tousseInstanceMaterialErrorDamageItems').setValue(JSON.stringify(tousseInstanceMaterialErrorDamageItems));
+	}
+	//console.log(tousseInstanceMaterialErrorDamageItems);return
 	setFormItems(useItemsStore);
 	formObj.form.submit( {
 		url : WWWROOT + '/disinfectSystem/useRecordAction!saveUseRecord2.do',
@@ -1006,12 +1027,6 @@
 	}
 	return null;
 }
-
-/**
- * 使用物品明细行的加急列的图标点击(已经改为下面的加急急别下拉选择的方式了)
- * @param barcode
- * @deprecated
- */
 function urgentBtnClick(barcode){
 	var tousseInstanceGrid = top.Ext.getCmp('tousseInstanceGrid');
 	var record = getTousseInstanceRecord(barcode,tousseInstanceGrid);
@@ -1027,60 +1042,13 @@
 	
 	tousseInstanceGrid.getView().refresh();
 }
-
-/**
- * 使用物品明细行的加急列的加急级别选择
- * @param barcode
- * @param urgentLevelId
- */
-function urgentLevelSelect(barcode,urgentLevelId){
-	var tousseInstanceGrid = top.Ext.getCmp('tousseInstanceGrid');
-	var record = getTousseInstanceRecord(barcode,tousseInstanceGrid);
-	
-	if(record == null){
-		return;
-	}
-	record.data.urgentLevelIdForUseRecord = urgentLevelId;
-	//tousseInstanceGrid.getView().refresh();
-}
-
 function actualUsedClick(barcode,value){
 	var tousseInstanceGrid = top.Ext.getCmp('tousseInstanceGrid');
 	var record = getTousseInstanceRecord(barcode,tousseInstanceGrid);
 	if(record != null){
 		record.data.actualUsed = value;	
 	}	
 }
-
-function addAndEditUseRecord(id, status,recyclingStatus){
-	//判断是否开启有加急级别功能,并且还未加载过
-	if(sstsConfig.enableUrgentFunction && !urgentLevelData.hasLoaded){
-		Ext.Ajax.request({
-			url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
-			success : function(response, options) {
-				var result = Ext.decode(response.responseText);
-				if(result.message){
-					showResult(result.message);
-				}
-				if(result.success){
-					urgentLevelData.hasLoaded = true;
-					urgentLevelData.data = result.data;
-					addAndEditUseRecordAfterUrgentLevelDataLoaded(id, status,recyclingStatus);
-				}else{
-					if(!result.message){
-						showResult("加载加急级别失败.");
-					}
-				}
-			},
-			failure : function(response, options) {
-				showResult("加载加急级别失败.");
-			}
-		});
-	}else{
-		addAndEditUseRecordAfterUrgentLevelDataLoaded(id, status,recyclingStatus);
-	}
-}
-
 /**
  * 如果点击添加按钮，则传过来的ID为空
  * 
@@ -1089,7 +1057,7 @@
  *            审核状态
  * @return
  */
-function addAndEditUseRecordAfterUrgentLevelDataLoaded(id, status,recyclingStatus) {
+function addAndEditUseRecord(id, status,recyclingStatus) {
 	currentUseRecordId = id;
 	useRecordOperationRoomAllowBlank = getBoolValueFromJs('sstsConfig.useRecordOperationRoomAllowBlank',true);
 	useItemsStore.removeAll();
@@ -1326,40 +1294,21 @@
      	{header : "name",dataIndex : 'tousseDefinitionName',hidden : true,menuDisabled : true},
      	{header : "名称",dataIndex : 'showTousseName',width : 150,menuDisabled : true,renderer : renderTousseInstanceNameForUrgent},
      	{header : "使用次数",dataIndex : 'idCardUseAmount',width : 50,hidden : sstsConfig.disableIdCard},
-     	{header : '加急',width : 60,hidden : (!sstsConfig.enableUrgentFunction),
+     	{header : '加急',width : 30,hidden : (sstsConfig.enableUrgentFunction),
      		renderer : function(v, p, record,rowIndex, colIndex) {
-     			/*var imgName = (record.data.isUrgentForUseRecord=='是')?'arrow_down':'arrow_top';
+     			var imgName = (record.data.isUrgentForUseRecord=='是')?'arrow_down':'arrow_top';
      			var str = "<center>";
      			//对于聚合包内的子包所在的行,不提供加急选择
      			if(!record.get("comboTousseInstanceId")){
      				str += "<img src=\"" + WWWROOT + "/images/web/"+imgName+".png\" onclick='getCurrentTab().urgentBtnClick(\""+record.data.barcode+"\")'>";
      			}
      			str += "</center>";
-     			return str;*/
-     			
-     			//由图标按钮调整为下拉框
-     			if(!record.get("comboTousseInstanceId")){
-     				var useRecordBarcode = record.data.barcode;
-     				var selectElementId = "select_"+useRecordBarcode;
-     				var urgentLevelComboHtml = "<select id='"+ selectElementId +"' onchange='getCurrentTab().urgentLevelSelect(\""+record.data.barcode+"\",this.value)'>";
-     				urgentLevelComboHtml += "<option value=''>不加急</option>";
-     				
-     				//遍历所配置的所有启用的加急级别
-     				if(urgentLevelData.data && urgentLevelData.data.length > 0){
-     					var urgentLevelIdForUseRecord = record.data.urgentLevelIdForUseRecord;
-     					for(var i = 0;i < urgentLevelData.data.length;i++){
-     						var urgentLevelDataId = urgentLevelData.data[i]["id"];
-     						urgentLevelComboHtml += "<option value=\""+ urgentLevelDataId +"\" "+ (urgentLevelIdForUseRecord && urgentLevelIdForUseRecord == urgentLevelDataId ? "selected" : "") +">"+ urgentLevelData.data[i]["urgentLevel"] +"</option>";
-     					}
-     				}
-     				urgentLevelComboHtml += "</select>";
-     				return urgentLevelComboHtml;
-     			}
-     			//对于聚合包内的子包所在的行,只进行相关字段的显示,不提供加急选择
-     			return "";
+     			return str;
      		},
      		menuDisabled : true
-     	},{header : "是否真正使用",dataIndex : 'actualUsed',width : 70,menuDisabled : true,hidden:!sstsConfig.enableActualUsed,
+     	},{
+			header : "加急级别",dataIndex : 'urgentLevel',width : 70,hidden : sstsConfig.enableUrgentFunction,
+		},{header : "是否真正使用",dataIndex : 'actualUsed',width : 70,menuDisabled : true,hidden:!sstsConfig.enableActualUsed,
      		renderer: function(v, p, record,rowIndex, colIndex){
  			//对于聚合包内的子包所在的行,不提供选择
  			if(!record.get("comboTousseInstanceId")){
@@ -1433,7 +1382,7 @@
      		return "";
      	}},
      	{header : '操作',id : 'delAction',width : 90,
-     		renderer : function(v, p, record) {
+     		renderer : function(v, p, record,rowIndex) {
      			var str = "<center>";
      			//对于聚合包内的子包所在的行,不提供删除,但如果删除的是聚合包所在的行,则需要同时删除聚合包下属的子包行
      			if(!record.get("comboTousseInstanceId")){
@@ -1442,9 +1391,9 @@
      			
      			//如果配置启用使用记录录入丢失报损功能且该包类型为器械包、且是否回收为是、且是否转换申请单为是时,提供丢失和报损按钮
      			if(sstsConfig.enableUseRecordMaterialErrorDamage && ((record.get("tousseType") == '器械包' && record.get("isRecycling") == '是' && record.get("isConvertApplyGoods") == '是')
-     					|| record.get("tousseType") == '自定义器械包')){
-     				str += "<input type='button' style='height:20px; width:30px;' value='丢失' onclick=\"getCurrentTab().addErrorDamageMaterial('error','"+record.get('id')+"','"+ record.get('showTousseName') +"')\" >";
-     				str += "<input type='button' style='height:20px; width:30px;' value='报损' onclick=\"getCurrentTab().addErrorDamageMaterial('damage','"+record.get('id')+"','"+ record.get('showTousseName') +"')\" >";
+     				|| record.get("tousseType") == '自定义器械包')){
+     				str += "<input type='button' style='height:20px; width:30px;' value='丢失' onmouseover=\"getCurrentTab().getErrorDamageMaterial('error','"+record.get('id')+"','"+ record.get('showTousseName') +"',"+rowIndex+",event)\"  onclick=\"getCurrentTab().addErrorDamageMaterial('error','"+record.get('id')+"','"+ record.get('showTousseName') +"',"+rowIndex+")\" >";
+     				str += "<input type='button' style='height:20px; width:30px;' value='报损' onmouseover=\"getCurrentTab().getErrorDamageMaterial('damage','"+record.get('id')+"','"+ record.get('showTousseName') +"',"+rowIndex+",event)\" onclick=\"getCurrentTab().addErrorDamageMaterial('damage','"+record.get('id')+"','"+ record.get('showTousseName') +"',"+rowIndex+")\" >";
      			}
             	str += "</center>";
      			return str;
@@ -1927,7 +1876,7 @@
 				hidden:fromDepartmentUseRecord,
 				items : [{
 					xtype : 'textfield',
-					fieldLabel : '手术医生',
+					fieldLabel : '医生',
 					maxLength : '16',
 					id : 'doctorName',
 					name : 'doctorName',
@@ -1949,32 +1898,6 @@
 				}]
 			}, {
 				layout : 'form',
-				columnWidth : 0.33,
-				hidden:!sstsConfig.enableUseRecordFormExtensionFields,
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : sstsConfig.enableUseRecordFormExtensionFields ? sstsConfig.enableUseRecordFormExtensionFields[0] : '麻醉医生',
-					maxLength : '16',
-					id : 'anesthetist',
-					name : 'anesthetist',
-					allowBlank : true,
-					anchor : '96%'
-				}]
-			}, {
-				layout : 'form',
-				columnWidth : 0.33,
-				hidden:!sstsConfig.enableUseRecordFormExtensionFields,
-				items : [{
-					xtype : 'textfield',
-					fieldLabel : sstsConfig.enableUseRecordFormExtensionFields ? sstsConfig.enableUseRecordFormExtensionFields[1] : '麻醉方式',
-					maxLength : '16',
-					id : 'anesthesiaMode',
-					name : 'anesthesiaMode',
-					allowBlank : true,
-					anchor : '96%'
-				}]
-			}, {
-				layout : 'form',
 				columnWidth : 0.66,
 				hidden:fromDepartmentUseRecord,
 				items : [{
@@ -2038,7 +1961,8 @@
 			},{
 
                 layout : 'form',
-                columnWidth : 0.33,
+				columnWidth : 0.33,
+				height:26,
                 items : [{
                     xtype : 'textfield',
                     fieldLabel : '录入人',
@@ -2078,7 +2002,8 @@
             },{
                 layout : 'form',
                 columnWidth : 0.33,
-                hidden:fromDepartmentUseRecord,
+				hidden:fromDepartmentUseRecord,
+				height:26,
                 items : [{
                     xtype : 'textfield',
                     fieldLabel : '审核人',
@@ -2092,7 +2017,8 @@
                 }]
 			}, {
                 layout : 'form',
-                columnWidth : 0.33,
+				columnWidth : 0.33,
+				height:26,
                 items : [{
                     xtype : 'textfield',
                     fieldLabel : '审核时间',
@@ -2297,33 +2223,8 @@
 					listeners : {
 						render : function(c) {
 							c.getEl().on('keypress', function(e) {
-								if (e.getKey() == 13) {
-									//判断是否开启有加急级别功能,并且还未加载过
-									if(sstsConfig.enableUrgentFunction && !urgentLevelData.hasLoaded){
-										Ext.Ajax.request({
-											url : WWWROOT + '/disinfectSystem/baseData/urgentLevelAction!getUrgentsForSelect.do',
-											success : function(response, options) {
-												var result = Ext.decode(response.responseText);
-												if(result.message){
-													showResult(result.message);
-												}
-												if(result.success){
-													urgentLevelData.hasLoaded = true;
-													urgentLevelData.data = result.data;
-													loadScanGoods();
-												}else{
-													if(!result.message){
-														showResult("加载加急级别失败.");
-													}
-												}
-											},
-											failure : function(response, options) {
-												showResult("加载加急级别失败.");
-											}
-										});
-									}else{
-										loadScanGoods();
-									}
+								if (e.getKey() == 13) {//
+									loadScanGoods();
 								}
 							});
 						}
@@ -2543,7 +2444,6 @@
 		return barcode;
 	}
 }
-
 /**
  * 器械包列表的加急列渲染函数
  * @param v
@@ -2569,7 +2469,62 @@
 		return v;
 	}
 }
-
+var htmlContentErrorArray = [];
+var htmlContentDamageArray = [];
+function getErrorDamageMaterial(type , tousseInstanceId , tousseName,rowIndex,event){
+	var typeName = "丢失";
+	var tableContent = '';
+	var errorDamageType = '';
+	var tousseInstanceGrid = top.Ext.getCmp("tousseInstanceGrid");
+	var record = tousseInstanceGrid.getStore().getAt(rowIndex);
+	if(type == 'error'){
+		typeName = "丢失";
+		tableContent = record.data['htmlContentErrorArray'] || '';
+		errorDamageType = TYPE_ERROR;
+	}else {
+		typeName = "报损";
+		tableContent = record.data['htmlContentDamageArray'] || '';
+		errorDamageType = TYPE_DAMAGE;
+	}
+	var recordId = record.get('id');
+	if (tableContent == '') {
+		Ext.Ajax.request({
+			url : WWWROOT + '/disinfectSystem/tousseInstanceAction!loadMaterialErrorDamageDataById.do',
+			params : {
+				id : recordId,
+				type: type,
+				errorDamageType:errorDamageType
+			},
+			success : function(response, options) {
+				var result = Ext.decode(response.responseText);
+				if(result.data && result.data.length > 0){
+					var tableContent = "<table height='100%' width='400px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9' height=25><td width='300px' align='center'><h3>材料名称</h3></td><td width='100px' align='center'><h3>数量</h3></td></tr>";
+					for ( var i = 0; i < result.data.length; i++) {
+						var amount = parseInt(result.data[i].errorDamageAmount)+parseInt(result.data[i].unconfirmedAmount);
+						tableContent += "<tr height=25><td align='left' width='250px'>&nbsp"
+								+ result.data[i].name
+								+ "</td><td align='center' width='100px'>"
+								+ amount
+								+ "</td></tr>";
+					}
+					tableContent += "</table></br>";
+					if(type == 'error'){
+						record.set("htmlContentErrorArray",tableContent);
+					}else {
+						record.set("htmlContentDamageArray",tableContent);
+					}
+					event.target.setAttribute('data-qtip', tableContent);
+					event.target.setAttribute('data-qtitle', '&nbsp;<font size=10>'+typeName+'材料列表:</font>');
+				}
+			},
+			failure : function(response, options) {
+			}
+		});
+	} else {
+		event.target.setAttribute('data-qtip', tableContent);
+		event.target.setAttribute('data-qtitle', '&nbsp;<font size=10>'+typeName+'材料列表:</font>');
+	}
+}
 /**
  * 点击丢失或报损,然后打开窗口进行丢失或报损及原因备注填写
  * 新打开一个window,里面有上下两个元素,材料的grid及原因备注,其下就是保存按钮
@@ -2580,18 +2535,19 @@
  * @param tousseInstanceId 包实例id
  * @param tousseName 包实例名称
  */
-function addErrorDamageMaterial(type , tousseInstanceId , tousseName){
+function addErrorDamageMaterial(type , tousseInstanceId , tousseName,rowIndex){
 	var typeName = "丢失";
 	if(type == 'damage'){
 		typeName = "报损";
 	}
-	
 	//器械包的材料丢失报损Record类
 	var addMaterialErroDamageRecord = Ext.data.Record.create([
 		{name : 'materialId'},
 		{name : 'name'},
 		{name : 'amount'},
-		{name : 'errorAmount'}
+		{name : 'errorAmount'},
+		{name : 'errorDamageAmount'},
+		{name : 'unconfirmedAmount'}
 	]);
 	//表单表格面板
 	var materialErrorDamageFormPanel = new top.Ext.FormPanel({
@@ -2608,7 +2564,18 @@
 			bodyStyle : 'border:1px solid #afd7af',
 			frame :false,
 			viewConfig: {
-	            forceFit:true
+				forceFit:true,
+				getRowClass:function(record, rowIndex, rowParams, store){
+					if((record.data.unconfirmedAmount+record.data.errorDamageAmount) > 0){
+						if(typeName == '丢失'){
+							return "bgYellow";
+						}else {
+							return "bgBrown";
+						}
+					}else {
+						return "bgWhite";
+					}
+				}
 			},
 			store : new Ext.data.Store({
 				proxy : new Ext.data.HttpProxy({
@@ -2620,7 +2587,8 @@
 				  	    {name : 'materialId'},
 				  	    {name : 'name'},
 				  	    {name : 'amount'},
-				  	    {name : 'errorAmount'}
+						{name : 'unconfirmedAmount'},
+						{name : 'errorDamageAmount'}
 				  	]
 				})
 			}),
@@ -2630,11 +2598,11 @@
 	        	/*{header : "规定数量",dataIndex : 'defineAmount',width : 80,menuDisabled : true},
 	        	{header : "接收数量",dataIndex : 'actualAmount',width : 80,menuDisabled : true},*/
 	        	{header : "数量",dataIndex : 'amount',width : 50,menuDisabled : true},
-        		{header : typeName + "数量",dataIndex : 'errorAmount',width : 50,menuDisabled : true,
+        		{header : typeName + "数量",width : 50,menuDisabled : true,
         			editor : new top.Ext.form.NumberField({
         				regex: /^\d+$/,
         				regexText:'只能输入数字',
-        				width : 50,
+						width : 50,
         				allowBlank : true,
         				allowNegative : false,//不允许输入负数
                         allowDecimals : false,//不允许输入小数
@@ -2644,7 +2612,12 @@
                         		//console.log(thiz);
                         	}
                         }
-        			})
+					}),
+					renderer:function(v,p,record){
+						var errorDamageAmount = record.data.errorDamageAmount || 0;
+						var unconfirmedAmount = record.data.unconfirmedAmount || 0;
+						return parseInt(errorDamageAmount)+parseInt(unconfirmedAmount);
+					}
         		},
         		{header : "操作",dataIndex : 'opAction',width : 60,menuDisabled : true,renderer:function(v,p,record){
         			var str = "<input type='button' style='height:20px; width:20px;' value='+' onclick=\"getCurrentTab().changeMaterialErrorAmount('add','"+record.get('materialId')+"','"+ record.get('name') +"')\" >";
@@ -2751,11 +2724,12 @@
 				//验证提交的丢失(报损)数据,如果有录备注原因时,必须确保至少有录一条丢失/报损数量
 				for(var i = 0;i < store.getCount();i++){
 					var record = store.getAt(i);
-					if(record.data.errorAmount){
-						jsonArray.push({materialId:record.data.materialId,errorAmount:record.data.errorAmount , name:record.data.name});
-					}
+					var errorDamageAmount = record.data.errorDamageAmount || 0;
+					var unconfirmedAmount = record.data.unconfirmedAmount || 0;
+					var errorAmount = record.data.errorAmount || 0;
+					
+					jsonArray.push({materialId:record.data.materialId,errorAmount:errorAmount, name:record.data.name,errorDamageAmount:errorDamageAmount,unconfirmedAmount:unconfirmedAmount});
 				}
-				
 				//定义临时变量用于存储当前的材料相关的数量值,如果验证通过再设置到正式变量,否则不设置到正式变量
 				var tempErrorDamageData = {};
 				tempErrorDamageData.errorData = currentErrorDamageData.errorData;
@@ -2765,7 +2739,6 @@
 				}else if(type == 'damage'){
 					tempErrorDamageData.damageData = jsonArray;
 				}
-
 				//判断该包的材料丢失报损数量有无超过最大可丢失报损数量
 				if(tousseCanErrorDamageMaxAmountArray.length > 0){
 					for (var i = 0; i < tousseCanErrorDamageMaxAmountArray.length; i++) {
@@ -2775,7 +2748,7 @@
 							if(tempErrorDamageData.errorData && tempErrorDamageData.errorData.length > 0){
 								for (var j = 0; j < tempErrorDamageData.errorData.length; j++) {
 									var tempErrorData = tempErrorDamageData.errorData[j];
-									if(tempErrorData.errorAmount > tousseCanErrorDamageMaxAmount["" + tempErrorData.materialId]){
+									if(tempErrorData.unconfirmedAmount > tousseCanErrorDamageMaxAmount["" + tempErrorData.materialId]){
 										alert("【"+ tempErrorData.name +"】丢失数量已大于最大可丢失报损数量,请重新填写");
 										return false;
 									}
@@ -2785,7 +2758,7 @@
 							if(tempErrorDamageData.damageData && tempErrorDamageData.damageData.length > 0){
 								for (var j = 0; j < tempErrorDamageData.damageData.length; j++) {
 									var tempDamageData = tempErrorDamageData.damageData[j];
-									if(tempDamageData.errorAmount > tousseCanErrorDamageMaxAmount["" + tempDamageData.materialId]){
+									if(tempDamageData.unconfirmedAmount > tousseCanErrorDamageMaxAmount["" + tempDamageData.materialId]){
 										alert("【"+ tempDamageData.name +"】报损数量已大于最大可丢失报损数量,请重新填写");
 										return false;
 									}
@@ -2797,13 +2770,13 @@
 								for (var j = 0; j < tempErrorDamageData.errorData.length; j++) {
 									var tempErrorData = tempErrorDamageData.errorData[j];
 									var tempMaterialId = tempErrorData.materialId
-									var totalErrorAmount = tempErrorData.errorAmount;
+									var totalErrorAmount = tempErrorData.unconfirmedAmount;
 									
 									if(tempErrorDamageData.damageData && tempErrorDamageData.damageData.length > 0){
 										for (var k = 0; k < tempErrorDamageData.damageData.length; k++) {
 											var tempDamageData = tempErrorDamageData.damageData[k];
 											if(tempMaterialId == tempDamageData.materialId){
-												totalErrorAmount = totalErrorAmount + tempDamageData.errorAmount;
+												totalErrorAmount = totalErrorAmount + tempDamageData.unconfirmedAmount;
 												if(totalErrorAmount > tousseCanErrorDamageMaxAmount["" + tempMaterialId]){
 													alert("【"+ tempDamageData.name +"】丢失与报损数量之和已大于最大可丢失报损数量,请重新填写");
 													return false;
@@ -2833,6 +2806,26 @@
 				if(!dataExists){
 					tousseInstanceMaterialErrorDamageArray.push(currentErrorDamageData);
 				}
+				var tousseInstanceGrid = top.Ext.getCmp("tousseInstanceGrid");
+				var record = tousseInstanceGrid.getStore().getAt(rowIndex);
+				var tableContent = "<table height='100%' width='400px' border='1' align='center' cellpadding='0' cellspacing='0'><tr bgcolor='#D7EBD9' height=25><td width='300px' align='center'><h3>材料名称</h3></td><td width='100px' align='center'><h3>数量</h3></td></tr>";
+				for ( var i = 0; i < jsonArray.length; i++) {
+					var unconfirmedAmount = parseInt(jsonArray[i].unconfirmedAmount) || 0;
+					var errorDamageAmount = parseInt(jsonArray[i].errorDamageAmount) || 0;
+					if((errorDamageAmount+unconfirmedAmount) !== 0){
+						tableContent += "<tr height=25><td align='left' width='250px'>&nbsp"
+							+ jsonArray[i].name
+							+ "</td><td align='center' width='100px'>"
+							+ (errorDamageAmount+unconfirmedAmount)
+							+ "</td></tr>";
+					}
+				}
+				tableContent += "</table></br>";
+				if(type == 'error'){
+					record.set("htmlContentErrorArray",tableContent);
+				}else {
+					record.set("htmlContentDamageArray",tableContent);
+				}
 				top.Ext.getCmp("tousseInstanceMaterialErrorDamageItems").setValue(Ext.encode(tousseInstanceMaterialErrorDamageArray));
 				materialErrorDamageWindow.close();
 			}
@@ -2843,7 +2836,6 @@
 			}
 		}]
 	});
-	
 	//丢失报损表格的丢失/报损数量验证代码 start
 	var materialErrorDamageGrid = top.Ext.getCmp("materialErrorDamageGrid");
 	var materialErrorDamageGridCurrentRowNumber;
@@ -2899,7 +2891,6 @@
 			materialErrorDamageFormPanel.getEl().unmask();
 			//数据格式:{remark:"原因说明",[{name:"材料1",defineAmount:2,amount:2,errorAmount:1},{name:"材料2",defineAmount:1,amount:1,errorAmount:0},...{name:"材料3",defineAmount:4,amount:3,errorAmount:1}]}
 			var result = Ext.decode(response.responseText);
-			
 			var currentErrorDamageData;
 			if(tousseInstanceMaterialErrorDamageArray.length > 0){
 				for(var j = 0 ;j < tousseInstanceMaterialErrorDamageArray.length;j++){
@@ -2928,6 +2919,8 @@
 					var resultData = result.data[i];
 					var materialId = resultData.materialId;
 					var errorAmount = resultData.errorAmount;
+					var errorDamageAmount = resultData.errorDamageAmount;
+					var unconfirmedAmount = resultData.unconfirmedAmount;
 					
 					//记录每个包实例的材料最大可丢失/报损数量
 					if(tousseCanErrorDamageMaxAmountArray.length > 0){
@@ -2956,15 +2949,26 @@
 						newTousseCanErrorDamageMaxAmount[""+ materialId +""] = resultData.amount;
 						tousseCanErrorDamageMaxAmountArray.push(newTousseCanErrorDamageMaxAmount);
 					}
-					
-					if(currentErrorDamageDetailData && currentErrorDamageDetailData.length > 0){
-						var existsErrorAmount = false;
-						for(var k = 0;k < currentErrorDamageDetailData.length ;k++){
-							if(materialId == currentErrorDamageDetailData[k].materialId){
-								errorAmount = currentErrorDamageDetailData[k].errorAmount;
-								existsErrorAmount = true;
-								break;
+					if(currentErrorDamageDetailData){
+						if(currentErrorDamageDetailData.length > 0){
+							var existsErrorAmount = false;
+							for(var k = 0;k < currentErrorDamageDetailData.length ;k++){
+								if(materialId == currentErrorDamageDetailData[k].materialId){
+									errorAmount = currentErrorDamageDetailData[k].errorAmount;
+									if(currentErrorDamageDetailData[k].errorDamageAmount == undefined){
+										existsErrorAmount = true;
+										break;
+									}
+									errorDamageAmount = currentErrorDamageDetailData[k].errorDamageAmount;
+									unconfirmedAmount = currentErrorDamageDetailData[k].unconfirmedAmount;
+									existsErrorAmount = true;
+									break;
+								}
 							}
+						}else {
+							errorDamageAmount = 0;
+							unconfirmedAmount = 0;
+							errorAmount = 0;
 						}
 						if(!existsErrorAmount){
 							errorAmount = "";
@@ -2973,12 +2977,12 @@
 					var storeData = new addMaterialErroDamageRecord({
 						materialId : materialId,
 						name : resultData.name,
-						//defineAmount : resultData.defineAmount,
-						//actualAmount : resultData.actualAmount,
 						amount : resultData.amount,
-						errorAmount : errorAmount
+						errorDamageAmount:errorDamageAmount,
+						errorAmount : errorAmount,
+						unconfirmedAmount:unconfirmedAmount,
 					});
-					
+
 					store.add(storeData);
 				}
 			}
@@ -3001,22 +3005,22 @@
 	for(var i = 0 ;i < store.getCount();i++){
 		var record = store.getAt(i);
 		if(materialId == record.get("materialId")){
-			var errorAmount = record.get("errorAmount");
+			var errorDamageAmount = parseInt(record.get("errorDamageAmount")) || 0;
+			var unconfirmedAmount = parseInt(record.get("unconfirmedAmount")) || 0;
 			var amount = record.get("amount");
-			if(!errorAmount){
-				errorAmount = 0;
-			}
 			if(type == 'add'){
-				if(errorAmount >= amount){
-					alert("误差数量已经达到原数量,不能再加");
+				if((errorDamageAmount+unconfirmedAmount) >= amount){
+					showResult("误差数量已经达到原数量,不能再加");
 				}else{
-					record.set("errorAmount",errorAmount + 1);
+					record.set("unconfirmedAmount",unconfirmedAmount + 1);
 				}
 			}else if(type == 'sub'){
-				if(errorAmount == 0){
-					alert("误差数量已经为0,不能再减");
+				if((errorDamageAmount+unconfirmedAmount) == 0){
+					showResult("误差数量已经为0,不能再减");
+				}else if(unconfirmedAmount == 0){
+					showResult("减少到的最小数量不能超过已有的丢失数量！");
 				}else{
-					record.set("errorAmount",errorAmount - 1);
+					record.set("unconfirmedAmount",unconfirmedAmount - 1);
 				}
 			}
 			break;
Index: ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js
===================================================================
diff -u -r26865 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js	(.../recyclingErrorView.js)	(revision 26865)
+++ ssts-web/src/main/webapp/disinfectsystem/recyclingError/recyclingErrorView.js	(.../recyclingErrorView.js)	(revision 28969)
@@ -71,7 +71,8 @@
 	     {header : "所属器械包",width : 150,dataIndex : 'tousseName'},
 	     {header : "误差类型",width : 70,dataIndex : 'errorType'},
 	     {header : "数量",width : 50,dataIndex : 'amount'},
-	     {header : "报失科室",width : 120,dataIndex : 'depart'}, 
+		 {header : "报失科室",width : 120,dataIndex : 'depart'}, 
+		 {header : "丢失环节",width : 120,dataIndex : 'linkType'}, 
 	     {header : "报失时间",width : 120,dataIndex : 'operationTime', renderer : myDateFormatByMinute}, 
 	     {header : "补充数量",width : 80,dataIndex : 'additionalAmount'},
 	     {header : "补充时间",width : 120,dataIndex : 'additionalTime', renderer : myDateFormatByMinute}, 
@@ -86,7 +87,8 @@
 	     {name : 'materialName'},
 	     {name : 'tousseName'},
 	     {name : 'errorType'}, 
-	     {name : 'amount'},
+		 {name : 'amount'},
+		 {name : 'linkType'},
 	     {name : 'additionalAmount'},
 	     {name : 'depart'},
 	     {name : 'operationTime'},
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28771 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28771)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28969)
@@ -331,56 +331,16 @@
 }
 
 
-function addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-		taskStatus,department,tousseType, packageType, packageSize,
-		sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,
-		damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode,
-		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark,cleaned,note,urgentLevelObj,colorCode){
+function addTaskNode(params){
 	var leaf = false;
-	if(taskId != ''){
+	if(params.taskId != ''){
 		leaf = true;
 	}
-	var node = Ext4.create('cModel',{
-		taskId : taskId,
-		tousseID : td_id,
-		invoicePlanId : invoicePlanId,
-		tousseName : tousseName,
-		amount : amount,
-		urgentAmount : urgentAmount,
-		urgentLevel : urgentLevel,
-		unPackingAmount:amount,
-		washTime : washTime,
-		basketBarcode : basketBarcode,
-		basketName : basketName,
-		status : taskStatus,
-		department : department,
-		tousseType : tousseType,
-		packageType : packageType,
-		packageSize : packageSize,
-		sterilingMethod : sterilingMethod,
-		dateTime : recyclingTime,
-		isTraceable : isTraceable,
-		isPrint : isPrint,
-		isReview : isReview,
-		errors : errors,
-		damages : damages,
-		taskType : taskType,
-		supplierName : supplierName,
-		leaf : leaf,
-		replenishMaterils : replenishMaterils,
-		haveIDCard:haveIDCard,
-		uuid_vedioNames : videoNames,
-		allowModifyPackageType : allowModifyPackageType,
-		idCardBarcode : idCardBarcode,
-		errorRemark:errorRemark,
-		damageRemark:damageRemark,
-		serialNumber:serialNum,
-		recyclingItemRemark:recyclingItemRemark,
-		cleaned: cleaned,
-		note: note,
-		urgentLevelObj:urgentLevelObj,
-		colorCode:colorCode
-	});
+
+	var newParams = params;
+
+	newParams.tousseType = params.tousseType1;
+	var node = Ext4.create('cModel',newParams);
 	if(!leaf){
 		node.set("checked" ,false);
 	}
@@ -607,7 +567,6 @@
     		var tousseName = result.idCard.tousseDefinition.name;
     		var taskList = result.idCard.packingTaskInfo;
     		var existTask = findIDCardPackingTask(basketStore,result.idCard);
-    		
     		// 在待装配任务里面选择标识牌的包可以装配
     		if(!existTask){
     			existTask = findIDCardPackingTask(waitPackingTaskStore,result.idCard);
@@ -645,6 +604,8 @@
 
 	var tousseName = result.idCard.tousseDefinition.name;
 	var taskList = result.idCard.packingTaskInfo;
+	var errorDamageRemark = result.idCard.errorDamageRemark || '';
+	var errorDamageRemarkId = result.idCard.errorDamageRemarkId || '';
 	if(!existTask){
 		existTask = findIDCardPackingTask(basketStore,result.idCard);
 	}
@@ -681,6 +642,7 @@
 		showPackButton(isPrint,isReview,tousseType);
 		
 	}
+	console.log(idCardTaskNode)
 	// 取消选中所有的装配任务，只选中该标识牌的
 	uncheckAllExceptCurrentIDCardPackingTask();
 	currentIDCardInfo = result.idCard;
@@ -697,6 +659,9 @@
 	
 	Ext4.getCmp('packageType').setValue(packageType);
 	Ext4.getCmp('sterilingType').setValue(sterilingType);
+	Ext4.getCmp('remark').setValue(errorDamageRemark);
+	Ext4.getCmp('errorDamageRemark').setValue(errorDamageRemark);
+	Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
 	//根据灭菌程序设置灭菌方式的值
 	setSterilingModeValueBySterilingType(sterilingType);
 	
@@ -2041,12 +2006,20 @@
 		componentCls:'formItemMgn',
 		id : 'remark',
 		name : 'remark',
-		maxLength : '30',
+		maxLength : '1000',
 		labelWidth:90,
 		anchor : '95%',
 		allowBlank : true,
 		labelAlign:'right'
 	},{
+		xtype:'hidden',
+		id:'errorDamageRemarkId',
+		name:'errorDamageRemarkId'
+	},{
+		xtype:'hidden',
+		id:'errorDamageRemarkInfo',
+		name:'errorDamageRemarkInfo'
+	},{
 		columnWidth :.99,
 		xtype : 'textfield',
 		fieldLabel : '丢失材料',
@@ -2759,6 +2732,76 @@
 	}
 }
 
+function refreshRemarks(record){
+	if(record){
+		if(record.data.children){
+			var children = record.data.children;
+			var damagesArr = [];
+			var errorsArr = [];
+			var k = 0;
+			var z = 0;
+			for(var i=0;i<children.length;i++){
+				if(children[i].damages.length > 0){
+					var damages = children[i].damages;
+					for(var j=0;j<damages.length;j++){
+						var materialName = damages[j].materialName;
+						var amount = damages[j].amount;
+						var specification = damages[j].specification || '';
+						var unit = damages[j].unit || '';
+						if(specification !== ''){
+							damagesArr[k] = materialName+'['+specification+']x'+amount+'×'+unit;
+						}else {
+							damagesArr[k] = materialName+'x'+amount;
+						}
+						k++;
+					}
+				}
+				if(children[i].errors.length > 0){
+					var errors = children[i].errors;
+					for(var j=0;j<errors.length;j++){
+						var materialName = errors[j].materialName;
+						var amount = errors[j].amount;
+						var specification = errors[j].specification || '';
+						var unit = errors[j].unit || '';
+						if(specification !== ''){
+							errorsArr[z] = materialName+'['+specification+']x'+amount+'×'+unit;
+						}else {
+							errorsArr[z] = materialName+'x'+amount;
+						}
+						z++;
+					}
+				}
+			}
+		}else {
+			var damagesArr = [];
+			var errorsArr = [];
+			if(record.data.damages.length > 0){
+				var damages = record.data.damages;
+				for(var j=0;j<damages.length;j++){
+					var materialName = damages[j].materialName;
+					var amount = damages[j].amount;
+					var specification = damages[j].specification || '';
+					var unit = damages[j].unit || '';
+					if(specification !== ''){
+						damagesArr[j] = materialName+'['+specification+']x'+amount+'×'+unit;
+					}else {
+						damagesArr[j] = materialName+'x'+amount;
+					}
+				}
+			}
+		}
+		if(record.data.damages.length == 0 && record.data.errors.length == 0){
+			Ext4.getCmp('remark').setValue('');
+			Ext4.getCmp('errorDamageRemarkId').setValue('');
+			Ext4.getCmp('errorDamageRemarkInfo').setValue('');
+		}else {
+			Ext4.getCmp('remark').setValue(record.raw.errorDamageRemarkInfo);
+			Ext4.getCmp('errorDamageRemarkId').setValue(record.raw.errorDamageRemarkId);
+			Ext4.getCmp('errorDamageRemarkInfo').setValue(record.raw.errorDamageRemarkInfo);
+		}
+	}
+}
+
 function refreshRecyclingItemRemark(record){
 	if(record){
 		var recyclingItemRemark  = record.get("recyclingItemRemark");
@@ -3508,11 +3551,11 @@
 		showScanIDCardBarcode();
 	 }else{
 		//不回收的物品
-       var isShow = Ext4.getCmp('save_print').isVisible();
+	   var isShow = Ext4.getCmp('save_print').isVisible();
        if(isShow){
            	//选择统计的敷料包选项全打印
            	var selNodes = waitPackingTreeGrid.getView().getChecked();
-           	var selLength = selNodes.length;
+			var selLength = selNodes.length;
        		Ext4.each(selNodes, function(pNode) {
        			if(pNode.get('taskType') == taskType_recyclingRecord){
        				return true;//在each(jquery、ext都如此)循环中,return true表示continue,return false表示break
@@ -3605,7 +3648,6 @@
 		return false;
 	}
 	var tousseWeight = Ext4.getCmp('tousseWeight').getValue();
-	
     //是否消毒物品
     var validatepass = true;
     DWREngine.setAsync(false);
@@ -3667,7 +3709,9 @@
     		return false;
     	}
     }
-    var remark = Ext4.getCmp('remark').getValue();
+	var remark = Ext4.getCmp('remark').getValue();
+	var errorDamageRemarkId = Ext4.getCmp('errorDamageRemarkId').getValue() || '';
+	var errorDamageRemarkInfo = Ext4.getCmp('errorDamageRemarkInfo').getValue() || '';
     var params = {
     		taskIds: taskIds,
     		inspector: inspector,
@@ -3696,8 +3740,13 @@
 			urgentAmount: urgentAmount,
 			tousseWeight: tousseWeight,
 			remark: remark,
+			errorDamageRemarkInfo:errorDamageRemarkInfo,
 			websocketSessionId : getWebsocketSessionId()
 	}
+	if(errorDamageRemarkId !== '' && errorDamageRemarkId !== 0){
+		params.errorDamageRemarkId = errorDamageRemarkId;
+	}
+	
 //    DWREngine.setAsync(false);
 //    // 调用服务端的装配器械包的代码
 //    PackingTableManager.packingTousse2(JSON.stringify(params),function(rs){
@@ -3740,7 +3789,6 @@
 //        }
 //    });
 //    DWREngine.setAsync(true);
-    
     // 改为不用dwr
     Ext4.Ajax.request({
 		//async: !isFirstOnLoad,
@@ -3749,8 +3797,8 @@
 		url: WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
 		params : {packingParams : JSON.stringify(params)},
 		success: function(rs) {
-            var result = Ext4.decode(rs.responseText);
-        	var showName = tousseName;
+			var result = Ext4.decode(rs.responseText);
+			var showName = tousseName;
     		if (result.success){
     			processAfterPacking(printImmediately,result, showName, packAmount);
     			//保存装配视频监控
@@ -3907,7 +3955,6 @@
 //	showResult(packAmount + "个" + showName + "装配完成");
 	var printGroupType = Ext4.getCmp('printGroupType').getValue();
 	var cfg = createPrintLabelsConfig(printGroupType);
-	
 	if(tousseesToPrint.length > 0){
 //		if(!Ext4.isIE){
 //			showResult("目前只支持IE浏览器进行打印!" , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -4095,7 +4142,8 @@
        		if(idCardBarcodeTemp != ""){
        			loadIdCardByBarcode(idCardBarcodeTemp,false);
        		}
-       		refreshErrorAndDamageRemark(record);
+			refreshErrorAndDamageRemark(record);
+			refreshRemarks(record);
        		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
@@ -4107,7 +4155,36 @@
            		return false;
            	}
            	
-       },
+	   },
+	   load: {
+		fn: function(store){
+			var root = basketStore.getRootNode();
+			var tousseNameMaxLenArray = [];
+			var basketNameMaxLenArray = [];
+			var k = 0;
+			for(var i=0;i<root.childNodes.length;i++){
+				var parentNode = root.childNodes[i];
+				var tousseName = parentNode.data.tousseName;
+				tousseNameMaxLenArray[i] = textSize(fontSize+"px","宋体",tousseName).width || 0;
+				for(var j=0;j<parentNode.childNodes.length;j++){
+					var childNode = parentNode.childNodes[j];
+					var basketName = childNode.data.basketName;
+					basketNameMaxLenArray[k] = textSize(fontSize+"px","宋体",basketName).width || 0;
+					k++;
+				}
+			}
+			if(tousseNameMaxLenArray.length > 0){
+				var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
+				this.headerCt.getGridColumns()[0].setWidth(tousseNameMaxLenght+90);
+			}
+			if(basketNameMaxLenArray.length > 0){
+				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
+				if(basketNameMaxLenght !== 0){
+					this.headerCt.getGridColumns()[4].setWidth(basketNameMaxLenght+30);
+				}
+			}
+		}
+	},
       checkchange:function( node, checked, eOpts ){
     	  	 showNoteWindow(node, checked); 	  
         	 resetScanIDCardBarcodeVisibility(node);
@@ -4204,10 +4281,48 @@
 										if(n == 0){
 											checked = true;
 										}
-										parentNode = addTaskNode('',td_id,'',videoNames,tousseName,0,'','','',
-												'','',tousseType, packageType, "",
-												sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,
-												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','',taskVO.cleaned,taskVO.note,taskVO.urgentLevelObj,taskVO.colorCode);
+										var params = {
+											taskId:'',
+											td_id:td_id,
+											invoicePlanId:'',
+											videoNames:videoNames,
+											tousseName:tousseName,
+											amount:0,
+											washTime:'',
+											basketBarcode:'',
+											basketName:'',
+											taskStatus:'',
+											department:'',
+											tousseType1:tousseType,
+											packageType:packageType,
+											packageSize:'',
+											sterilingMethod:sterilingMethod,
+											dateTime:'',
+											isTraceable:isTraceable,
+											isPrint:isPrint,
+											isReview:isReview,
+											errors:'',
+											damages:'',
+											replenishMaterils:rMaterils,
+											taskType:'',
+											supplierName:'',
+											haveIDCard:haveIDCard,
+											childUrgentAmount:urgentAmount,
+											idCardBarcode:taskVO.idCardBarcode,
+											allowModifyPackageType:taskVO.allowModifyPackageType,
+											errorRemark:taskVO.errorRemark,
+											damageRemark:taskVO.damageRemark,
+											urgentLevel:taskVO.urgentLevel,
+											serialNumber:'',
+											recyclingItemRemark:'',
+											cleaned:taskVO.cleaned,
+											note:taskVO.note,
+											urgentLevelObj:taskVO.urgentLevelObj,
+											colorCode:taskVO.colorCode,
+											errorDamageRemarkId:'',
+											errorDamageRemarkInfo:''
+										}
+										parentNode = addTaskNode(params);
 										newParentNode = true;
 									}else{
 										var uamountStr = parentNode.get('urgentAmount');
@@ -4252,8 +4367,7 @@
 										var replenishMaterils = task.replenishMaterils;
 										var taskType = task.taskType;
 										var supplierName = task.supplierName;
-										var packageSize = task.packageSize;								
-										
+										var packageSize = task.packageSize;	
 										if(task.tousseType == '外来器械包'){
 											haveForeignTousseNode = true;
 										}
@@ -4277,10 +4391,12 @@
 											}
 			            				}
 										if(sigle){
-											var childNode =	addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-													taskStatus,department,tousseType, packageType,packageSize,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
-													errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode,
-													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark,task.cleaned,task.note,task.urgentLevelObj,task.colorCode);
+											task.td_id = td_id;
+											task.videoNames = videoNames;
+											task.tousseType1 = tousseType;
+											task.packageType = packageType;
+											task.sterilingMethod = sterilingMethod;
+											var childNode =	addTaskNode(task);
 											parentNode.appendChild(childNode);
 											var pNewAmount = parentNode.get('amount') + amount;
 											parentNode.set('amount',pNewAmount);
@@ -4299,6 +4415,31 @@
 										Ext4.getCmp('basketBarcodeInput').focus('', 10);
 									}
 								}
+								var root = basketStore.getRootNode();
+								var tousseNameMaxLenArray = [];
+								var basketNameMaxLenArray = [];
+								var k = 0;
+								for(var i=0;i<root.childNodes.length;i++){
+									var parentNode = root.childNodes[i];
+									var tousseName = parentNode.data.tousseName;
+									tousseNameMaxLenArray[i] = textSize(fontSize+"px","宋体",tousseName).width || 0;
+									for(var j=0;j<parentNode.childNodes.length;j++){
+										var childNode = parentNode.childNodes[j];
+										var basketName = childNode.data.basketName;
+										basketNameMaxLenArray[k] = textSize(fontSize+"px","宋体",basketName).width || 0;
+										k++;
+									}
+								}
+								if(tousseNameMaxLenArray.length > 0){
+									var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
+									basketColumnTreeGrid.headerCt.getGridColumns()[0].setWidth(tousseNameMaxLenght+90);
+								}
+								if(basketNameMaxLenArray.length > 0){
+									var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
+									if(basketNameMaxLenght !== 0){
+										basketColumnTreeGrid.headerCt.getGridColumns()[4].setWidth(basketNameMaxLenght+30);
+									}
+								}
 	                        	speakBasket.speakContent();
 	                        },
 	                        failure : function(){myMask.hide();}
@@ -4475,7 +4616,8 @@
        		}
        		// 显示丢失报损按钮
        		showOrHideErrorAndDamageBtn();
-       		refreshErrorAndDamageRemark(record);
+			refreshErrorAndDamageRemark(record);
+			refreshRemarks(record);
        		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
@@ -5089,10 +5231,48 @@
 							if(n == 0){
 								checked = true;
 							}
-							parentNode = addTaskNode('',td_id,'',videoNames,tousseName,0,'','','',
-									'','',tousseType, packageType, "",
-									sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,
-									taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','',taskVO.cleaned,taskVO.note,taskVO.urgentLevelObj,taskVO.colorCode);
+							var params = {
+								taskId:'',
+								td_id:td_id,
+								invoicePlanId:'',
+								videoNames:videoNames,
+								tousseName:tousseName,
+								amount:0,
+								washTime:'',
+								basketBarcode:'',
+								basketName:'',
+								taskStatus:'',
+								department:'',
+								tousseType1:tousseType,
+								packageType:packageType,
+								packageSize:'',
+								sterilingMethod:sterilingMethod,
+								dateTime:'',
+								isTraceable:isTraceable,
+								isPrint:isPrint,
+								isReview:isReview,
+								errors:'',
+								damages:'',
+								replenishMaterils:rMaterils,
+								taskType:'',
+								supplierName:'',
+								haveIDCard:haveIDCard,
+								childUrgentAmount:urgentAmount,
+								idCardBarcode:taskVO.idCardBarcode,
+								allowModifyPackageType:taskVO.allowModifyPackageType,
+								errorRemark:taskVO.errorRemark,
+								damageRemark:taskVO.damageRemark,
+								urgentLevel:taskVO.urgentLevel,
+								serialNumber:'',
+								recyclingItemRemark:'',
+								cleaned:taskVO.cleaned,
+								note:taskVO.note,
+								urgentLevelObj:taskVO.urgentLevelObj,
+								colorCode:taskVO.colorCode,
+								errorDamageRemarkId:'',
+								errorDamageRemarkInfo:''
+							}
+							parentNode = addTaskNode(params);
 							newParentNode = true;
 						}else{
 							var uamountStr = parentNode.get('urgentAmount');
@@ -5162,10 +5342,13 @@
 								}
 							}
 							if(sigle){
-								var childNode =	addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-										taskStatus,department,tousseType, packageType,packageSize,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
-										errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode,
-										task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark,task.cleaned,task.note,task.urgentLevelObj,task.colorCode);
+								task.td_id = td_id;
+								task.videoNames = videoNames;
+								task.tousseType1 = tousseType;
+								task.packageType = packageType;
+								task.sterilingMethod = sterilingMethod;
+
+								var childNode =	addTaskNode(task);
 								parentNode.appendChild(childNode);
 								var pNewAmount = parentNode.get('amount') + amount;
 								parentNode.set('amount',pNewAmount);
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp
===================================================================
diff -u -r27263 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 27263)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/recyclingDamage.jsp	(.../recyclingDamage.jsp)	(revision 28969)
@@ -53,15 +53,28 @@
 
 function add(row){
 	var totalCount = parseInt($('#totalCount'+row).html(),10);
-	if(parseInt($('#errorAmount'+row).html(),10) < totalCount){
-		$('#errorAmount'+row).html(parseInt($('#errorAmount'+row).html(),10)+1);
+	var errorAmount = parseInt($('#errorAmount' + row).html(), 10)
+	var errorCount = parseInt($('#errorCount' + row).val());
+	var unconfirmedAmount = parseInt($('#unconfirmedAmount' + row).val());
+	if(errorAmount < totalCount){
+		$('#errorAmount'+row).html(errorAmount+1);
+		$('#unconfirmedAmount'+row).val(errorAmount-errorCount);
 	}
 }
 
 function reduce(row){
-    var totalCount = parseInt($('#totalCount'+row).html(),10);
-    if(parseInt($('#errorAmount'+row).html(),10) > 0){
-        $('#errorAmount'+row).html(parseInt($('#errorAmount'+row).html(),10)-1);
+	var totalCount = parseInt($('#totalCount'+row).html(),10);
+	var errorCount = parseInt($('#errorCount'+row).val());
+	var unconfirmedAmount = parseInt($('#unconfirmedAmount' + row).val());
+	var errorAmount = parseInt($('#errorAmount' + row).html(), 10);
+	var status = parseInt($('#status' + row).val(),10);
+    if(errorAmount > 0){
+		if((errorAmount-1) < errorCount && status !== 2){
+			parent.layer.msg('减少到的最小数量不能超过已有的报损数量！');
+			return;
+		}
+        $('#errorAmount' + row).html(errorAmount - 1);
+		$('#unconfirmedAmount'+row).val(unconfirmedAmount - 1)
     }
 }
 
@@ -80,57 +93,132 @@
 	  }
 }
 
+function newArray(arr){
+	var newArr = [];
+	var map = {},dest = [];
+	var newArr2 = [];
+	var map2 = {},dest2 = [];
+	for(var i = 0; i < arr.length; i++){
+		var ai = arr[i];
+		if(ai.status !== 2){
+			newArr.push(arr[i])
+		}else {
+			if(!map[ai.materialDefinitionId]){
+				dest.push(ai);
+				map[ai.materialDefinitionId] = ai;
+			}else {
+				for(var j = 0; j < dest.length; j++){
+					var dj = dest[j];
+					if(dj.materialDefinitionId == ai.materialDefinitionId){
+						var amount = parseInt(ai.amount);
+						dj.amount += amount;
+					}
+				}
+			}
+		}
+	}
+	for(var i = 0; i < newArr.length; i++){
+		var ai = newArr[i];
+		if(!map2[ai.materialDefinitionId]){
+			dest2.push(ai);
+			map2[ai.materialDefinitionId] = ai;
+		}else {
+			for(var j = 0; j < dest2.length; j++){
+				var dj = dest2[j];
+				if(dj.materialDefinitionId == ai.materialDefinitionId){
+					var amount = parseInt(ai.amount);
+					dj.amount += amount;
+				}
+			}
+		}
+	}
+	for(var i=0,k=0;i<dest.length;i++){
+		if(dest[i].amount !== 0){
+			newArr2[k] = dest[i];
+			k++
+		}
+	}
+	for(var i=0;i<dest2.length;i++){
+		for(var j=0;j<newArr2.length;j++){
+			if(dest2[i].materialDefinitionId == newArr2[j].materialDefinitionId){
+				dest2[i].unconfirmedAmount += newArr2[j].amount;
+				newArr2.splice(j,1);
+			}
+		}
+	}
+	dest2 = dest2.concat(newArr2);
+	return dest2;
+}
+
 var btSave=false;
 function submit(){
 	var isErrorExist = false;
 	var newJsonArray = new Array(); 
+	var newErrorJsonArray = [];
 	
 	var recyclingDamageJson = window.parent.getTousseItemRecyclingDamage(row);
+	var recyclingErrorJson = window.parent.getTousseItemRecyclingError(row);
 	var isErrorAmountZero = true;
 	if(recyclingDamageJson != ""){
 		newJsonArray = JSON.parse(recyclingDamageJson);
 	}
+	if(recyclingErrorJson != ""){
+		newErrorJsonArray = JSON.parse(recyclingErrorJson);
+	}
 	var length = $("#recyclingDamageTable tbody tr").length;
 	for ( var i = 0; i < length; i++) {
 		if ($('#errorAmount' + i).html() != '0') {
 			isErrorExist = true;
 			isErrorAmountZero = false;
 		}
-		var amount = parseInt($('#errorAmount' + i).html());
+		var amountSum = parseInt($('#errorAmount' + i).html());
+		var errorCount = parseInt($('#errorCount' + i).val());
 		var tousseBarcode = $('#tousseBarcode' + i).val();
 		var materialDefinitionId = $('#materialDefinitionId' + i).attr('value');
-		var materialName = $('#materialName'+i).text();
+		var materialName = $('#materialName' + i).attr('value');
+		var detailId = $('#detailId' + i).val();
+		var unconfirmedAmount = parseInt($('#unconfirmedAmount' + i).val());
 		var exist = false;
-		for(var j = 0 ;j < newJsonArray.length;j++){
-			if(newJsonArray[j].materialDefinitionId == materialDefinitionId && newJsonArray[j].tousseBarcode == tousseBarcode){
-				newJsonArray[j].amount = amount;
-				exist = true;
-				break;
+		var amountNotNull = false;
+		var newUnconfirmedAmount = 0;
+		for(var j = 0 ; j < newJsonArray.length ; j++){
+			if(newJsonArray[j].materialDefinitionId == materialDefinitionId){
+				newUnconfirmedAmount += newJsonArray[j].amount;
 			}
 		}
-		if(!exist){
-			if(amount > 0){
-				var item = {
-					detailId : "",
-	            	tousseDefinitionID: tousseDefinitionID,
-	            	materialDefinitionId: materialDefinitionId,
-	            	materialName: materialName,
-	            	tousseBarcode : tousseBarcode,
-	            	amount: amount,
-	            	errorDamageQmKey : errorDamageQmKey
-	            };
-				newJsonArray.push(item);
+		if(amountSum !== newUnconfirmedAmount){
+			var item = {
+				detailId : "",
+				tousseDefinitionID: parseInt(tousseDefinitionID),
+				materialDefinitionId: parseInt(materialDefinitionId),
+				materialName: materialName,
+				status:2,
+				tousseBarcode : tousseBarcode,
+				amount: amountSum-newUnconfirmedAmount,
+				errorDamageQmKey : errorDamageQmKey,
+				unconfirmedAmount:0
+			};
+			newJsonArray.push(item);
+		}
+	}
+	if (isErrorExist) {
+		window.parent.document.getElementById('showTousseName' + row).className = 'input-a-brown';
+		window.parent.document.getElementById('recyclingDamageButton' + row).className = 'btn-c-edit';
+	} else {
+		var sumAmount = 0;
+		if(newErrorJsonArray.length > 0){
+			for(var i=0;i<newErrorJsonArray.length;i++){
+				sumAmount += newErrorJsonArray[i].amount;
 			}
 		}
-		if (isErrorExist) {
-			window.parent.document.getElementById('showTousseName' + row).className = 'input-a-yellow';
-			window.parent.document.getElementById('recyclingDamageButton' + row).className = 'btn-c-edit';
-		} else {
+		if(sumAmount == 0){
 			window.parent.document.getElementById('showTousseName' + row).className = 'input-a';
-			window.parent.document.getElementById('recyclingDamageButton' + row).className = 'btn-c';
+		}else {
+			window.parent.document.getElementById('showTousseName' + row).className = 'input-a-yellow';
 		}
+		window.parent.document.getElementById('recyclingDamageButton' + row).className = 'btn-c';
 	}
-	if(isErrorAmountZero && $("#damageRemark").val() != ""){
+if(isErrorAmountZero && $("#damageRemark").val() != ""){
 		alert("填写了备注,请选择报损的材料!");
 		return;
 	}
@@ -236,54 +324,65 @@
     });
 }
 
-function buildTableTR(amontPerTousse,materialDefinitionId,materialName,totalCount,errorCount,tousseBarcode){
+function buildTableTR(amontPerTousse,materialDefinitionId,materialName,totalCount,errorCount,tousseBarcode,unconfirmedAmount,detailId,status){
 	var i = $("#recyclingDamageTable tbody tr").length;
 	var sourceMaterialName = materialName;
 	if(tousseBarcode != ""){
 		materialName += "<br>" + tousseBarcode;
 	}
-	var errorElement = $('<tr>' + 
+	unconfirmedAmount = parseInt(unconfirmedAmount || 0);
+	errorCount = parseInt(errorCount || 0);
+	var trColor = (errorCount + unconfirmedAmount == 0)?'':'brown';
+	var errorElement = $('<tr class="'+trColor+'">' + 
     		'<input type="hidden" id="amountPerTousse'+i+'" value="'+amontPerTousse+'"/>'+
     		'<input type="hidden" id="materialDefinitionId'+i+'" value="'+materialDefinitionId+'"/>'+
     		'<input type="hidden" id="tousseBarcode' + i + '" value="' + tousseBarcode +'"/>'+
     		'<input type="hidden" id="sourceMaterialName' + i + '" value="' + sourceMaterialName +'"/>'+
-    		'<input type="hidden" id="oldAmount'+i+'"/>'+
-    		'<td id="materialName'+i+'" class="w1" onclick="openMaterialImage(\''+materialName+'\',\''+materialDefinitionId+'\');">'+materialName+'</td>'+
+			'<input type="hidden" id="oldAmount'+i+'"/>'+
+			'<input type="hidden" id="errorCount' + i + '" value="' + errorCount +'"/>' +
+			'<input type="hidden" id="unconfirmedAmount' + i + '" value="' + unconfirmedAmount +'"/>' +
+			'<input type="hidden" id="detailId' + i + '" value="' + detailId +'"/>' +
+			'<input type="hidden" id="status' + i + '" value="' + status +'"/>' +
+			'<input type="hidden" id="materialName' + i + '" value="' + materialName +'"/>' +
+    		'<td class="w1" onclick="openMaterialImage(\''+materialName+'\',\''+materialDefinitionId+'\');">'+materialName+'</td>'+
             '<td id="totalCount'+i+'" class="w2">' + totalCount + '</td>'+
-            '<td id="errorAmount'+i+'" class="w4">'+errorCount+'</td>'+
+            '<td id="errorAmount'+i+'" class="w4">'+(errorCount+unconfirmedAmount)+'</td>'+
             '<td><a href="javascript:void(0);" class="add" id="addButton' + i + '" onclick="add('+i+');"></a><a href="javascript:void(0);" class="minus" id="reduceButton' + i + '" onclick="reduce('+i+');"></a></td>'+
           '</tr>');
     	$("#recyclingDamageTable").append(errorElement);
 }
-
 $(document).ready(function() {
 	$.ajax({
         type:'post',
         url:WWWROOT + '/disinfectSystem/recyclingRecordAction!getRecyclingErrorJson.do',
         data:{tousseDefinitionID : tousseDefinitionID,tousseAmount : tousseCount,type : 'recyclingDamage'},
         dataType:'json',
         success:function(msg){
-        	var recyclingDamageJson = window.parent.getTousseItemRecyclingDamage(row);
+			var recyclingDamageJson = window.parent.getTousseItemRecyclingDamage(row);
+			var json = [];
+			if(recyclingDamageJson != ""){
+				json = JSON.parse(recyclingDamageJson);
+				json = newArray(json);
+			}
         	for(var i = 0 ;i < msg.length ;i++){
 				//缺失数量
 				var errorCount = 0;
+				var unconfirmedAmount = 0;
 				//有丢失的器械包数量
 				var totalCount = msg[i].totalCount;
-				if (recyclingDamageJson != "") {
-					var json = JSON.parse(recyclingDamageJson);
-					for ( var j = 0; j < json.length; j++) {
-						if (msg[i].materialDefinitionId == json[j].materialDefinitionId) {
-							if(json[j].tousseBarcode != ""){
-								buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,msg[i].amontPerTousse,json[j].amount,json[j].tousseBarcode);
-								totalCount -= msg[i].amontPerTousse;
-							}else{
-								errorCount += json[j].amount;
-							}
+				for ( var j = 0; j < json.length; j++) {
+					if (msg[i].materialDefinitionId == json[j].materialDefinitionId) {
+						if(json[j].tousseBarcode != "" || json[j].status == 0){
+							buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,totalCount,json[j].amount,json[j].tousseBarcode,json[j].unconfirmedAmount,json[j].id,json[j].status);
+							totalCount = 0;
+						}else{
+							errorCount += json[j].amount;
+							unconfirmedAmount += json[j].unconfirmedAmount;
 						}
 					}
 				}
 				if(totalCount > 0){
-					buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,totalCount,errorCount,"");
+					buildTableTR(msg[i].amontPerTousse,msg[i].materialDefinitionId,msg[i].name,totalCount,errorCount,"",unconfirmedAmount,'',2);
 				}
         	}
         },