Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java
===================================================================
diff -u -r20878 -r20998
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java	(.../Delivery.java)	(revision 20878)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Delivery.java	(.../Delivery.java)	(revision 20998)
@@ -59,34 +59,38 @@
 			Utils.driver.switchTo().defaultContent();
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
-					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
-							+ "\n");
+			if (Utils.isFind(Utils.retryingFind(By
+					.id("recyclingApplicationWin")))) {
+				Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
+						Utils.settings.getJSONObject("一级供应室用户").getString("条码")
+								+ "\n");
 
-			Utils.retryingFind(By.id("scanText")).clear();
-			String barcode = Utils.getSeleniumRuntimeData()
-					.getInsideTousseBarcode();
-			// 器械包条码
-			Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + "\n");
-			System.out.print("器械包条码:" + barcode);
-			barcode = Utils.getSeleniumRuntimeData().getDressingTousseBarcode();
-			// 敷料包条码
-			Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + "\n");
-			System.out.print("敷料包条码:" + barcode);
-			// 外来器械包条码
-			Delivery_Foreign();
-			// 器械包奇数发货
-			for (int i = 0; i < Utils.reBarcodes.size(); i++) {
-				int a = Integer.valueOf(Utils.reBarcodes.get(i)).intValue();
-				if (a % 2 != 0) {
-					Utils.retryingFindAndSendKeys(By.id("scanText"),
-							Utils.reBarcodes.get(i) + "\n");
-				}
+				Utils.retryingFind(By.id("scanText")).clear();
+				String barcode = Utils.getSeleniumRuntimeData()
+						.getInsideTousseBarcode();
+				// 器械包条码
+				Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + "\n");
+				System.out.print("器械包条码:" + barcode);
+				barcode = Utils.getSeleniumRuntimeData()
+						.getDressingTousseBarcode();
+				// 敷料包条码
+				Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + "\n");
+				System.out.print("敷料包条码:" + barcode);
+				// 外来器械包条码
+				Delivery_Foreign();
+				// 器械包奇数发货
+				for (int i = 0; i < Utils.reBarcodes.size(); i++) {
+					int a = Integer.valueOf(Utils.reBarcodes.get(i)).intValue();
+					if (a % 2 != 0) {
+						Utils.retryingFindAndSendKeys(By.id("scanText"),
+								Utils.reBarcodes.get(i) + "\n");
+					}
 
+				}
+				// 点击保存按钮
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
 			}
-			// 点击保存按钮
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
 			JSWaiter.waitUntilJQueryReady();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -205,33 +209,35 @@
 	@Test
 	public void Delivery_oneSupplyRoom() {
 		try {
+			if (Utils.isFind(Utils.retryingFind(By
+					.id("recyclingApplicationWin")))) {
+				Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
+						Utils.settings.getJSONObject("一级供应室用户").getString("条码")
+								+ "\n");
 
-			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
-					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
-							+ "\n");
+				// // 整筐发货
+				// Utils.retryingFindAndSendKeys(By.id("scanText"),
+				// Utils.settings.getJSONObject("灭菌筐02").getString("条码")
+				// + "\n");
 
-			// // 整筐发货
-			// Utils.retryingFindAndSendKeys(By.id("scanText"),
-			// Utils.settings.getJSONObject("灭菌筐02").getString("条码")
-			// + "\n");
+				Utils.retryingFind(By.id("scanText")).clear();
+				Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings
+						.getJSONObject("灭菌篮筐01").getString("条码") + "\n");
 
-			Utils.retryingFind(By.id("scanText")).clear();
-			Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings
-					.getJSONObject("灭菌篮筐01").getString("条码") + "\n");
-
-			// 一次性物品发货
-			if (CollectionUtils
-					.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
-				for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) {
-					Utils.retryingFindAndClear(By.id("scanText"));
-					Utils.retryingFindAndSendKeys(By.id("scanText"), barcode
-							+ "\n");
+				// 一次性物品发货
+				if (CollectionUtils
+						.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
+					for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) {
+						Utils.retryingFindAndClear(By.id("scanText"));
+						Utils.retryingFindAndSendKeys(By.id("scanText"),
+								barcode + "\n");
+					}
 				}
+				Delivery_FixedBarcodeDisinfection();
+				Delivery_Disinfection();
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
 			}
