Index: ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java
===================================================================
diff -u -r26938 -r34100
--- ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java	(.../ContainerStatusTests.java)	(revision 26938)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/recyclingrecord/service/ContainerStatusTests.java	(.../ContainerStatusTests.java)	(revision 34100)
@@ -24,6 +24,7 @@
 import com.forgon.disinfectsystem.basedata.becleanitem.service.ClassifyBasketManager;
 import com.forgon.disinfectsystem.basedatamanager.container.service.ContainerManager;
 import com.forgon.disinfectsystem.entity.basedatamanager.container.Container;
+import com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig;
 import com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition;
 import com.forgon.disinfectsystem.entity.becleanitem.ClassifyBasket;
 import com.forgon.disinfectsystem.entity.packing.PackingTask;
@@ -193,21 +194,25 @@
 	 * 完成清洗记录
 	 */
 	private void washEnd(){
+		SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
+		final boolean releaseBasketAfterReturn = config != null && config.ftReleaseBasketAfterReturn()?true:false;
 		runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() {
 			@Override
 			public void runTask() {
-				washAndDisinfectRecordManager.washConfirm(washRecordId.toString(), WashAndDisinfectRecord.STATUS_WASHED);
+				washAndDisinfectRecordManager.washConfirm(washRecordId.toString(), WashAndDisinfectRecord.STATUS_WASHED, releaseBasketAfterReturn);
 			}
 		});
 	}
 	/**
 	 * 清洗失败
 	 */
 	private void washFailed(){
+		SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
+		final boolean releaseBasketAfterReturn = config != null && config.ftReleaseBasketAfterReturn()?true:false;
 		runWithTransNewManager.runWith_TRANS_NEW(new RunWithTransNewTask() {
 			@Override
 			public void runTask() {
-				washAndDisinfectRecordManager.washConfirm(washRecordId.toString(), WashAndDisinfectRecord.STATUS_WASHFAILD);
+				washAndDisinfectRecordManager.washConfirm(washRecordId.toString(), WashAndDisinfectRecord.STATUS_WASHFAILD,releaseBasketAfterReturn);
 			}
 		});
 	}