From 0b640e79807a1727c2de80bf5eb4e232e1971949 Mon Sep 17 00:00:00 2001
From: zengjin <zengjin@essa.cn>
Date: Fri, 26 Oct 2018 17:54:09 +0800
Subject: [PATCH] 修改设置装柜的返回值

---
 src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java |   4 +++-
 src/main/java/com/essa/testSuite/TestTail.java                         | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
 2 files changed, 63 insertions(+), 61 deletions(-)

diff --git a/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java b/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java
index d939f3b..f34856d 100644
--- a/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java
+++ b/src/main/java/com/essa/pageObject/StorageManage/NoticeReceivePage.java
@@ -55,7 +55,7 @@ public class NoticeReceivePage extends BasePage {
 	/**
 	 * 设置装柜仓库
 	 */
-	public void setWareHouse() {
+	public NoticeReceivePage setWareHouse() {
 		dynamicWait(By.xpath("//div[@style='display: none;' and @id='mask']"));
 		sendKeys(keyword, Model.getPoNum());
 		click(search);
@@ -69,7 +69,9 @@ public class NoticeReceivePage extends BasePage {
 		forceWait(1000);
 		click(sysch);
 		forceWait(1000);
+		isVisibility(By.xpath("//*[text()='设置成功']"));
 		click(succeed);
+		return new NoticeReceivePage(driver);
 	}
 
 }
diff --git a/src/main/java/com/essa/testSuite/TestTail.java b/src/main/java/com/essa/testSuite/TestTail.java
index eaa4515..ac830d6 100644
--- a/src/main/java/com/essa/testSuite/TestTail.java
+++ b/src/main/java/com/essa/testSuite/TestTail.java
@@ -17,70 +17,70 @@ import com.essa.pageObject.StorageManage.ReceiveTaskDealPage;
 import com.essa.pageObject.needDealt.NeedDealtApplyPage;
 
 public class TestTail extends BaseTest {
-    WebDriver driver;
+	WebDriver driver;
 
-    @BeforeClass
-    public void setUp() {
-        initsetUp();
-        loginValid("yuwanhang");
-    }
+	@BeforeClass
+	public void setUp() {
+		initsetUp();
+		loginValid("yuwanhang");
+	}
 
-    @AfterClass
-    public void tearDown() {
-        driver.quit();
-    }
+	@AfterClass
+	public void tearDown() {
+		driver.quit();
+	}
 
-    /**
-     * 转尾货
-     */
-    @Test
-    public void testTail() {
-        driver = getDriver();
-        HomePage homePage = PageFactory.initElements(driver, HomePage.class);
-        PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class);
-        POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class);
-        ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class);
-        homePage.toPoDocumentaryListPage();
-        poDocumentaryListPage.todetail();
-        poBoardPage.toTail();
-        convertTailPage.convertTail();
-    }
+	/**
+	 * 转尾货
+	 */
+	@Test
+	public void testTail() {
+		driver = getDriver();
+		HomePage homePage = PageFactory.initElements(driver, HomePage.class);
+		PODocumentaryListPage poDocumentaryListPage = PageFactory.initElements(driver, PODocumentaryListPage.class);
+		POBoardPage poBoardPage = PageFactory.initElements(driver, POBoardPage.class);
+		ConvertTailPage convertTailPage = PageFactory.initElements(driver, ConvertTailPage.class);
+		homePage.toPoDocumentaryListPage();
+		poDocumentaryListPage.todetail();
+		poBoardPage.toTail();
+		convertTailPage.convertTail();
+	}
 
-    /**
-     * 设置收货、装柜的仓库地址
-     */
-    @Test
-    public void noticReceive() {
-        driver = getDriver();
-        HomePage homePage = PageFactory.initElements(driver, HomePage.class);
-        NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class);
-        homePage.toNoticeReceivePage();
-        noticeReceivePage.setWareHouse();
-    }
+	/**
+	 * 设置收货、装柜的仓库地址
+	 */
+	@Test
+	public void noticReceive() {
+		driver = getDriver();
+		HomePage homePage = PageFactory.initElements(driver, HomePage.class);
+		NoticeReceivePage noticeReceivePage = PageFactory.initElements(driver, NoticeReceivePage.class);
+		homePage.toNoticeReceivePage();
+		noticeReceivePage.setWareHouse();
+	}
 
-    /**
-     * 收货通知处理
-     */
-    @Test
-    public void dealWithDelivery() {
-        driver = getDriver();
-        HomePage homePage = PageFactory.initElements(driver, HomePage.class);
-        GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class);
-        ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class);
-        homePage.toGoodsReceiveTaskPage();
-        goodsReceiveTaskPage.dealReceive();
-        receiveTaskDealPage.allReceive();
-    }
+	/**
+	 * 收货通知处理
+	 */
+	@Test
+	public void dealWithDelivery() {
+		driver = getDriver();
+		HomePage homePage = PageFactory.initElements(driver, HomePage.class);
+		GoodsReceiveTaskPage goodsReceiveTaskPage = PageFactory.initElements(driver, GoodsReceiveTaskPage.class);
+		ReceiveTaskDealPage receiveTaskDealPage = PageFactory.initElements(driver, ReceiveTaskDealPage.class);
+		homePage.toGoodsReceiveTaskPage();
+		goodsReceiveTaskPage.dealReceive();
+		receiveTaskDealPage.allReceive();
+	}
 
-    /**
-     * 大跟单确认船期
-     */
-    @Test
-    public void confirmSailingDate() {
-        driver = getDriver();
-        HomePage homePage = PageFactory.initElements(driver, HomePage.class);
-        NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class);
-        homePage.toSailingDateConfirmPage();
-        needDealtApplyPage.confirmSailingDate();
-    }
+	/**
+	 * 大跟单确认船期
+	 */
+	@Test
+	public void confirmSailingDate() {
+		driver = getDriver();
+		HomePage homePage = PageFactory.initElements(driver, HomePage.class);
+		NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class);
+		homePage.toSailingDateConfirmPage();
+		needDealtApplyPage.confirmSailingDate();
+	}
 }
--
libgit2 0.21.2