From 71af73f2a6f9ef450c84d768abbdddda5aaab57f Mon Sep 17 00:00:00 2001 From: 78@qq.com <78@qq.com> Date: Thu, 1 Nov 2018 18:05:58 +0800 Subject: [PATCH] lana update --- src/main/java/com/essa/pageObject/HomePage.java | 25 +++++++++++++++++++++++-- src/main/java/com/essa/testSuite/TestConfirmCabinet.java | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java | 14 ++++++++++++++ src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java | 86 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 252 insertions(+), 2 deletions(-) create mode 100644 src/main/java/com/essa/testSuite/TestConfirmCabinet.java create mode 100644 src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java create mode 100644 src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java create mode 100644 src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java diff --git a/src/main/java/com/essa/pageObject/HomePage.java b/src/main/java/com/essa/pageObject/HomePage.java index ccef8b3..4557e0e 100644 --- a/src/main/java/com/essa/pageObject/HomePage.java +++ b/src/main/java/com/essa/pageObject/HomePage.java @@ -23,8 +23,9 @@ import com.essa.pageObject.buyerManage.InvateCodePage; import com.essa.pageObject.inquiryManage.ProductInquiryTaskPage; import com.essa.pageObject.marketingManage.GroupControlPage; import com.essa.pageObject.marketingManage.GroupSettingPage; -import com.essa.pageObject.needDealt.NeedDealtApplyPage; - +import com.essa.pageObject.needDealt.NeedDealtApplyPage; +import pageObiect.CabinetTask.CabineTaskManagemenPage; + /** * @author Administrator *bpms后台首页 @@ -203,6 +204,16 @@ public class HomePage extends BasePage{ @FindBy (xpath = "//*[@id='essa-left-menu']/div/dl[1]/dd[2]") WebElement skippBoard; + //装柜通知（lana） + @FindBy (xpath = "//a[@name='child.text'][contains(text(),'装柜通知')]") + WebElement CabinetsNotice; + + //装柜务务管理（lana） + @FindBy (xpath = "//a[contains(text(),'装柜任务管理')]") + WebElement CabineTaskManagemen; + + + /* * 方法 @@ -548,4 +559,14 @@ public class HomePage extends BasePage{ return new LogisticsShippPage(driver); } + /** + * 进入装柜任务管理 + * @return装柜任务管理 + */ + public CabineTaskManagemenPage toCabineTaskManagemenPage() { + click(StorageManage); + click(CabineTaskManagemen); + return new CabineTaskManagemenPage(driver); + } + } \ No newline at end of file diff --git a/src/main/java/com/essa/testSuite/TestConfirmCabinet.java b/src/main/java/com/essa/testSuite/TestConfirmCabinet.java new file mode 100644 index 0000000..00a44e6 --- /dev/null +++ b/src/main/java/com/essa/testSuite/TestConfirmCabinet.java @@ -0,0 +1,62 @@ +package com.essa.testSuite; + +/** + * Created by Administrator on 2018/10/26 0026. + */ + +import com.essa.pageObject.BaseTest; +import com.essa.pageObject.HomePage; +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 pageObiect.CabinetTask.CabineTaskManagemenPage; +import pageObiect.CabinetTask.HandlingLoadingOrders; + +import java.io.IOException; + +/** +* @author lana +* 测试用例：装柜确认操作 +**/ +public class TestConfirmCabinet extends BaseTest { + WebDriver driver; + + @BeforeClass + public void setUp() throws IOException { + initsetUp(); + loginValid("chenyijie"); + } + +// @AfterClass +// public void tearDown() { +// driver.quit(); +// } + + /** + * 查到存在有装柜任务,进入处理页面 + */ + @Test(description="根据PO单号，确认装柜") + public void ConfirmCabinet(){ + driver = getDriver(); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + homePage.toCabineTaskManagemenPage(); + CabineTaskManagemenPage searchCabineTaskManagemenPage = PageFactory.initElements(driver, CabineTaskManagemenPage.class); + searchCabineTaskManagemenPage.setWareHouse(); + HandlingLoadingOrders handlingLoadingOrders = PageFactory.initElements(driver, HandlingLoadingOrders.class); + handlingLoadingOrders.setHandlingCabinet(); + } + + /** + * 进入处理页面(默认单号可以装柜) + */ +// @Test(description="进入装柜操作页面,进行操作") +// public void handlingLoadingOrders(){ +// driver = getDriver(); +// //已进入处理页面 +// +// } + +} + diff --git a/src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java b/src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java new file mode 100644 index 0000000..2d92864 --- /dev/null +++ b/src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java @@ -0,0 +1,67 @@ +package pageObiect.CabinetTask; + +import com.essa.framework.BasePage; +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; + +/** + * Created by lana on 2018/10/26 0026. + * 装柜任务管理页 + */ +public class CabineTaskManagemenPage extends BasePage{ + + public CabineTaskManagemenPage(WebDriver driver) { + super(driver); + } + + /* + * 元素定位 + */ + + @FindBy(xpath = "//input[@name='selectKey']") + WebElement selectKey;//关键字查询 + + @FindBy (xpath = "//button[contains(@ng-click,'search')]") + WebElement search;//查询按钮 + + @FindBy(xpath ="//button[contains(@ng-click,'goCompleteTask')]" ) + WebElement handle;//处理按钮 + + @FindBy(xpath ="//tbody/tr[1]") + WebElement firstTr;//定位第一行 + + @FindBy (xpath = "//button[contains(text(),'处理')]") + WebElement deal;//处理 + + /* + * 页面参数 + * */ + String poNo=""; + + /* + * 页面方法 + */ + + /** + * 设置装柜处理查询 + */ + public CabineTaskManagemenPage setWareHouse() { + dynamicLoad(By.xpath("//div[@style='display: none;' and @id='mask']")); + if(Model.getPoNum()!=""|| Model.getPoNum()!=null){ + poNo="B180828T9165"; + sendKeys(selectKey, poNo); + }else{ + sendKeys(selectKey, Model.getPoNum()); + } + click(search); + forceWait(1000); + click(firstTr); + click(deal); + return new CabineTaskManagemenPage(driver); + + } + +} diff --git a/src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java b/src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java new file mode 100644 index 0000000..6af29f7 --- /dev/null +++ b/src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java @@ -0,0 +1,14 @@ +package pageObiect.CabinetTask; + +import com.essa.framework.BasePage; +import org.openqa.selenium.WebDriver; + +/** + * Created by Administrator on 2018/10/26 0026. + */ +public class CabinetsNoticePage extends BasePage{ + + public CabinetsNoticePage(WebDriver driver) { + super(driver); + } +} diff --git a/src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java b/src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java new file mode 100644 index 0000000..1ed8e39 --- /dev/null +++ b/src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java @@ -0,0 +1,86 @@ +package pageObiect.CabinetTask; + +import com.essa.framework.BasePage; +import org.openqa.selenium.By; +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; +import org.openqa.selenium.support.FindBy; + +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; + +import static jdk.nashorn.internal.objects.Global.print; + +import com.essa.framework.BasePage; +import com.essa.framework.LogType; +import com.essa.framework.Logger; + + +/** + * Created by Administrator on 2018/10/30 0030. + */ +public class HandlingLoadingOrders extends BasePage { + public HandlingLoadingOrders(WebDriver driver) { + super(driver); + } + + WebDriver webDriver; + /* + * 元素定位 + */ + + //实际装柜日期 + @FindBy(xpath = "//input[@id='loadCompleteDate']") + WebElement loadCompleteDate; + + //获取装柜商品列表 + //@FindBy(xpath ="//td[@ng-repeat='item in taskInfo.skuList']") + //WebElement tdList; + @FindBy(xpath = "//tbody[2]/tr[1]/td[6]") + WebElement firstTr;//定位第一行 + +// //获取元素列表循环读取值 +// public ArrayList getTrtd() { +// String trs=testtrList.getText(); +// +// WebElement temp; +// for (int kk=0;kk<0;kk++){ +// temp= driver.findElement(By.xpath("//tbody[2]/tr["+kk+"]/td[6]")); +// temp.getText(); +// +// } + +// ArrayList arryList = new ArrayList(); +// //arryList.set(0,trs); +// System.out.print(trs+"123456789---------"); +// return arryList; +// } + + //输入实装箱数 + @FindBy(xpath = "//input[@id='actLoadBoxQuantity']") + WebElement realNumber; + + //提交 + @FindBy(xpath = "//*[text()='提交']") + WebElement submit; + + /** + * 设置装柜处理参数 + */ + public HandlingLoadingOrders setHandlingCabinet() { + dynamicLoad(By.xpath("//div[@style='display: none;' and @id='mask']")); + //设置实际装柜日期 + jsExecutorRemoveAttribute(loadCompleteDate, "readonly"); + loadCompleteDate.click(); + forceWait(500); + SimpleDateFormat zs=new SimpleDateFormat("MM/dd/yyyy"); + String s =zs.format(new Date()); + sendKeys(loadCompleteDate,s); + click(submit); + return new HandlingLoadingOrders(driver); + } + + +} -- libgit2 0.21.2