-			Delivery_FixedBarcodeDisinfection();
-			Delivery_Disinfection();
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
 			JSWaiter.waitUntilJQueryReady();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -250,21 +256,29 @@
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_invoicePlan"));
 			String name = Utils.settings.getJSONObject("二级供应室用户").getString(
 					"科室名称");
-			if(Utils.isFind(Utils.retryingFind(By
-					.xpath("//a[contains(text(), '" + name + "')]")))){
-			Utils.retryingFindAndClickBySeleniumAPI(By
-					.xpath("//a[contains(text(), '" + name + "')]"));
-			Utils.driver.switchTo().defaultContent();
-			String currentwindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(currentwindowhandle);
-			// 代理灭菌发货
-			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
-					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
-							+ "\n");
-			Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings
-					.getJSONObject("灭菌篮筐01").getString("条码") + "\n");
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
+			if (Utils.isFind(Utils.retryingFind(By
+					.xpath("//a[contains(text(), '" + name + "')]")))) {
+				Utils.retryingFindAndClickBySeleniumAPI(By
+						.xpath("//a[contains(text(), '" + name + "')]"));
+				Utils.driver.switchTo().defaultContent();
+				String currentwindowhandle = Utils.driver.getWindowHandle();
+				Utils.driver.switchTo().window(currentwindowhandle);
+				// 代理灭菌发货
+				if (Utils.isFind(Utils.retryingFind(By
+						.id("recyclingApplicationWin")))) {
+					Utils.retryingFindAndSendKeys(
+							By.id("senderBarcode"),
+							Utils.settings.getJSONObject("一级供应室用户").getString(
+									"条码")
+									+ "\n");
+					Utils.retryingFindAndSendKeys(
+							By.id("scanText"),
+							Utils.settings.getJSONObject("灭菌篮筐01").getString(
+									"条码")
+									+ "\n");
+					Utils.retryingFindAndClick(By
+							.xpath("//button[contains(text(), '保存')]"));
+				}
 			}
 			JSWaiter.waitUntilJQueryReady();
 		} catch (Exception e) {
@@ -279,25 +293,28 @@
 	@Test
 	public void Delivery_secondSupplyRoom() {
 		try {
-			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
-					Utils.settings.getJSONObject("二级供应室用户").getString("条码")
-							+ "\n");
-			// 整筐发货
-			Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings
-					.getJSONObject("灭菌篮筐001").getString("条码") + "\n");
-			Delivery_FixedBarcodeDisinfection();
-			Delivery_Disinfection();
-			// 一次性物品发货
-			if (CollectionUtils
-					.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
-				for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) {
-					Utils.retryingFindAndClear(By.id("scanText"));
-					Utils.retryingFindAndSendKeys(By.id("scanText"), barcode
-							+ "\n");
+			if (Utils.isFind(Utils.retryingFind(By
+					.id("recyclingApplicationWin")))) {
+				Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
+						Utils.settings.getJSONObject("二级供应室用户").getString("条码")
+								+ "\n");
+				// 整筐发货
+				Utils.retryingFindAndSendKeys(By.id("scanText"), Utils.settings
+						.getJSONObject("灭菌篮筐001").getString("条码") + "\n");
+				Delivery_FixedBarcodeDisinfection();
+				Delivery_Disinfection();
+				// 一次性物品发货
+				if (CollectionUtils
+						.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
+					for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) {
+						Utils.retryingFindAndClear(By.id("scanText"));
+						Utils.retryingFindAndSendKeys(By.id("scanText"),
+								barcode + "\n");
+					}
 				}
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
 			}
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
 			JSWaiter.waitUntilJQueryReady();
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -345,22 +362,23 @@
 			Utils.driver.switchTo().defaultContent();
 			String currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);
+			if (Utils.isFind(Utils.retryingFind(By
+					.id("recyclingApplicationWin")))) {
+				Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
+						Utils.settings.getJSONObject("一级供应室用户").getString("条码")
+								+ "\n");
 
