Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r19915 -r19983
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 19915)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 19983)
@@ -35,15 +35,15 @@
 			Utils.init();
 			Login login = new Login();
 			login.login_oneSupplyRoom();
-//			 login.login_secondSupplyRoom();
+			// login.login_secondSupplyRoom();
 
 			Utils.retryingFindAndHover(By.id("packing"));
 
 			Utils.retryingFindAndClick(By.linkText(Utils.settings
 					.getJSONObject("一级供应室装配组").getString("名称2")));
 			// Utils.retryingFindAndClick(By.linkText(Utils.settings
 			// .getJSONObject("一级供应室装配组").getString("名称3")));
-//			 Utils.retryingFindAndClick(By.linkText(Utils.settings.getJSONObject("二级供应室装配组").getString("名称1")));
+			// Utils.retryingFindAndClick(By.linkText(Utils.settings.getJSONObject("二级供应室装配组").getString("名称1")));
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
 
 		} catch (Exception e) {
@@ -93,7 +93,8 @@
 
 			editTreeGridCell("basketTreeGrid", 0, 2);
 
-			WebElement element = Utils.retryingFind(By.cssSelector("input[name='sterilingType']"));
+			WebElement element = Utils.retryingFind(By
+					.cssSelector("input[name='sterilingType']"));
 			String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
 			if (Utils.isFind(element)) {
 				element.click();
@@ -261,7 +262,8 @@
 			//
 			String name = null;
 			scan();
-			WebElement element = Utils.retryingFind(By.cssSelector("input[name='sterilingType']"));
+			WebElement element = Utils.retryingFind(By
+					.cssSelector("input[name='sterilingType']"));
 			if (Utils.isFind(element)) {
 				String name1 = Utils.settings.getJSONObject("灭菌程序").getString(
 						"名称1");
@@ -495,7 +497,8 @@
 				Utils.retryingFindAndSendKeys(
 						By.id("scanIdCardBarcode-inputEl"), signNum + "\n");
 				scan();
-				element = Utils.retryingFind(By.cssSelector("input[name='sterilingType']"));
+				element = Utils.retryingFind(By
+						.cssSelector("input[name='sterilingType']"));
 				String name = Utils.settings.getJSONObject("灭菌程序").getString(
 						"名称1");
 				if (Utils.isFind(element)) {
@@ -960,23 +963,18 @@
 			Utils.retryingFindAndSendKeys(By.id("tousseName"), Keys.DOWN);
 			String name = Utils.settings.getJSONObject("一级供应室器械包2").getString(
 					"名称");
-
-			Utils.retryingFindAndClick(By
-					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
-			name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
-			Utils.retryingFind(By.id("packAmount")).clear();
-			Utils.retryingFindAndSendKeys(By.id("packAmount"), "2" + "\n");
-			WebElement element = Utils.retryingFind(By.id("sterilingType1"));
-			if (Utils.isFind(element)) {
-				element.click();
-				Utils.retryingFindAndClick(By
-						.xpath("//div/div/div[contains(text(), '" + name
-								+ "')]"));
+			custom(name);
+			if (Utils.isFind(Utils.retryingFind(By.id("tousseName")))) {
+				Utils.retryingFindAndSendKeys(By.id("tousseName"), Keys.DOWN);
+				name = Utils.settings.getJSONObject("一级供应室敷料包").getString("名称");
+				custom(name);
 			}
-
-			Utils.retryingFindAndClick(By
-					.xpath("//tbody/tr/td/em/button[contains(text(), '装配并打印标签')]"));
-			JSWaiter.waitUntilJQueryReady();
+			if (Utils.isFind(Utils.retryingFind(By.id("tousseName")))) {
+				Utils.retryingFindAndSendKeys(By.id("tousseName"), Keys.DOWN);
+				name = Utils.settings.getJSONObject("一级供应室消毒物品")
+						.getString("名称");
+				custom(name);
+			}
 			/** 获取装配成功后的条码 **/
 			// for (int i = 0; i < 3; i++) {
 			// Utils.barcodes = Utils.getToussesBarcodes();
@@ -1216,4 +1214,22 @@
 			AssertJUnit.fail(e.getMessage());
 		}
 	}
+
+	public void custom(String name) {
+		Utils.retryingFindAndClick(By.xpath("//div/div/div[contains(text(), '"
+				+ name + "')]"));
+		name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
+		Utils.retryingFind(By.id("packAmount")).clear();
+		Utils.retryingFindAndSendKeys(By.id("packAmount"), "2" + "\n");
+		WebElement element = Utils.retryingFind(By.id("sterilingType1"));
+		if (Utils.isFind(element)) {
+			element.click();
+			Utils.retryingFindAndClick(By
+					.xpath("//div/div/div[contains(text(), '" + name + "')]"));
+		}
+
+		Utils.retryingFindAndClick(By
+				.xpath("//tbody/tr/td/em/button[contains(text(), '装配并打印标签')]"));
+		JSWaiter.waitUntilJQueryReady();
+	}
 }