Index: ssts-selenium-test/src/test/java/test_4_1/Delivery.java
===================================================================
diff -u -r18045 -r18076
--- ssts-selenium-test/src/test/java/test_4_1/Delivery.java	(.../Delivery.java)	(revision 18045)
+++ ssts-selenium-test/src/test/java/test_4_1/Delivery.java	(.../Delivery.java)	(revision 18076)
@@ -562,6 +562,58 @@
 			AssertJUnit.fail(e.getMessage());
 		}
 	}
+	
+	/**
+	 * 手术预约发货
+	 * */
+//	@Test
+//	public void Delivery_operationReservation() {
+//		try {
+//			Utils.driver.navigate().refresh();
+//			String currentwindowhandle = Utils.driver.getWindowHandle();
+//			Utils.driver.switchTo().window(currentwindowhandle);
+//			Utils.tryToCloseWarningWindow();
+//			Utils.retryingFindAndClick(By.id("enterpriseView"));
+//			WebElement frame = Utils.retryingFindAndSwitchToFrame(By
+//					.id("iframe_enterpriseView"));
+//			Utils.retryingFindAndClick(
+//					By.xpath("//div/a/span[contains(text(), '发货管理')]"));
+//			Utils.retryingFindAndClick(
+//					By.xpath("//div/a/span[contains(text(), '手术预约发货')]"));
+//
+//			frame = Utils.retryingFindAndSwitchToFrame(By.id("mainFrame"));
+//			
+//			currentwindowhandle = Utils.driver.getWindowHandle();
+//			Utils.driver.switchTo().window(currentwindowhandle);
+//			
+//			// 点第一条
+//			Utils.retryingFindAndClick(By
+//					.xpath("//div[@id='auxiliaryInvoice_sendOutGoodsDetail']//table/tbody/tr/td/div[contains(@class, 'x-grid3-col-1')]"));
+//			
+//			// 等待仓库加载
+//			Utils.retryingFindAndDoAction(By.xpath("//input[contains(@value, '测试供应室仓库')]"),Utils.ACTION_NOP);
+//			Utils.retryingFindAndSendKeys(By.id("departBarcode"),
+//					Utils.settings.getJSONObject("临床科室").getString("条码")
+//							+ "\n");
+//			Utils.retryingFindAndSendKeys(By.id("senderBarcode"),
+//					Utils.settings.getJSONObject("一级供应室用户").getString("条码")
+//							+ "\n");
+//
+//			String barcode = Utils.getSeleniumRuntimeData().getInsideTousseBarcode();
+//			// 器械包条码
+//			Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n");
+//			barcode = Utils.getSeleniumRuntimeData().getDressingTousseBarcode();
+//			// 敷料包条码
+//			Utils.retryingFindAndSendKeys(By.id("scanText"),barcode + "\n");
+//
+//			Utils.retryingFindAndClick(By.xpath("//button[contains(text(), '保存')]"));
+//			
+//			Thread.sleep(10*1000);
+//		} catch (Exception e) {
+//			e.printStackTrace();
+//			AssertJUnit.fail(e.getMessage());
+//		}
+//	}
 
 	@AfterMethod
 	public void after() {
Index: ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js
===================================================================
diff -u -r17213 -r18076
--- ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 17213)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/operationReservationInvoiceView.js	(.../operationReservationInvoiceView.js)	(revision 18076)
@@ -154,6 +154,7 @@
 	}];
 
 	grid = new Ext.ux.ForgonPageGrid( {
+		id:'operationReservationInvoiceView_grid',
 		tbar : tbar,
 		pageSize : 20,
 		defaultSortField : 'id',