Index: ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java
===================================================================
diff -u -r15198 -r15238
--- ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 15198)
+++ ssts-packing/src/main/java/com/forgon/disinfectsystem/packing/service/PackingManagerImpl.java	(.../PackingManagerImpl.java)	(revision 15238)
@@ -1546,6 +1546,13 @@
 					|| Container.CONTAINER_STATUS_WASHING.equals(status)) {
 				throw new RuntimeException(String.format("请扫描清洗完成的篮筐,该篮筐状态为%s!",status));
 			}
+			//验证篮筐清洗完成时间是否清洗完成
+			ClassifyBasket classifyBasket = beCleanItemManager.getLatestWashedBasketByBarcode(basketBarcode);
+			if(classifyBasket != null && classifyBasket.getWashEndTime() != null){
+				if(classifyBasket.getWashEndTime().after(new Date())){
+					throw new RuntimeException("该篮筐清洗未结束，请清洗结束后再扫描！");
+				}
+			}
 			sql += " and po.basketBarcode like '%" + basketBarcode + "%' ";
 		}
 		
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java
===================================================================
diff -u -r15219 -r15238
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15219)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/service/WashAndDisinfectRecordManagerImpl.java	(.../WashAndDisinfectRecordManagerImpl.java)	(revision 15238)
@@ -268,6 +268,8 @@
 				classifyBasket.setPersonInCharge(personInCharge);
 				classifyBasket.setPersonInChargeCode(personInChargeCode);
 				classifyBasket.setPosition(position);
+				classifyBasket.setWashStartTime(washRecord.getStartDate());
+				classifyBasket.setWashEndTime(washRecord.getEndDate());
 				classifyBaskets.add(classifyBasket);
 			}
 		}
Index: ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java
===================================================================
diff -u -r15219 -r15238
--- ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 15219)
+++ ssts-wash/src/main/java/com/forgon/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/action/WashAndDisinfectRecordAction.java	(.../WashAndDisinfectRecordAction.java)	(revision 15238)
@@ -5,7 +5,6 @@
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Calendar;
-import java.util.Date;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -50,7 +49,6 @@
 import com.forgon.tools.json.JsonPropertyFilter;
 import com.opensymphony.xwork2.ModelDriven;
 import com.opensymphony.xwork2.Preparable;
-import com.sun.corba.se.impl.orbutil.closure.Constant;
 
 /**
  * @author WangYi 2012-2-24
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java
===================================================================
diff -u -r15122 -r15238
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 15122)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/packing/PackingTask.java	(.../PackingTask.java)	(revision 15238)
@@ -2,7 +2,6 @@
 
 import java.util.Date;
 import java.util.List;
-
 import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
@@ -11,13 +10,9 @@
 import javax.persistence.ManyToOne;
 import javax.persistence.Table;
 import javax.persistence.Transient;
-
 import org.hibernate.annotations.Cache;
 import org.hibernate.annotations.CacheConcurrencyStrategy;
-
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
-import com.forgon.disinfectsystem.entity.becleanitem.ClassifiedItem;
-import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
 import com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem;
 import com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError;
 import com.forgon.tools.hibernate.ObjectDao;
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java
===================================================================
diff -u -r15219 -r15238
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java	(.../ClassifyBasket.java)	(revision 15219)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/entity/becleanitem/ClassifyBasket.java	(.../ClassifyBasket.java)	(revision 15238)
@@ -57,8 +57,18 @@
 	
 	private Date recyclingTime; // 回收时间
 	
-	private String position;	// 位置
+	/**
+	 * 最后一次清洗开始时间
+	 */
+	private Date washStartTime; 
 	
+	/**
+	 * 最后一次清洗结束时间
+	 */
+	private Date washEndTime;
+	
+	private String position;// 位置
+	
 	@JsonIgnore
 	private Set<ClassifiedItem> classfiedItems = new HashSet<ClassifiedItem>();
 	@JsonIgnore
@@ -168,5 +178,21 @@
 	public void setWashClassifyType(String washClassifyType) {
 		this.washClassifyType = washClassifyType;
 	}
+
+	public Date getWashStartTime() {
+		return washStartTime;
+	}
+
+	public void setWashStartTime(Date washStartTime) {
+		this.washStartTime = washStartTime;
+	}
+
+	public Date getWashEndTime() {
+		return washEndTime;
+	}
+
+	public void setWashEndTime(Date washEndTime) {
+		this.washEndTime = washEndTime;
+	}
 	
 }