Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java
===================================================================
diff -u -r19482 -r20068
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java	(.../Consume.java)	(revision 19482)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Consume.java	(.../Consume.java)	(revision 20068)
@@ -58,9 +58,8 @@
 
 			Utils.retryingFindAndSendKeys(By.id("diposableGoodsName"), "\n");
 			Utils.retryingFindAndSendKeys(By.id("batchNumber1"),Keys.DOWN);
-
 			Utils.retryingFindAndClick(
-					By.xpath("//div/div[contains(text(), '20160602')]"));
+					By.xpath("//div/div[contains(text(), '20170308')]"));
 			Utils.retryingFindAndSendKeys(By.id("diposableGoodsAmount"),
 					"1" + "\n");
 			Utils.retryingFindAndSendKeys(By.id("materialCombo"),
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java
===================================================================
diff -u -r20036 -r20068
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20036)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/ALL.java	(.../ALL.java)	(revision 20068)
@@ -50,7 +50,7 @@
 	private PackingHistory ph = new PackingHistory();
 
 	private Disinfection disinfection = new Disinfection();
-
+	private Consume consume = new Consume();
 	private One_use one = new One_use();
 	private Reject reject = new Reject();
 	private UserRecord userrecord = new UserRecord();
@@ -166,6 +166,7 @@
 					.getJSONObject("二级供应室装配组").getString("名称1")));
 			/** 二级供应室装配 */
 			assemble.assemble_secondSupplyRoomSet();
+			assemble.assemble_secondSupplyRoom_QualityMonitoring();
 			login.login_Out();
 			/** 二级供应室装配后做代理灭菌 */
 			login.login_oneSupplyRoom();
@@ -410,6 +411,18 @@
 			reject.Reject_set_success_ou();
 			Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView"));
 			reject.Reject_one_use_success();
+			/*** 供应室领用 ***/
+			Utils.refresh();
+			Utils.retryingFindAndClick(By.id("enterpriseView"));
+			Utils.retryingFindAndSwitchToFrame(By.id("iframe_enterpriseView"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/span[contains(text(), '后台监控管理')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//div/a/span[contains(text(), '消毒供应中心物品领用')]"));
+			Utils.retryingFindAndClick(By
+					.xpath("//ul/li/div/a/span[contains(text(), '消毒供应中心物品领用')]"));
+			consume.Consume_success();
+			JSWaiter.waitUntilJQueryReady();
 			/*** 供应室退货 后发货 ***/
 			Utils.driver.switchTo().defaultContent();
 			Utils.retryingFindAndClick(By
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java
===================================================================
diff -u -r19941 -r20068
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java	(.../Utils.java)	(revision 19941)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/tools/Utils.java	(.../Utils.java)	(revision 20068)
@@ -1043,47 +1043,51 @@
 			// .visibilityOfElementLocated(By
 			// .xpath("//div/span[contains(text(),'满意度调查表')]")));
 			// 获取警告信息对话框的集合
+
 			By warningWindows = By
 					.cssSelector("div[class='x-tool x-tool-close']");
+			if (Utils.isFind(Utils.retryingFind(warningWindows))) {
+				List<WebElement> closeBtns = wait.until(driver -> {
+					// waitPageLoaded();
+						return driver.findElements(warningWindows);
+					});
+				int size = closeBtns.size();
+				logger.info("closeBtns.size() = " + size);
+				// 逐个关闭对话框，先关闭最外层的。如果没关闭最外层的，里面的对话框无法关闭
 
-			List<WebElement> closeBtns = wait.until(driver -> {
-				// waitPageLoaded();
-					return driver.findElements(warningWindows);
-				});
-			int size = closeBtns.size();
-			logger.info("closeBtns.size() = " + size);
-			// 逐个关闭对话框，先关闭最外层的。如果没关闭最外层的，里面的对话框无法关闭
+				for (int i = size - 1; i >= 0; i--) {
 
-			for (int i = size - 1; i >= 0; i--) {
+					// 尝试关闭对话框，关闭后判断是否真正关闭，如果没有关闭，则再次循环点击关闭按钮
+					try {
+						int count = 5;
+						for (int j = count; j > 0; j--) {
+							// closeBtns.get(i).click();
+							// 通过运行JS关闭警告框，似乎更加可靠
+							jsClick(closeBtns.get(i));
 
-				// 尝试关闭对话框，关闭后判断是否真正关闭，如果没有关闭，则再次循环点击关闭按钮
-				try {
-					int count = 5;
-					for (int j = count; j > 0; j--) {
-						// closeBtns.get(i).click();
-						// 通过运行JS关闭警告框，似乎更加可靠
-						jsClick(closeBtns.get(i));
-
-						Thread.sleep(200);
-						List<WebElement> btns = driver
-								.findElements(warningWindows);
-						if (btns != null && (btns.size() - i) >= 1) {
-							continue;
-						} else {
-							j = 0;
+							Thread.sleep(200);
+							List<WebElement> btns = driver
+									.findElements(warningWindows);
+							if (btns != null && (btns.size() - i) >= 1) {
+								continue;
+							} else {
+								j = 0;
+							}
 						}
+					} catch (Exception e) {
+						e.printStackTrace();
 					}
-				} catch (Exception e) {
-					e.printStackTrace();
+
 				}
 
+				List<WebElement> btns = driver.findElements(warningWindows);
+				if (btns != null) {
+					logger.info("after click close button, closeBtns.size() = "
+							+ btns.size());
+				}
+			} else {
+				logger.info("没有找到要关闭的按钮");
 			}
-
-			List<WebElement> btns = driver.findElements(warningWindows);
-			if (btns != null) {
-				logger.info("after click close button, closeBtns.size() = "
-						+ btns.size());
-			}
 		} catch (Exception e) {
 			e.printStackTrace();
 			Assert.fail(e.getMessage());
@@ -1121,13 +1125,13 @@
 				isNewWindowOpened = Utils.isWindowAmountEquals(2, 8000);
 				if (isNewWindowOpened) {
 					logger.info("最终打开了自定义入筐的窗口！");
-					
+
 				} else {
 					logger.info("最终没有打开自定义入筐的窗口，测试失败！");
 
 				}
 			}
-			
+
 			AssertJUnit.assertTrue(isNewWindowOpened);
 
 			// 遍历所有窗口，切换至新窗口（自定义入筐窗口）
@@ -1144,8 +1148,7 @@
 					if (isLoginOk) {
 						Assert.assertTrue(isLoginOk);
 						break;
-					}
-					else{
+					} else {
 						logger.info("自定义入筐打开的窗口路径不一致！");
 					}
 				}
Index: ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java
===================================================================
diff -u -r19983 -r20068
--- ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 19983)
+++ ssts-web/src/test/java/test/forgon/disinfectsystem/selenium/Assemble.java	(.../Assemble.java)	(revision 20068)
@@ -909,6 +909,31 @@
 	}
 
 	/**
+	 * 二级供应装配界面增加质量监测
+	 ***/
+	@Test
+	public void assemble_secondSupplyRoom_QualityMonitoring() {
+		try {
+			Utils.driver.switchTo().defaultContent();
+			Utils.retryingFindAndSwitchToFrame(By.id("iframe_packing"));
+			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']"), "装配添加质量监测");
+				Utils.retryingFindAndClick(By
+						.xpath("//button[contains(text(), '保存')]"));
+
+			}
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			AssertJUnit.fail(e.getMessage());
+		}
+	}
+
+	/**
 	 * 二级供应装配敷料
 	 ***/
 	@Test