Merge branch 'dev_test' of http://gitlab.essa.top:88/zengjin/EssaAuto into dev_test

suweicheng
2 parents d6c2eca9 d3c5a77a
Showing 6 changed files with 208 additions and 5 deletions Show diff stats
src/main/java/com/essa/pageObject/PODocumentary/ConvertTailPage.java
src/main/java/com/essa/pageObject/PODocumentary/POBoardPage.java
src/main/java/com/essa/pageObject/PODocumentary/PODocumentaryListPage.java
src/main/java/com/essa/testSuite/TestTail.java
src/main/java/swing/SwingMain.java
src/main/resources/data.xml
@@ -0,0 +1,51 @@
+package com.essa.pageObject.PODocumentary;
+
+import org.openqa.selenium.By;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
+
+import com.essa.framework.BasePage;
+
+/**
+ * 转在途尾货页面
+ * @author Administrator
+ *
+ */
+public class ConvertTailPage extends BasePage {
+
+	public ConvertTailPage(WebDriver driver) {
+		super(driver);
+	}
+	/*
+	 * 元素定位
+	 */
+	@FindBy (xpath = "//*[@name='tailDeliveryDay']")
+	WebElement tailDeliveryDay;//尾货货期
+	
+	@FindBy (xpath ="//*[@name='moveOutQuantity']")
+	WebElement moveOutQuantity;//转出箱数
+	
+	@FindBy (xpath ="//button[text()='保存']")
+	WebElement save;//保存
+	
+	@FindBy (xpath ="//button[text()='确定']")
+	WebElement confirm;//保存
+	
+	/*
+	 * 页面方法
+	 */
+	/**
+	 * 对sku转在途尾货
+	 * @return PO单看板页面
+	 */
+	public POBoardPage convertTail() {
+		dynamicWait(By.xpath("//*[@name='tailDeliveryDay']"));
+		sendKeys(tailDeliveryDay, "7");
+		sendKeys(moveOutQuantity, "2");
+		click(save);
+		dynamicWait(By.xpath("//button[text()='确定']"));
+		click(confirm);
+		return new POBoardPage(driver);
+	}
+}
 package com.essa.pageObject.PODocumentary;
+import com.essa.framework.Model;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import com.essa.framework.BasePage;
+import org.openqa.selenium.WebElement;
+import org.openqa.selenium.support.FindBy;
 public class POBoardPage extends BasePage {
 	public POBoardPage(WebDriver driver) {
 		super(driver);
 	}
+	/*
+	 * 元素定位
+	 */
+	@FindBy (xpath = "//*[text()='订单任务看板']")
+	WebElement taskBoard;//订单任务看板
+	@FindBy (xpath = "//*[@ng-model='keyword']")
+	WebElement keyword;//关键字查询输入框
+
+	@FindBy (xpath ="//*[@ng-model='keyword']/../span/button")
+	WebElement search;//查询按钮
+
+	@FindBy (xpath = "//*[@id='detailView']/div/div[3]/div[1]/div/div/table/tbody/tr[1]/td/div[2]/div[1]/input")
+	WebElement firstCheckbox;//第一个复选框
+
+	@FindBy (xpath ="//button[contains(text(),'转在途尾货')]")
+	WebElement toTail;//转在途尾货按钮
+
+	@FindBy (xpath = "//button[contains(text(),'通知收货')]")
+	WebElement noticeReceive;//通知收货按钮
+
+	@FindBy(xpath ="//button[contains(text(),'通知装柜')]")
+	WebElement noticeLoad;//通知装柜按钮
+
+	/*
+	 * 页面方法
+	 */
+	/**
+	 * 转在途尾货
+	 * @return 转在途尾货页面
+	 */
+	public ConvertTailPage toTail() {
+		dynamicLoad(By.xpath("//*[style='display: block;']"));//等待页面加载完成
+		click(taskBoard);
+		dynamicLoad(By.xpath("//*[style='display: block;']"));
+		sendKeys(keyword, Model.getSkuNo());
+		click(search);
+		dynamicLoad(By.xpath("//*[style='display: block;']"));
+		click(firstCheckbox);
+		click(toTail);
+		return new ConvertTailPage(driver);
+	}
 }
 package com.essa.pageObject.PODocumentary;
