Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r26078 -r26337
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26078)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 26337)
@@ -451,6 +451,11 @@
 	});
 }
 
+/**
+ * 扫描条码(清洗篮筐条码或标识牌条码)
+ * @param tempBarcode 条码
+ * @param manualScan 扫标识牌条码时传true,篮筐条码传false
+ */
 function loadIdCardByBarcode(tempBarcode,manualScan){
     var barcode = tempBarcode;
     PackingTableManager.getIDCardInfoForPackingView(barcode,function(resultJsonStr){
@@ -515,7 +520,7 @@
 	var taskType = idCardTaskNode.get('taskType');
 	// 是否已清洗
 	if((taskType!=taskType_returnGoods) && !idCardTaskNode.get('cleaned')){
-		showResult('装配任务未清洗!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+		showResult('装配任务未清洗完成或清洗完成时间未到!' , null , sstsConfig.messagePauseTimeOnPackingPage);
 		return;
 	}
 	// 加载器械包信息