Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r33493 -r33504
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33493)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 33504)
@@ -319,7 +319,7 @@
 }
 function haveLost(record) {
 	var supplent = true;
-	var errors = record.get('errors');
+	var errors = record.data.errors;
 	for (var i = 0; i < errors.length; i++) {
 		if (errorTypeAdd != errors[i].errorType && ((errors[i].amount - errors[i].additionalAmount) != 0)) {
 			supplent = false;
@@ -331,7 +331,7 @@
 	return false;
 }
 function haveDamages(record) {
-	var damages = record.get('damages');
+	var damages = record.data.damages;
 	if (damages.length > 0) {
 		return true;
 	}
@@ -568,7 +568,7 @@
 					var taskID = node2.get('taskId');
 					if (!isUndefinedOrNullOrEmpty(taskList)) {
 						for (var i = 0; i < taskList.length; ++i) {
-							if (taskList[i].id == taskID) {
+							if ((taskList[i].taskId == taskID || taskList[i].id == taskID)) {
 								existTask = true;
 								idCardTaskNode = node2;
 								return false;
@@ -624,9 +624,10 @@
 	 */
 	function loadIdCardByBarcode(tempBarcode, manualScan, autoSetIDCardBarcodeForPacking) {
 		var barcode = tempBarcode;
-		PackingTableManager.getIDCardInfoForPackingView(barcode, function (resultJsonStr) {
+		PackingTableManager.getIDCardInfoForPackingView(barcode, taskGroup, function (resultJsonStr) {
 			var result = JSON.parse(resultJsonStr);
 			if (isUndefinedOrNullOrEmpty(result.errorMsg)) {
+				idCardTaskNode = null;
 				barcode = result.idCard.barcode;
 				var tousseName = result.idCard.tousseDefinition.name;
 				var taskList = result.idCard.packingTaskInfo;
@@ -635,20 +636,10 @@
 				if (!existTask) {
 					existTask = findIDCardPackingTask(waitPackingTaskStore, result.idCard);
 				}
-
 				if (!existTask) {
-					if (taskList.length > 0) {
-						// 后台有装配任务，前台没有，那么先刷新待装配任务列表
-						var lastOptions = waitPackingTaskStore.lastOptions;
-						lastOptions = Ext4.clone(lastOptions);
-						lastOptions.callback = function () {
-							loadIdCardByBarcode_bottomHalf(barcode, result, existTask, manualScan, autoSetIDCardBarcodeForPacking);
-						};
-						waitPackingTaskStore.reload(lastOptions);
-						waitPackingTaskStore.lastOptions.callback = null;
-						//    	    		waitPackingTaskStore.load(lastParams);
-						return;
-					}
+					existTask = taskList[0];
+				}
+				if (!existTask) {
 					showResult('不存在该标识牌对应的装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage);
 					return;
 				} else {
@@ -669,33 +660,24 @@
 		var taskList = result.idCard.packingTaskInfo;
 		var errorDamageRemark = result.idCard.errorDamageRemark || '';
 		var errorDamageRemarkId = result.idCard.errorDamageRemarkId || '';
-		if (!existTask) {
-			existTask = findIDCardPackingTask(basketStore, result.idCard);
+		if (!idCardTaskNode) {
+			idCardTaskNode = {};
+			idCardTaskNode['data'] = existTask;
 		}
-
-		// 在待装配任务里面选择标识牌的包可以装配
-		if (!existTask) {
-			existTask = findIDCardPackingTask(waitPackingTaskStore, result.idCard);
-		}
-
-		if (!existTask) {
-			showResult('不存在该标识牌对应的装配任务!', null, sstsConfig.messagePauseTimeOnPackingPage);
-			return;
-		}
-		var taskType = idCardTaskNode.get('taskType');
+		var taskType = idCardTaskNode.data.taskType;
 		// 是否已清洗
-		if ((taskType != taskType_returnGoods) && !idCardTaskNode.get('cleaned')) {
+		if ((taskType != taskType_returnGoods) && !idCardTaskNode.data.cleaned) {
 			showResult('装配任务未清洗完成或清洗完成时间未到!', null, sstsConfig.messagePauseTimeOnPackingPage);
 			return;
 		}
 		// 加载器械包信息
 		if (manualScan) {
-			var tousseName = idCardTaskNode.get('tousseName');
-			var vedioName = idCardTaskNode.get('uuid_vedioNames');
-			var td_id = idCardTaskNode.get('tousseID');
-			var taskId = idCardTaskNode.get('taskId');
-			var isTraceable = idCardTaskNode.get('isTraceable');
-			var allowModifyPackageType = idCardTaskNode.get('allowModifyPackageType');
+			var tousseName = idCardTaskNode.data.tousseName;
+			var vedioName = idCardTaskNode.data.uuid_vedioNames;
+			var td_id = idCardTaskNode.data.tousseID;
+			var taskId = idCardTaskNode.data.taskId;
+			var isTraceable = idCardTaskNode.data.isTraceable;
+			var allowModifyPackageType = idCardTaskNode.data.allowModifyPackageType;
 			if (result.idCard.tousseDefinition.needInspectMaterials) {
 				var tousseID = result.idCard.tousseDefinition.id + '+标识牌';
 				var tousseName = result.idCard.tousseDefinition.name;
@@ -710,9 +692,9 @@
 			lastSelectimageTypeTousse = imageType_tousse;
 			lastSelectVedioName = vedioName;
 			lastSelectTdId = td_id;
-			var tousseType = idCardTaskNode.get('tousseType');
-			var isPrint = idCardTaskNode.get('isPrint');
-			var isReview = idCardTaskNode.get('isReview');
+			var tousseType = idCardTaskNode.data.tousseType;
+			var isPrint = idCardTaskNode.data.isPrint;
+			var isReview = idCardTaskNode.data.isReview;
 			showPackButton(isPrint, isReview, tousseType);
 			if (allowModifyPackageType == '否') {
 				Ext4.getCmp('packageType').disable();
@@ -734,12 +716,12 @@
 		} else {
 			Ext4.getCmp('idCardBarcode').focus();
 		}
-		var sterilingType = idCardTaskNode.get("sterilingMethod");
+		var sterilingType = idCardTaskNode.data.sterilingMethod;
 		var packageType;
 		if (sstsConfig.enableIdCardDefaultPackageType) {//标识牌增加包装类型
 			packageType = result.idCard.idCardDefinition.packageType;
 		} else {
-			packageType = idCardTaskNode.get("packageType");
+			packageType = idCardTaskNode.data.packageType;
 		}
 
 		Ext4.getCmp('packageType').setValue(packageType);
@@ -3062,11 +3044,11 @@
 	}
 	function refreshErrorAndDamageMaterials(record) {
 		if (record) {
-			var isLeaf = record.get('leaf');
+			var isLeaf = record.data.leaf;
 			var errorMaterials = "";
 			var damageMaterials = "";
 			if (!isLeaf) {
-				var children = record.childNodes;
+				var children = record.data.childNodes;
 				if (!isUndefinedOrNull(children)) {
 					for (var i = 0; i < children.length; ++i) {
 						var child = children[i].data;
@@ -3081,11 +3063,11 @@
 					}
 				}
 			} else {
-				var materials = formatMaterialCount(record.get("errors"));
+				var materials = formatMaterialCount(record.data.errors);
 				if (!isUndefinedOrNullOrEmpty(materials)) {
 					errorMaterials += materials + ";";
 				}
-				materials = formatMaterialCount(record.get("damages"));
+				materials = formatMaterialCount(record.data.damages);
 				if (!isUndefinedOrNullOrEmpty(materials)) {
 					damageMaterials += materials + ";";
 				}
@@ -3101,11 +3083,11 @@
 		if (record) {
 			var errorRemark = '';
 			var damageRemark = '';
-			if (record.get("errorRemark") && record.data.errors.length > 0) {
-				errorRemark = record.get("errorRemark");
+			if (record.data.errorRemark && record.data.errors.length > 0) {
+				errorRemark = record.data.errorRemark;
 			}
-			if (record.get("damageRemark") && record.data.damages.length > 0) {
-				damageRemark = record.get("damageRemark");
+			if (record.data.damageRemark && record.data.damages.length > 0) {
+				damageRemark = record.data.damageRemark;
 			}
 			Ext4.getCmp('errorRemark').setValue(errorRemark);
 			Ext4.getCmp('damageRemark').setValue(damageRemark);
@@ -3146,7 +3128,7 @@
 
 	function refreshRecyclingItemRemark(record) {
 		if (record) {
-			var recyclingItemRemark = record.get("recyclingItemRemark");
+			var recyclingItemRemark = record.data.recyclingItemRemark;
 
 			if (!recyclingItemRemark) {
 				recyclingItemRemark = '';