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;
 	}
 	// 加载器械包信息
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
===================================================================
diff -u -r24833 -r26337
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 24833)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 26337)
@@ -23,8 +23,10 @@
 
 import com.forgon.Constants;
 import com.forgon.disinfectsystem.basedatamanager.toussedefinition.service.TousseDefinitionUtils;
+import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.materialerrordamage.MaterialErrorDamageDetail;
+import com.forgon.disinfectsystem.entity.washanddisinfectmanager.washanddisinfectrecord.WashAndDisinfectRecord;
 import com.forgon.tools.db.DatabaseUtil;
 import com.forgon.tools.hibernate.ObjectDao;
 
@@ -566,12 +568,35 @@
 		return Constants.STR_YES.equals(recycleAmountNeedConfirm);
 	}
 
+	/**
+	 * 判断该装配任务是否清洗完成
+	 * 1.if对应清洗记录的washRecord_id为空,返回false
+	 * 2.else if如果对应清洗记录的washRecord_id不为空,如果清洗记录的状态不为清洗完成则返回false
+	 * 3.else if如果对应清洗记录的清洗状态为清洗完成,科室供应室配置时,如果当前时间早于清洗完成时间,返回false
+	 * 4.else 返回true
+	 * @param objectDao
+	 * @return
+	 */
 	@Transient
-	public boolean cleaned() {
+	public boolean cleaned(ObjectDao objectDao) {
+		boolean result = false;
 		if(DatabaseUtil.isPoIdValid(washRecord_id)){
-			return true;
+			WashAndDisinfectRecord washAndDisinfectRecord = 
+					(WashAndDisinfectRecord)objectDao.getById(WashAndDisinfectRecord.class.getSimpleName(), washRecord_id);
+			if(washAndDisinfectRecord != null && washAndDisinfectRecord.washed()){
+				SupplyRoomConfig supplyRoomConfig = 
+						(SupplyRoomConfig)objectDao.getByProperty(SupplyRoomConfig.class.getSimpleName() , "supplyRoomType", SupplyRoomConfig.SUPPLYROOM_TYPE_SYSTEM_CONFIG);
+				if(supplyRoomConfig != null 
+					&& supplyRoomConfig.getIsPackingAfterWashTimeEnd()){
+					if(washAndDisinfectRecord.getEndDate() != null && new Date().after(washAndDisinfectRecord.getEndDate())){
+						result = true;
+					}
+				}else{
+					result = true;
+				}
+			}
 		}
-		return false;
+		return result;
 	}
 	
 	public static class PackingTaskNameComparator implements
Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r25960 -r26337
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 25960)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 26337)
@@ -1516,7 +1516,7 @@
 				itemVo.setDamageRemark(task.getDamageRemark());
 				itemVo.setRecyclingItemRemark(task.getRecyclingItemRemark());
 				itemVo.setUrgentLevel(task.getUrgentLevel());
-				itemVo.setCleaned(task.cleaned());
+				itemVo.setCleaned(task.cleaned(objectDao));
 				
 				if(isTimeout){
 					itemVo.setCls("itemTimeout");