Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r20203 -r20469
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20203)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20469)
@@ -754,60 +754,89 @@
 				// .cssSelector("img[role='presentation']")))
 				// .perform();
 				editTreeGridCell("basketTreeGrid", 1, 3);
-				Utils.retryingFindAndClick(By.cssSelector("input[value='拆包']"));
+				if (Utils.isFind(Utils.retryingFind(By
+						.cssSelector("input[value='拆包']")))) {
+					Utils.retryingFindAndClick(By
+							.cssSelector("input[value='拆包']"));
 
-				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);
+					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("//div/ul/li[contains(text(), '" + name
+							.xpath("//div/div/ul/li[contains(text(), '" + name
 									+ "')]"));
+					// 拆分第一个包
+					Utils.retryingFindAndClick(By
+							.cssSelector("tr[class='x4-grid-row  x4-grid-data-row']"));
 
-				}
-				Utils.retryingFindAndClick(By
-						.xpath("//div/div/ul/li[contains(text(), '" + name
-								+ "')]"));
-				// 拆分第一个包
-				Utils.retryingFindAndClick(By
-						.cssSelector("tr[class='x4-grid-row  x4-grid-data-row']"));
-
-				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");
-
-				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("一级供应室审核人").getString(
+							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"));
+					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);
+				}
+			}
+			else
+			{
+				String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
+				WebElement element = Utils.retryingFind(By
+						.id("sterilingType-triggerWrap"));
+				if (Utils.isFind(element)) {
+					element.click();
+					Utils.retryingFindAndClick(By
+							.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
+				}
+				name = Utils.settings.getJSONObject("包装类型").getString("名称1");
+				element = Utils.retryingFind(By.id("packageType-triggerWrap"));
+				if (element.getText().trim().equals("")) {
+					Utils.retryingFindAndClick(By.id("packageType-triggerWrap"));
+					Utils.retryingFindAndClickBySeleniumAPI(By
+							.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
+				}
+				isAlertPresent();
+				Utils.retryingFindAndClick(By.id("save_print"));
+				JSWaiter.waitUntilJQueryReady();
 				/** 获取装配成功后的条码 **/
 				Utils.barcodes = Utils.getToussesBarcodes();
 				System.out.println("本次装配条码：" + Utils.barcodes);