Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r20146 -r20203
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20146)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20203)
@@ -739,65 +739,80 @@
 			Utils.retryingFindAndClick(By.linkText(Utils.settings
 					.getJSONObject("一级供应室装配组").getString("名称3")));
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
-			Utils.retryingFindAndSendKeys(
-					By.cssSelector("input[name='basketBarcodeInput']"),
-					Utils.settings.getJSONObject("一级供应室清洗篮筐4").getString("条码")
-							+ "\n");
-			JSWaiter.waitUntilJQueryReady();
-			// Actions action = new Actions(Utils.driver);
-			editTreeGridCell("basketTreeGrid", 0, 0);
-			// action.click(
-			// Utils.retryingFind(By
-			// .cssSelector("img[role='presentation']")))
-			// .perform();
-			editTreeGridCell("basketTreeGrid", 1, 3);
-			Utils.retryingFindAndClick(By.cssSelector("input[value='拆包']"));
+			if (Utils.isFind(Utils.retryingFind(By
+					.cssSelector("input[name='basketBarcodeInput']")))) {
+				Utils.retryingFindAndSendKeys(
+						By.cssSelector("input[name='basketBarcodeInput']"),
+						Utils.settings.getJSONObject("一级供应室清洗篮筐4").getString(
+								"条码")
+								+ "\n");
+				JSWaiter.waitUntilJQueryReady();
+				// Actions action = new Actions(Utils.driver);
+				editTreeGridCell("basketTreeGrid", 0, 0);
+				// action.click(
+				// Utils.retryingFind(By
+				// .cssSelector("img[role='presentation']")))
+				// .perform();
+				editTreeGridCell("basketTreeGrid", 1, 3);
+				Utils.retryingFindAndClick(By.cssSelector("input[value='拆包']"));
 
-			String currentwindowhandle = Utils.driver.getWindowHandle();
-			Utils.driver.switchTo().window(currentwindowhandle);
-			Utils.retryingFindAndClick(By
-					.cssSelector("input[name='sterilingType']"));
-			String name = Utils.settings.getJSONObject("灭菌程序").getString("名称2");
-			Utils.retryingFindAndClick(By
-					.xpath("//div/div/ul/li[contains(text(), '" + name + "')]"));
-			// 拆分第一个包
-			Utils.retryingFindAndClick(By
-					.cssSelector("tr[class='x4-grid-row  x4-grid-data-row']"));
+				String currentwindowhandle = Utils.driver.getWindowHandle();
+				Utils.driver.switchTo().window(currentwindowhandle);
+				WebElement element = Utils.retryingFind(By
+						.cssSelector("input[name='sterilingType']"));
+				String name = Utils.settings.getJSONObject("灭菌程序").getString(
+						"名称2");
+				if (Utils.isFind(element)) {
+					element.click();
+					element.sendKeys(Keys.DOWN);
+					Utils.retryingFindAndClick(By
+							.xpath("//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(), '>>>>')]"));
-			Utils.retryingFindAndClick(By
-					.xpath("//span/span/span[contains(text(), '拆分')]"));
-			// 扫描配包人条码
-			Utils.retryingFindAndSendKeys(
-					By.cssSelector("input[name='packerBarcode']"),
-					Utils.settings.getJSONObject("一级供应室配包人").getString("条码")
-							+ "\n");
+				}
+				Utils.retryingFindAndClick(By
+						.xpath("//div/div/ul/li[contains(text(), '" + name
+								+ "')]"));
+				// 拆分第一个包
+				Utils.retryingFindAndClick(By
+						.cssSelector("tr[class='x4-grid-row  x4-grid-data-row']"));
 
-			WebElement element = Utils.retryingFind(By
-					.cssSelector("input[name='reviewerBarcode']"));
-			if (Utils.isFind(element)) {
-				// 扫描审核人条码
+				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(), '>>>>')]"));
+				Utils.retryingFindAndClick(By
+						.xpath("//span/span/span[contains(text(), '拆分')]"));
+				// 扫描配包人条码
 				Utils.retryingFindAndSendKeys(
-						By.cssSelector("input[name='reviewerBarcode']"),
-						Utils.settings.getJSONObject("一级供应室审核人")
+						By.cssSelector("input[name='packerBarcode']"),
+						Utils.settings.getJSONObject("一级供应室配包人")
 								.getString("条码") + "\n");
-			}
-			// 点击装配按钮
-			Utils.retryingFindAndClick(By
-					.xpath("//span/span/span[contains(text(), '装配')]"));
 
-			// 必须加上如下的切换代码，否则获取装配的器械包的条码的javascript语句执行会报异常错误
-			Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
-			/** 获取装配成功后的条码 **/
-			Utils.barcodes = Utils.getToussesBarcodes();
-			System.out.println("本次装配条码：" + Utils.barcodes);
-			System.out.println("所有装配条码：" + Utils.reBarcodes);
+				element = Utils.retryingFind(By
+						.cssSelector("input[name='reviewerBarcode']"));
+				if (Utils.isFind(element)) {
+					// 扫描审核人条码
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[name='reviewerBarcode']"),
+							Utils.settings.getJSONObject("一级供应室审核人").getString(
+									"条码")
+									+ "\n");
+				}
+				// 点击装配按钮
+				Utils.retryingFindAndClick(By
+						.xpath("//span/span/span[contains(text(), '装配')]"));
+
+				// 必须加上如下的切换代码，否则获取装配的器械包的条码的javascript语句执行会报异常错误
+				Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
+				/** 获取装配成功后的条码 **/
+				Utils.barcodes = Utils.getToussesBarcodes();
+				System.out.println("本次装配条码：" + Utils.barcodes);
+				System.out.println("所有装配条码：" + Utils.reBarcodes);
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
@@ -920,10 +935,13 @@
 			Utils.retryingFindAndClick(By
 					.xpath("//span[contains(text(), '添加质量监测')]"));
 			Utils.retryingFindAndClick(By.id("qualityMonitoringWin"));
-			if (Utils.isFind(Utils.retryingFind(By.cssSelector("textarea[name='remark']")))) {
-				Utils.retryingFindAndClick(By.cssSelector("textarea[name='remark']"));
-				Utils.retryingFindAndSendKeys(By.cssSelector("textarea[name='remark']"), "装配添加质量监测");
+			if (Utils.isFind(Utils.retryingFind(By
+					.cssSelector("textarea[name='remark']")))) {
 				Utils.retryingFindAndClick(By
+						.cssSelector("textarea[name='remark']"));
+				Utils.retryingFindAndSendKeys(
+						By.cssSelector("textarea[name='remark']"), "装配添加质量监测");
+				Utils.retryingFindAndClick(By
 						.xpath("//button[contains(text(), '保存')]"));
 
 			}
@@ -1118,6 +1136,7 @@
 			String name = Utils.settings.getJSONObject("灭菌程序").getString("名称2");
 			if (Utils.isFind(element)) {
 				element.click();
+				element.sendKeys(Keys.DOWN);
 				Utils.retryingFindAndClick(By
 						.xpath("//div/div/ul/li[contains(text(), '" + name
 								+ "')]"));
@@ -1133,7 +1152,9 @@
 			Utils.retryingFindAndClick(By
 					.xpath("//span/span/span[contains(text(), '装配并打印标签')]"));
 			JSWaiter.waitUntilJQueryReady();
-
+			if (Utils.isFind(Utils.retryingFind(By.id("comboTousseWin")))) {
+				System.out.print("聚合包窗口未消失");
+			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());