Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r34503 -r34575
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34503)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 34575)
@@ -682,7 +682,7 @@
 	}
 
 	// 从树种查找标识牌的装配任务
-	function findIDCardPackingTask(store, idCard) {
+	function findIDCardPackingTask(store, idCard,type) {
 		var existTask = false;
 		var taskList = idCard.packingTaskInfo;
 		var rootNode = store.getRootNode();
@@ -694,6 +694,12 @@
 						for (var i = 0; i < taskList.length; ++i) {
 							if ((taskList[i].taskId == taskID || taskList[i].id == taskID)) {
 								existTask = true;
+								if(type == 'scan'){
+									node2.set('checked',true);
+									if(node.childNodes.length == 1){
+										node.set('checked',true);
+									}
+								}
 								idCardTaskNode = node2;
 								return false;
 							}
@@ -746,7 +752,7 @@
 	 * @param tempBarcode 条码
 	 * @param manualScan 扫标识牌条码时传true,篮筐条码传false
 	 */
-	function loadIdCardByBarcode(tempBarcode, manualScan, autoSetIDCardBarcodeForPacking) {
+	function loadIdCardByBarcode(tempBarcode, manualScan, autoSetIDCardBarcodeForPacking, type) {
 		var barcode = tempBarcode;
 		PackingTableManager.getIDCardInfoForPackingView(barcode, taskGroup, function (resultJsonStr) {
 			var result = JSON.parse(resultJsonStr);
@@ -755,7 +761,7 @@
 				barcode = result.idCard.barcode;
 				var tousseName = result.idCard.tousseDefinition.name;
 				var taskList = result.idCard.packingTaskInfo;
-				var existTask = findIDCardPackingTask(basketStore, result.idCard);
+				var existTask = findIDCardPackingTask(basketStore, result.idCard,type);
 				// 在待装配任务里面选择标识牌的包可以装配
 				if (!existTask) {
 					existTask = findIDCardPackingTask(waitPackingTaskStore, result.idCard);
@@ -2000,7 +2006,7 @@
 							if (processActionBarcode(thiz)) {
 								return;
 							}
-							loadIdCardByBarcode(thiz.getValue(), true, true);
+							loadIdCardByBarcode(thiz.getValue(), true, true, 'scan');
 							thiz.setValue();
 						}
 					}