-			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
-					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
-							+ "\n");
-
-			for (int i = 0; i < Utils.reBarcodes.size(); i++) {
-				int a = Integer.valueOf(Utils.reBarcodes.get(i)).intValue();
-				if (a % 2 == 0) {
-					Utils.retryingFindAndSendKeys(By.id("scanText"),
-							Utils.reBarcodes.get(i) + "\n");
+				for (int i = 0; i < Utils.reBarcodes.size(); i++) {
+					int a = Integer.valueOf(Utils.reBarcodes.get(i)).intValue();
+					if (a % 2 == 0) {
+						Utils.retryingFindAndSendKeys(By.id("scanText"),
+								Utils.reBarcodes.get(i) + "\n");
+					}
 				}
-			}
 
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
-
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -505,40 +523,42 @@
 				Utils.driver.switchTo().defaultContent();
 				String currentwindowhandle = Utils.driver.getWindowHandle();
 				Utils.driver.switchTo().window(currentwindowhandle);
-				Utils.retryingFindAndClick(By
-						.xpath("//button[contains(text(), '辅助发货')]"));
-				currentwindowhandle = Utils.driver.getWindowHandle();
-				Utils.driver.switchTo().window(currentwindowhandle);
-				WebElement element = Utils.retryingFind(By
-						.xpath("//button[contains(text(), '保存')]"));
+				if (Utils.isFind(Utils.retryingFind(By
+						.id("recyclingApplicationWin")))) {
+					Utils.retryingFindAndClick(By
+							.xpath("//button[contains(text(), '辅助发货')]"));
+					currentwindowhandle = Utils.driver.getWindowHandle();
+					Utils.driver.switchTo().window(currentwindowhandle);
+					WebElement element = Utils.retryingFind(By
+							.xpath("//button[contains(text(), '保存')]"));
 
-				if (Utils.isFind(element)) {
-					// 等待仓库加载
-					Utils.retryingFind(By
-							.xpath("//input[contains(@value, '测试供应室仓库')]"));
+					if (Utils.isFind(element)) {
+						// 等待仓库加载
+						Utils.retryingFind(By
+								.xpath("//input[contains(@value, '测试供应室仓库')]"));
 
-					Utils.retryingFindAndSendKeys(
-							By.id("senderBarcode"),
-							Utils.settings.getJSONObject("一级供应室用户").getString(
-									"条码")
-									+ "\n");
-					Utils.retryingFindAndSendKeys(By
-							.id("personInChargeBarcode"), Utils.settings
-							.getJSONObject("一级供应室用户").getString("条码") + "\n");
-					List<WebElement> allRows = Utils.driver
-							.findElements(By
-									.cssSelector("div[class='x-grid3-row   my_row_yellow']"));
-					for (WebElement row : allRows) {
-						row.click();
-						Utils.retryingFindAndClick(By
-								.xpath("//button[contains(text(), '添加')]"));
+						Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
+								Utils.settings.getJSONObject("一级供应室用户")
+										.getString("条码") + "\n");
+						Utils.retryingFindAndSendKeys(
+								By.id("personInChargeBarcode"),
+								Utils.settings.getJSONObject("一级供应室用户")
+										.getString("条码") + "\n");
+						List<WebElement> allRows = Utils.driver
+								.findElements(By
+										.cssSelector("div[class='x-grid3-row   my_row_yellow']"));
+						for (WebElement row : allRows) {
+							row.click();
+							Utils.retryingFindAndClick(By
+									.xpath("//button[contains(text(), '添加')]"));
 
+						}
+						Utils.retryingFindAndClick(By
+								.xpath("//button[contains(text(), '保存')]"));
+						JSWaiter.waitUntilJQueryReady();
+					} else {
+						Delivery_auxiliary();
 					}
-					Utils.retryingFindAndClick(By
-							.xpath("//button[contains(text(), '保存')]"));
-					JSWaiter.waitUntilJQueryReady();
-				} else {
-					Delivery_auxiliary();
 				}
 			}
 		} catch (Exception e) {
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
===================================================================
diff -u -r20609 -r20998
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java	(.../Consume.java)	(revision 20609)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java	(.../Consume.java)	(revision 20998)
@@ -76,9 +76,12 @@
 							.getString("名称");
 					Utils.retryingFindAndSendKeys(By.id("diposableGoodsName"),
 							name);
-
+					JSWaiter.waitUntilJQueryReady();
 					Utils.retryingFindAndSendKeys(By.id("diposableGoodsName"),
 							"\n");
+					wait.until(ExpectedConditions.attributeToBeNotEmpty(
+							Utils.driver.findElement(By.id("batchNumber1")),
+							"value"));
 					Utils.retryingFindAndSendKeys(By.id("batchNumber1"),
 							Keys.DOWN);
 					Utils.retryingFindAndClick(By