Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r13746 -r13807
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 13746)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 13807)
@@ -2290,85 +2290,85 @@
 									                        	myMask.hide();
 									                        	Ext4.getCmp('basketBarcodeInput').setValue('');
 									                        	var jsonObj = Ext4.JSON.decode(result.responseText);
-									                        	var pLength = jsonObj.length;
+									                        	if(!jsonObj.success){
+									                        		showResult(jsonObj.errorMessage);
+									                        		return;
+									                        	}
+									                        	var taskList = jsonObj.data;
+									                        	var nLength = taskList.length;
 									                        	var speakBasket = new SpeakBasket();
-									                        	for (var i = 0; i < pLength; i++) {
-																	var nLength  = jsonObj[i].length
-																	if(nLength == 0){
-																		showResult('该篮筐在'+taskGroup+'内无装配任务！');
+									                        	for(var n = 0;n < nLength; n++){
+									                        		var taskVO = taskList[n];
+																	var td_id = taskVO.tousseID;
+																	var videoNames = taskVO.uuid_vedioNames;
+																	var tousseName = taskVO.tousseName;
+																	var amount = taskVO.amount;
+																	var tousseType = taskVO.tousseType;
+																	var packageType = taskVO.packageType;
+																	var sterilingMethod = taskVO.sterilingMethod;
+																	var isTraceable = taskVO.isTraceable;
+																	var isPrint = taskVO.isPrint;
+																	var isReview = taskVO.isReview;
+																	var rMaterils = taskVO.replenishMaterils;
+																	var rootNode = basketStore.getRootNode();
+																	var haveIDCard = taskVO.haveIDCard;
+																	var parentNode = null;
+																	rootNode.cascade(function(n) {
+																		if(!n.get('leaf') && n.get('tousseName') == tousseName){
+																			parentNode = n;
+																		}
+																	 });
+																	var newParentNode = false;
+																	if(parentNode == null){
+																		parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','',
+																				'','',tousseType, packageType, 
+																				sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard);
+																		newParentNode = true;
 																	}
-																	for(var n = 0;n < nLength; n++){
-																		var td_id = jsonObj[i][n].tousseID;
-																		var videoNames = jsonObj[i][n].uuid_vedioNames;
-																		var tousseName = jsonObj[i][n].tousseName;
-																		var amount = jsonObj[i][n].amount;
-																		var tousseType = jsonObj[i][n].tousseType;
-																		var packageType = jsonObj[i][n].packageType;
-																		var sterilingMethod = jsonObj[i][n].sterilingMethod;
-																		var isTraceable = jsonObj[i][n].isTraceable;
-																		var isPrint = jsonObj[i][n].isPrint;
-																		var isReview = jsonObj[i][n].isReview;
-																		var rMaterils = jsonObj[i][n].replenishMaterils;
-																		var rootNode = basketStore.getRootNode();
-																		var haveIDCard = jsonObj[i][n].haveIDCard;
-																		var parentNode = null;
-																		rootNode.cascade(function(n) {
-																			if(!n.get('leaf') && n.get('tousseName') == tousseName){
-																				parentNode = n;
+																	var cLength = taskVO.children.length;
+																	for (var j = 0; j < cLength; j++) {
+																		var task = taskVO.children[j];
+																		var taskId = task.taskId;
+																		var tousseName = task.tousseName;
+																		var amount = task.amount;
+																		var washTime = task.washTime;
+																		var basketBarcode = task.basketBarcode;
+																		var basketName = task.basketName;
+																		var taskStatus = task.status;
+																		var dateTime = task.dateTime;
+																		var department = task.department;
+																		var isTraceable = task.isTraceable;
+																		var isPrint = task.isPrint;
+																		var isReview = task.isReview;
+																		var errors = task.errors;
+																		var damages = task.damages;
+																		var replenishMaterils = task.replenishMaterils;
+																		var taskType = task.taskType;
+																		var supplierName = task.supplierName;
+																		var sigle = true;
+																		var childNodes = parentNode.childNodes;
+																		speakBasket.addGoods(basketName, tousseName, amount);
+																		for (var m = 0; m < childNodes.length; m++) {
+											            					var cNode = childNodes[m];
+											            					if(cNode.get('taskId') == taskId){
+																				sigle = false;
+																				return;
 																			}
-																		 });
-																		var newParentNode = false;
-																		if(parentNode == null){
-																			parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','',
-																					'','',tousseType, packageType, 
-																					sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard);
-																			newParentNode = true;
+											            				}
+																		if(sigle){
+																			var childNode =	addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
+																					taskStatus,department,tousseType, packageType, 
+																					sterilingMethod,dateTime,isTraceable,isPrint,isReview,errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard);
+																			parentNode.appendChild(childNode);
+																			var pNewAmount = parentNode.get('amount') + amount;
+																			parentNode.set('amount',pNewAmount);
+																			parentNode.set('unPackingAmount',pNewAmount);
 																		}
-																		var cLength = jsonObj[i][n].children.length;
-																		for (var j = 0; j < cLength; j++) {
-																			var task = jsonObj[i][n].children[j];
-																			var taskId = task.taskId;
-																			var tousseName = task.tousseName;
-																			var amount = task.amount;
-																			var washTime = task.washTime;
-																			var basketBarcode = task.basketBarcode;
-																			var basketName = task.basketName;
-																			var taskStatus = task.status;
-																			var dateTime = task.dateTime;
-																			var department = task.department;
-																			var isTraceable = task.isTraceable;
-																			var isPrint = task.isPrint;
-																			var isReview = task.isReview;
-																			var errors = task.errors;
-																			var damages = task.damages;
-																			var replenishMaterils = task.replenishMaterils;
-																			var taskType = task.taskType;
-																			var supplierName = task.supplierName;
-																			var sigle = true;
-																			var childNodes = parentNode.childNodes;
-																			speakBasket.addGoods(basketName, tousseName, amount);
-																			for (var m = 0; m < childNodes.length; m++) {
-												            					var cNode = childNodes[m];
-												            					if(cNode.get('taskId') == taskId){
-																					sigle = false;
-																					return;
-																				}
-												            				}
-																			if(sigle){
-																				var childNode =	addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-																						taskStatus,department,tousseType, packageType, 
-																						sterilingMethod,dateTime,isTraceable,isPrint,isReview,errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard);
-																				parentNode.appendChild(childNode);
-																				var pNewAmount = parentNode.get('amount') + amount;
-																				parentNode.set('amount',pNewAmount);
-																				parentNode.set('unPackingAmount',pNewAmount);
-																			}
-																		}
-																		if(newParentNode){
-																			rootNode.appendChild(parentNode);
-																		}
 																	}
-									                            }
+																	if(newParentNode){
+																		rootNode.appendChild(parentNode);
+																	}
+																}
 									                        	speakBasket.speakContent();
 									                        },
 									                        failure : function(){myMask.hide();}