Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java
===================================================================
diff -u -r18577 -r18647
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java	(.../Review.java)	(revision 18577)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Review.java	(.../Review.java)	(revision 18647)
@@ -89,7 +89,7 @@
 
 			Utils.driver.switchTo().defaultContent();
 			Utils.waitPageLoaded();
-			Utils.doWait(1000);
+			Utils.doWait(500);
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_reviewPacking"));
 			String b = null;
 			for (int i = 0; i < 1; i++) {
@@ -114,37 +114,51 @@
 							Utils.retryingFindAndSendKeys(By.id("barcode"), b
 									+ "\n");
 							continue;
+						} else {
+							break;
 						}
-						Utils.retryingFindAndSendKeys(By.id("barcode"),
-								Utils.settings.getJSONObject("灭菌篮筐01")
-										.getString("条码") + "\n");
-						Utils.retryingFindAndClick(By
-								.xpath("//button/b[contains(text(), '审核')]"));
-						Utils.doWait(1000);
-						click = new Actions(Utils.driver);
-						element = Utils.retryingFind(By
-								.xpath("//button[contains(text(), '是')]"));
-						Utils.doWait(1000);
-						if (element != null) {
-							displayed = element.isDisplayed();
-							if (displayed) {
+					}
+					Utils.retryingFindAndSendKeys(By.id("barcode"),
+							Utils.settings.getJSONObject("灭菌篮筐01")
+									.getString("条码") + "\n");
+					click = new Actions(Utils.driver);
+					element = Utils.retryingFind(By
+							.xpath("//button[contains(text(), '是')]"));
+					Utils.doWait(500);
+					if (element != null) {
+						displayed = element.isDisplayed();
+						if (displayed) {
 
-								Utils.retryingFindAndClick(By
-										.xpath("//button[contains(text(), '是')]"));
-							}
+							Utils.retryingFindAndClick(By
+									.xpath("//button[contains(text(), '是')]"));
 						}
-						Utils.driver.switchTo().defaultContent();
+					}
+					Utils.retryingFindAndClick(By
+							.xpath("//button/b[contains(text(), '审核')]"));
+					Utils.waitPageLoaded();
+					Utils.doWait(500);
+					click = new Actions(Utils.driver);
+					element = Utils.retryingFind(By
+							.xpath("//button[contains(text(), '是')]"));
+					Utils.waitPageLoaded();
+					Utils.doWait(500);
+					if (element != null) {
+						displayed = element.isDisplayed();
+						if (displayed) {
 
-						Utils.retryingFindAndSwitchToFrame(By
-								.id("iframe_reviewPacking"));
-						Utils.doWait(1000);
-						break;
+							Utils.retryingFindAndClick(By
+									.xpath("//button[contains(text(), '是')]"));
+						}
 					}
-				} else {
+					Utils.driver.switchTo().defaultContent();
+
+					Utils.retryingFindAndSwitchToFrame(By
+							.id("iframe_reviewPacking"));
+					Utils.waitPageLoaded();
+					Utils.doWait(1000);
 					break;
-				}
-			}
-		} catch (Exception e) {
+				} }}
+		catch (Exception e) {
 			e.printStackTrace();
 			AssertJUnit.fail(e.getMessage());
 		}
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r18571 -r18647
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 18571)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 18647)
@@ -1199,11 +1199,11 @@
 					// 点击确定
 					Utils.retryingFindAndClick(By
 							.xpath("//span/span/span[contains(text(), '确定')]"));
-
+					Utils.doWait(200);
 					// 点击装配按钮
 					Utils.retryingFindAndClick(By
 							.xpath("//span/span/span[contains(text(), '装配并打印标签')]"));
-
+					Utils.doWait(200);
 					// Thread.sleep(10*1000);
 				}
 			}