Index: ssts-selenium-test/src/test/java/test_4_1/Recyle.java
===================================================================
diff -u -r18103 -r18118
--- ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 18103)
+++ ssts-selenium-test/src/test/java/test_4_1/Recyle.java	(.../Recyle.java)	(revision 18118)
@@ -618,7 +618,8 @@
 	@Test
 	public void recyle_changeBasket() {
 		try {
-//			 Utils.retryingFindAndClick(By.id("addRecycleRecordBtn"));
+			Utils.waitPageLoaded();
+			//			 Utils.retryingFindAndClick(By.id("addRecycleRecordBtn"));
 			WebElement recycleForm = scanRecycleUserBarcode();
 			// 扫描科室条码
 			recycleForm.sendKeys(Utils.settings.getJSONObject("临床科室")
Index: ssts-selenium-test/src/test/java/test_4_1/Delivery.java
===================================================================
diff -u -r18095 -r18118
--- ssts-selenium-test/src/test/java/test_4_1/Delivery.java	(.../Delivery.java)	(revision 18095)
+++ ssts-selenium-test/src/test/java/test_4_1/Delivery.java	(.../Delivery.java)	(revision 18118)
@@ -85,9 +85,9 @@
 	public void Delivery_FixedBarcodeDisinfection() {
 		try {
 
-			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
-					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
-							+ "\n");
+//			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
+//					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
+//							+ "\n");
 
 			Utils.retryingFind(By.id("scanText")).clear();
 			String barcode = Utils.getSeleniumRuntimeData()
@@ -96,8 +96,8 @@
 			Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + "\n");
 			System.out.print("消毒物品条码:" + barcode);
 			// 点击保存按钮
-			Utils.retryingFindAndClick(By
-					.xpath("//button[contains(text(), '保存')]"));
+//			Utils.retryingFindAndClick(By
+//					.xpath("//button[contains(text(), '保存')]"));
 
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -201,19 +201,7 @@
 			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("一级供应室消毒物品").getString("固定条码") +
-			 * "\n");
-			 * 
-			 * Utils.retryingFind(By.id("scanText")).clear();
-			 * Utils.retryingFindAndSendKeys(By.id("scanText"),
-			 * Utils.settings.getJSONObject("一级供应室消毒物品1") .getString("固定条码") +
-			 * "\n");
-			 **/
+			
 			// 一次性物品发货
 			if (CollectionUtils
 					.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
@@ -223,6 +211,7 @@
 							+ "\n");
 				}
 			}
+			Delivery_FixedBarcodeDisinfection();
 			Delivery_Disinfection();
 			Utils.retryingFindAndClick(By
 					.xpath("//button[contains(text(), '保存')]"));
@@ -493,19 +482,17 @@
 			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");
+				}
 
-			String barcode = Utils.getSeleniumRuntimeData()
-					.getInsideTousseBarcode();
-			// 器械包条码
-			Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + "\n");
-			barcode = Utils.getSeleniumRuntimeData().getDressingTousseBarcode();
-			// 敷料包条码
-			Utils.retryingFindAndSendKeys(By.id("scanText"), barcode + "\n");
-
+			}
 			Utils.retryingFindAndClick(By
 					.xpath("//button[contains(text(), '保存')]"));
-
-			Thread.sleep(10 * 1000);
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
Index: ssts-selenium-test/src/test/java/test_4_1/ALL.java
===================================================================
diff -u -r18097 -r18118
--- ssts-selenium-test/src/test/java/test_4_1/ALL.java	(.../ALL.java)	(revision 18097)
+++ ssts-selenium-test/src/test/java/test_4_1/ALL.java	(.../ALL.java)	(revision 18118)
@@ -343,6 +343,7 @@
 			delivery.Delivery_oneSupplyRoom();
 			delivery.Delivery_auxiliary();
 			delivery.Delivery_TousseAndDressing();
+			delivery.Delivery_custom();
 			delivery.after();
 			/*** 临床登记使用记录 ***/
 			System.out.print("登记使用记录开始:");