Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java
===================================================================
diff -u -r20733 -r20774
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java	(.../ClassifyBasketManagerImpl.java)	(revision 20733)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManagerImpl.java	(.../ClassifyBasketManagerImpl.java)	(revision 20774)
@@ -63,7 +63,7 @@
 	 * 获取未清洗未装配的篮筐
 	 */
 	@Override
-	public ClassifyBasket getUnWashedAndUnLoadingBasket(String barcode) {
+	public ClassifyBasket getUnWashedAndUnPackingBasket(String barcode) {
 		if (StringUtils.isNotBlank(barcode)) {
 			String sql = String.format("select po,r from %s po left join po.washAndDisinfectRecords r "
 					+ "where r.id is null and po.containerBarcode = '%s' and po.id not in (select classifyBasketId from PackingRecord_ClassifyBasket where classifyBasketId is not null)", ClassifyBasket.class.getSimpleName(),
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java
===================================================================
diff -u -r20733 -r20774
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 20733)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/BeCleanItemManagerImpl.java	(.../BeCleanItemManagerImpl.java)	(revision 20774)
@@ -628,7 +628,7 @@
 		ClassifyBasket classifyBasket = null;
 		if (Container.CONTAINER_STATUS_WASHLOADING
 				.equals(container.getStatus())) {
-			classifyBasket = classifyBasketManager.getUnWashedAndUnLoadingBasket(barcode);
+			classifyBasket = classifyBasketManager.getUnWashedAndUnPackingBasket(barcode);
 			//清洗失败后篮筐状态改为清洗装载，但篮筐有关联的清洗记录
 			if(classifyBasket == null){
 				classifyBasket = getLatestWashedBasketByBarcode(barcode);
Index: ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java
===================================================================
diff -u -r20733 -r20774
--- ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java	(.../ClassifyBasketManager.java)	(revision 20733)
+++ ssts-basedata/src/main/java/com/forgon/disinfectsystem/basedata/becleanitem/service/ClassifyBasketManager.java	(.../ClassifyBasketManager.java)	(revision 20774)
@@ -17,10 +17,10 @@
 	public ClassifyBasket getUnWashedBasket(String barcode);
 	
 	/**
-	 * 获取还未清洗未装载的篮筐
+	 * 获取还未清洗未装配的篮筐
 	 * @param barcode 篮筐条码
 	 */
-	public ClassifyBasket getUnWashedAndUnLoadingBasket(String barcode);
+	public ClassifyBasket getUnWashedAndUnPackingBasket(String barcode);
 	
 	public ClassifyBasket getClassifyBasket(Long recyclingRecordId,String barcode);
 }