Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r21140 -r21191
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 21140)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 21191)
@@ -425,22 +425,6 @@
 
 				WebElement frame = Utils.retryingFind(By.id("iframe_packing"));
 				Utils.driver.switchTo().frame(frame);
-				Utils.retryingFindAndSendKeys(
-						By.cssSelector("input[name='basketBarcodeInput']"),
-						Utils.settings.getJSONObject("一级供应室清洗篮筐2").getString(
-								"条码")
-								+ "\n");
-				Utils.retryingFindAndSendKeys(
-						By.cssSelector("input[name='basketBarcodeInput']"),
-						Utils.settings.getJSONObject("一级供应室清洗篮筐1").getString(
-								"条码")
-								+ "\n");
-				Utils.retryingFindAndSendKeys(
-						By.cssSelector("input[name='basketBarcodeInput']"),
-						Utils.settings.getJSONObject("一级供应室清洗篮筐3").getString(
-								"条码")
-								+ "\n");
-				editTreeGridCell("basketTreeGrid", 0, 0);
 
 				// Utils.retryingFindAndClick(By
 				// .cssSelector("img[role='presentation']"));
@@ -466,12 +450,14 @@
 				scan();
 				element = Utils.retryingFind(By
 						.cssSelector("input[name='sterilingType']"));
-				String name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
+				String name = Utils.settings.getJSONObject("灭菌程序").getString(
+						"名称1");
 				if (Utils.isFind(element)) {
 					element.click();
 					element.sendKeys(Keys.DOWN);
 					Utils.retryingFindAndClick(By
-							.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
+							.xpath("//div/ul/li[contains(text(), '" + name
+									+ "')]"));
 				}
 				Utils.retryingFindAndClick(By.id("save_print"));
 				/** 获取装配成功后的条码 **/
@@ -495,12 +481,14 @@
 					scan();
 					element = Utils.retryingFind(By
 							.cssSelector("input[name='sterilingType']"));
-					name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
+					name = Utils.settings.getJSONObject("灭菌程序")
+							.getString("名称1");
 					if (Utils.isFind(element)) {
 						element.click();
 						element.sendKeys(Keys.DOWN);
 						Utils.retryingFindAndClick(By
-								.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
+								.xpath("//div/ul/li[contains(text(), '" + name
+										+ "')]"));
 					}
 					Utils.retryingFindAndClick(By.id("save_print"));
 					/** 获取装配成功后的条码 **/
@@ -524,18 +512,48 @@
 					scan();
 					element = Utils.retryingFind(By
 							.cssSelector("input[name='sterilingType']"));
-					name = Utils.settings.getJSONObject("灭菌程序").getString("名称1");
+					name = Utils.settings.getJSONObject("灭菌程序")
+							.getString("名称1");
 					if (Utils.isFind(element)) {
 						element.click();
 						element.sendKeys(Keys.DOWN);
 						Utils.retryingFindAndClick(By
-								.xpath("//div/ul/li[contains(text(), '" + name + "')]"));
+								.xpath("//div/ul/li[contains(text(), '" + name
+										+ "')]"));
 					}
 					Utils.retryingFindAndClick(By.id("save_print"));
 					/** 获取装配成功后的条码 **/
 					Utils.barcodes = Utils.getToussesBarcodes();
 					System.out.println("本次装配条码：" + Utils.barcodes);
 					System.out.println("所有装配条码：" + Utils.reBarcodes);
+
+					Utils.switchToDefaultContent();
+					Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[name='basketBarcodeInput']"),
+							Utils.settings.getJSONObject("一级供应室清洗篮筐2")
+									.getString("条码") + "\n");
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[name='basketBarcodeInput']"),
+							Utils.settings.getJSONObject("一级供应室清洗篮筐1")
+									.getString("条码") + "\n");
+					Utils.retryingFindAndSendKeys(
+							By.cssSelector("input[name='basketBarcodeInput']"),
+							Utils.settings.getJSONObject("一级供应室清洗篮筐3")
+									.getString("条码") + "\n");
+					if (Utils
+							.isFind(Utils.retryingFind(By
+									.cssSelector("input[class=' x4-tree-checkbox x4-tree-checkbox-checked']")))) {
+						Utils.retryingFindAndClick(By
+								.id("checkAllTaskNode-inputRow"));
+						choice();
+						Utils.retryingFindAndClick(By.id("save_print"));
+						/** 获取装配成功后的条码 **/
+						Utils.barcodes = Utils.getToussesBarcodes();
+						System.out.println("本次装配条码：" + Utils.barcodes);
+						System.out.println("所有装配条码：" + Utils.reBarcodes);
+						JSWaiter.waitUntilJQueryReady();
+					}
 				}
 			} else {
 				Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));