Index: ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json
===================================================================
diff -u -r19507 -r19572
--- ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json	(.../settings.json)	(revision 19507)
+++ ssts-web/src/test/resources/test/forgon/disinfectsystem/selenium/config/all/settings.json	(.../settings.json)	(revision 19572)
@@ -1,5 +1,5 @@
 {
-    "seleniumBrowserApplicationName": "win10_IE11_19_server",
+    "seleniumBrowserApplicationName": "win7_IE11_thinkpad_E450C",
     "seleniumBrowserVersion": "11.0",
    "seleniumHubURL": "http://192.168.2.18:4444/wd/hub",
    "服务器地址": "http://192.168.2.18:8082/gdsy",
@@ -54,7 +54,8 @@
     },
     "一级供应室器械包3": {
         "固定条码": "",
-        "名称": "Test开胸包"
+        "名称": "Test开胸包",
+         "拼音码": "kxb"
     },
     "一级供应室自定义器械包": {
         "名称": "自定义器械包"
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r19526 -r19572
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19526)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 19572)
@@ -25,6 +25,7 @@
 import test.forgon.disinfectsystem.selenium.apply.applyConstants.DeskIconEnum;
 import test.forgon.disinfectsystem.selenium.apply.chain.ChainConsumer;
 import test.forgon.disinfectsystem.selenium.sterilization.SterilizationTest;
+import test.forgon.disinfectsystem.selenium.tools.JSWaiter;
 import test.forgon.disinfectsystem.selenium.tools.LoginUtil;
 import test.forgon.disinfectsystem.selenium.tools.Utils;
 
@@ -50,11 +51,12 @@
 	private Disinfection disinfection = new Disinfection();
 
 	private One_use one = new One_use();
-
+	private Reject reject = new Reject();
 	private UserRecord userrecord = new UserRecord();
-
+	private Delivery delivery = new Delivery();
 	private Apply apply = new Apply();
 	private Login login = new Login();
+	private Materials_Godown_Entry entry = new Materials_Godown_Entry();
 	boolean displayed = false;
 
 	// @BeforeMethod
@@ -81,14 +83,13 @@
 	 */
 	public void oneUse() {
 		try {
-			//一级供应室一次性物品入库
+			/*** 一级供应室一次性物品 ***/
 			System.out.print("一次性物品开始:");
 			Utils.DateTime();
 			one.init();
 			one.One_use_Entry_success();
 			one.after();
-			
-			//二级供应室一次性物品入库
+			// 二级供应室一次性物品入库
 			login.init();
 			login.login_secondSupplyRoom(true);
 			Utils.retryingFindAndClick(By.id("enterpriseView"));
@@ -134,6 +135,7 @@
 					.id("awaitForRecycleTable"));
 			if (Utils.isFind(element)) {
 				recyle.recyle_SecondSupplyRoom();
+
 				Utils.waitUntilUrlChange(
 						SERVER_URL
 								+ "/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp?resolution=1980",
@@ -261,7 +263,6 @@
 			/*** 材料入库报损丢失的材料 ***/
 			System.out.print("报损补充开始:");
 			Utils.DateTime();
-			Materials_Godown_Entry entry = new Materials_Godown_Entry();
 			entry.Materials_Godown_Entry_choice();
 			/*** 一级供应室装配外来器械 ***/
 			System.out.print("装配开始:");
@@ -354,11 +355,9 @@
 			disinfection.disinfection_loading();
 			// 一级供应室灭菌
 			SterilizationTest.sterilizationSeriesOperationsOfFristSupplyRoom();
-
 			/*** 一级供应室发货 ***/
 			System.out.print("发货开始:");
 			Utils.DateTime();
-			Delivery delivery = new Delivery();
 			delivery.init();
 			delivery.Delivery_oneSupplyRoom();
 			delivery.Delivery_auxiliary();
@@ -378,6 +377,13 @@
 					.xpath("//span[contains(text(), '个人桌面')]"));
 			apply.apply_borrow_return();
 			apply.after();
+			/*** 供应室退货 ***/
+			reject.init();
+			reject.Reject_set_success_ou();
+			Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView"));
+			JSWaiter.waitUntilJQueryReady();
+			reject.Reject_one_use_success();
+			reject.after();
 		} catch (Exception e) {
 			logger.error(e, e);
 			e.printStackTrace();
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java
===================================================================
diff -u -r19482 -r19572
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java	(.../Reject.java)	(revision 19482)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Reject.java	(.../Reject.java)	(revision 19572)
@@ -4,6 +4,7 @@
 import org.testng.annotations.Test;
 import org.testng.annotations.BeforeMethod;
 import org.testng.AssertJUnit;
+import org.apache.commons.collections4.CollectionUtils;
 import org.openqa.selenium.By;
 import org.openqa.selenium.Keys;
 import org.openqa.selenium.os.WindowsUtils;
@@ -61,20 +62,15 @@
 
 			Utils.retryingFindAndClick(
 					By.xpath("//div/div/div[contains(text(), '" + name + "')]"));
-			Utils.retryingFindAndSendKeys(By.id("barcode"),
-					Utils.settings.getJSONObject("一级供应室一次性物品").getString("条码1")
+			if (CollectionUtils
+					.isNotEmpty(Utils.disposableGoodsBatchBarcodesAfterEntry)) {
+				for (String barcode : Utils.disposableGoodsBatchBarcodesAfterEntry) {
+					Utils.retryingFindAndSendKeys(By.id("barcode"), barcode
 							+ "\n");
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '添加')]"));
-
-			Utils.retryingFindAndSendKeys(By.id("barcode"),
-					Utils.settings.getJSONObject("一级供应室一次性物品").getString("条码2")
-							+ "\n");
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '添加')]"));
-
-			Utils.retryingFindAndSendKeys(By.id("barcode"),
-					Utils.settings.getJSONObject("一级供应室一次性物品").getString("条码3")
-							+ "\n");
-			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '添加')]"));
+					Utils.retryingFindAndSendKeys(By.id("combo_price"), Keys.DOWN+"\n");
+					Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '添加')]"));
+				}
+			}
 			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]"));
 			currentwindowhandle = Utils.driver.getWindowHandle();
 			Utils.driver.switchTo().window(currentwindowhandle);