Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r17512 -r17565
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 17512)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 17565)
@@ -234,11 +234,11 @@
     		var taskList = result.idCard.packingTaskInfo;
     		var existTask = findIDCardPackingTask(basketStore,result.idCard);
     		
-    		// 不能在待装配里面查找，必须是在已经扫了清洗篮筐的待装配任务里面查找
-//    		if(!existTask){
-//    			existTask = findIDCardPackingTask(waitPackingTaskStore,result.idCard);
-//    		}
+    		// 在待装配任务里面选择标识牌的包可以装配
     		if(!existTask){
+    			existTask = findIDCardPackingTask(waitPackingTaskStore,result.idCard);
+    		}
+    		if(!existTask){
     			showResult('不存在该标识牌对应的装配任务!');
     			return;
     		}
@@ -1681,13 +1681,28 @@
 //		return;
 //	}
 	if(haveEnabledIDCard(basketTreeSelNodes)){
+		
 		if(!sstsConfig.disableIdCard){
 			showScanIDCardBarcode();// 没有禁用标识牌功能时，才显示标识牌输入框
 		}
 	}else{
+		
 		hideScanIDCardBarcode();// 只要左边有选中的项，那么隐藏标识牌输入框
 	}
 }
+
+// 重新设置标识牌的可见状态 装配任务选择包的时候
+function resetScanIDCardBarcodeVisibilityWaitPacking(node){
+	var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
+	var waitPackingTreeSelNodes = waitPackingTree.getView().getChecked();
+	if(haveEnabledIDCard(waitPackingTreeSelNodes)){
+		if(!sstsConfig.disableIdCard){
+			showScanIDCardBarcode();// 没有禁用标识牌功能时，才显示标识牌输入框
+		}
+	}else{
+		hideScanIDCardBarcode(); // 只要左边有选中的项，那么隐藏标识牌输入框
+	}
+}
 // 设置包装类型只读
 function setPackageTypeReadOnlyByCondition(){
 	 var bRet = false;
@@ -2824,7 +2839,7 @@
                	}
         },
         checkchange:function( node, checked, eOpts ){
-        	resetScanIDCardBarcodeVisibility(node);
+        	resetScanIDCardBarcodeVisibilityWaitPacking(node);
         	setPackageTypeReadOnlyByCondition();
         },
         itemcontextmenu : taskItemMenu