Index: ssts-selenium-test/src/test/java/test_4_1/Assemble.java
===================================================================
diff -u -r17886 -r17919
--- ssts-selenium-test/src/test/java/test_4_1/Assemble.java	(.../Assemble.java)	(revision 17886)
+++ ssts-selenium-test/src/test/java/test_4_1/Assemble.java	(.../Assemble.java)	(revision 17919)
@@ -1163,7 +1163,87 @@
 			AssertJUnit.fail(e.getMessage());
 		}
 	}
+	
+	/**
+	 * 装配聚合包
+	 */
+	@Test
+	public void assemble_ComboTousse() {
+		try {
+//			Utils.driver.navigate().refresh();
+			String currentwindowhandle = Utils.driver.getWindowHandle();
+//			Utils.driver.switchTo().window(currentwindowhandle);
+//
+//			Utils.tryToCloseWarningWindow();
 
+//			Actions moveover = new Actions(Utils.driver);
+//			moveover.moveToElement(Utils.retryingFind(By.id("packing")))
+//					.perform();
+//
+//			Utils.retryingFindAndClick(By.linkText(Utils.settings
+//					.getJSONObject("一级供应室装配组").getString("名称3")));
+
+//			WebElement frame = Utils.retryingFindAndSwitchToFrame(By
+//					.id("iframe_packing"));
+
+			// 点击装配聚合包
+			Utils.retryingFindAndClick(By
+					.id("packingComboTousseBtn-btnInnerEl"));
+			
+			currentwindowhandle = Utils.driver.getWindowHandle();
+			Utils.driver.switchTo().window(currentwindowhandle);
+			
+			// 输入条码
+			Utils.retryingFindAndSendKeys(
+					By.id("packerBarcode3-inputEl"),
+					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
+							+ "\n");
+			Utils.retryingFindAndSendKeys(
+					By.id("reviewerBarcode3-inputEl"),
+					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
+							+ "\n");
+			
+			// 聚合包
+			WebElement element2 = Utils.retryingFind(By.id("comboTousseName-inputEl"));
+			if (element2 != null) {
+				displayed = element2.isDisplayed();
+				if (displayed) {
+					element2.click();
+					Utils.retryingFindAndClick(By
+							.xpath("//div/ul/li[contains(text(), '" + "Test聚合包"
+									+ "')]"));
+				}
+			}
+			// 灭菌程序
+			WebElement element = Utils.retryingFind(By.id("sterilingType3-inputEl"));
+			String name = Utils.settings.getJSONObject("灭菌程序").getString("名称2");
+			if (element != null) {
+				displayed = element.isDisplayed();
+				if (displayed) {
+					element.click();
+					Utils.retryingFindAndClick(By
+							.xpath("//div/div/ul/li[contains(text(), '" + name
+									+ "')]"));
+				}
+			}
+			// 点击拆分按钮
+			Utils.retryingFindAndClick(By
+					.xpath("//span/span/span[contains(text(), '>>>>')]"));
+			// 点击确定
+			Utils.retryingFindAndClick(By
+					.xpath("//span/span/span[contains(text(), '确定')]"));
+			
+			// 点击装配按钮
+			Utils.retryingFindAndClick(By
+					.xpath("//span/span/span[contains(text(), '装配并打印标签')]"));
+
+//			Thread.sleep(10*1000);
+		} catch (Exception e) {
+			e.printStackTrace();
+			AssertJUnit.fail(e.getMessage());
+		}
+	}
+
 	@AfterMethod
 	public void after() {
 		Utils.driver.quit();