+import com.essa.framework.Model;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -21,7 +23,26 @@ public class PODocumentaryListPage extends BasePage {
 	 */
 	@FindBy (xpath = "//*[contains(text(),'高级查询')]")
 	WebElement advancedQuery;//高级查询
-	
-	@FindBy (xpath = "//*[contains(@placeholder,'请输入PO单号')]")
-	WebElement OrderNo;
+
+	@FindBy (xpath = "//*[text()='PO单号:']/../div[1]/input")
+	WebElement OrderNo;//PO单号
+
+	@FindBy (xpath = "//*[text()='查询']")
+	WebElement search;//查询按钮
+
+	@FindBy (xpath = "//*[@id='listView']/div/table/tbody/tr[1]/td/div/div[1]/div/ul/li[1]/a")
+	WebElement detail;//搜索结果中的一个查看详情
+
+	/*
+	 * 页面方法
+	 */
+	public POBoardPage todetail() {
+		mywait(detail);
+		click(advancedQuery);
+		sendKeys(OrderNo, Model.getPoNum());
+		click(search);
+		dynamicLoad(By.xpath("//*[style='display: block;']"));
+		click(detail);
+		return new POBoardPage(driver);
+	}
 }
@@ -0,0 +1,86 @@
+package com.essa.testSuite;
+
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.PageFactory;
+import org.testng.annotations.AfterClass;
+import org.testng.annotations.BeforeClass;
+import org.testng.annotations.Test;
+
+import com.essa.pageObject.BaseTest;
+import com.essa.pageObject.HomePage;
+import com.essa.pageObject.PODocumentary.ConvertTailPage;
+import com.essa.pageObject.PODocumentary.POBoardPage;
+import com.essa.pageObject.PODocumentary.PODocumentaryListPage;
+import com.essa.pageObject.StorageManage.GoodsReceiveTaskPage;
+import com.essa.pageObject.StorageManage.NoticeReceivePage;
+import com.essa.pageObject.StorageManage.ReceiveTaskDealPage;
+import com.essa.pageObject.needDealt.NeedDealtApplyPage;
+
+public class TestTail extends BaseTest {
+	WebDriver driver;
+
+	@BeforeClass
+	public void setUp() {
+		initsetUp();
+		loginValid("yuwanhang");
+	}
+	
+	@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 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 confirmSailingDate() {
+		driver = getDriver();
+		HomePage homePage = PageFactory.initElements(driver, HomePage.class);
+		NeedDealtApplyPage needDealtApplyPage = PageFactory.initElements(driver, NeedDealtApplyPage.class);
+		homePage.toSailingDateConfirmPage();
+		needDealtApplyPage.confirmSailingDate();
+	}
+}
@@ -128,7 +128,7 @@ public class SwingMain {
 		frmvBy = new JFrame("ESSA自动化测试工具v1.0.0");
 		frmvBy.getContentPane().setBackground(UIManager.getColor("Button.background"));
 		frmvBy.setTitle("ESSA自动化测试工具v1.0.1");
-		frmvBy.setIconImage(Toolkit.getDefaultToolkit().getImage(SwingMain.class.getResource("/swing/icon.png")));
+//		frmvBy.setIconImage(Toolkit.getDefaultToolkit().getImage(SwingMain.class.getResource("/swing/icon.png")));
 		frmvBy.getContentPane().setEnabled(false);
 		frmvBy.setResizable(false);
 		frmvBy.setBackground(UIManager.getColor("Button.background"));
@@ -3,7 +3,7 @@
 	<data>
 		<!-- <buyerAccount>buyer11159@essa.cn</buyerAccount> -->
 		<buyerAccount>meng18@essa.cn</buyerAccount>
-		<supplier>物料分析</supplier>
+		<supplier>ESSA</supplier>
 		<buyerNo>COK09161</buyerNo>
 	</data>
 </test>