From 81a4681fe8395d0b3aff70511f19ea94c81f7c15 Mon Sep 17 00:00:00 2001 From: zengjin Date: Fri, 2 Nov 2018 16:31:39 +0800 Subject: [PATCH] 修改时间工具，还有船务相关 --- src/main/java/com/essa/framework/Model.java | 2 +- src/main/java/com/essa/pageObject/HomePage.java | 11 +++++++++-- src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java | 2 +- src/main/java/com/essa/pageObject/StorageManage/CabineTaskManagemenPage.java | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ src/main/java/com/essa/testSuite/TestConfirmCabinet.java | 21 ++++++--------------- src/main/java/com/essa/testSuite/TestLoadContainer.java | 101 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java | 67 ------------------------------------------------------------------- src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java | 14 -------------- src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java | 86 -------------------------------------------------------------------------------------- src/main/resources/suites/LoadContainer.xml | 16 +++++++++------- 11 files changed, 269 insertions(+), 201 deletions(-) create mode 100644 src/main/java/com/essa/pageObject/StorageManage/CabineTaskManagemenPage.java create mode 100644 src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java delete mode 100644 src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java delete mode 100644 src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java delete mode 100644 src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java diff --git a/src/main/java/com/essa/framework/Model.java b/src/main/java/com/essa/framework/Model.java index bcf8b32..1251c93 100644 --- a/src/main/java/com/essa/framework/Model.java +++ b/src/main/java/com/essa/framework/Model.java @@ -15,7 +15,7 @@ public class Model { public static String env;//所选环境 public static String buyerAccount;//采购商账号 public static String buyerPassword;//采购商密码 - public static String poNum = "DK180126T0278";//po单号 + public static String poNum = "A181117T9194B";//po单号 public static int isactivity=0;//是否是活动商品 1：是 0：否 public static String manager;//商品的类目经理 public static String serialNum;//待办流水号 diff --git a/src/main/java/com/essa/pageObject/HomePage.java b/src/main/java/com/essa/pageObject/HomePage.java index b54f5fe..8b6fe56 100644 --- a/src/main/java/com/essa/pageObject/HomePage.java +++ b/src/main/java/com/essa/pageObject/HomePage.java @@ -1,7 +1,6 @@ package com.essa.pageObject; import com.essa.pageObject.DocumentaryManage.BillingCenterPage; -import com.essa.pageObject.DocumentaryManage.POBoardPage; import com.essa.pageObject.DocumentaryManage.ReceiptCorePage; import com.essa.pageObject.GoodsManage.*; import com.essa.pageObject.LogisticShipp.LogisticsShippPage; @@ -24,7 +23,7 @@ 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 pageObiect.CabinetTask.CabineTaskManagemenPage; +import com.essa.pageObject.StorageManage.CabineTaskManagemenPage; /** * @author Administrator @@ -580,5 +579,13 @@ public class HomePage extends BasePage{ click(CabineTaskManagemen); return new CabineTaskManagemenPage(driver); } + /** + *对浏览器弹框处理 + * @param + * @return + */ + public void dealAlert(boolean isAccept){ + alert(isAccept); + } } \ No newline at end of file diff --git a/src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java b/src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java index 61998d5..d8b73ea 100644 --- a/src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java +++ b/src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java @@ -56,7 +56,7 @@ public class SendCarPage extends BasePage { forceWait(500); QueryWaitForBooking.sendKeys(Model.getPoNum()); click(QueryWaitForBookingCarBtn); - mywait(FristWaitForBookingCarDate); + forceWait(1000); click(FristWaitForBookingCarDate); click(ConfirmBookingCar); mywait(SetContainerNo); diff --git a/src/main/java/com/essa/pageObject/StorageManage/CabineTaskManagemenPage.java b/src/main/java/com/essa/pageObject/StorageManage/CabineTaskManagemenPage.java new file mode 100644 index 0000000..65a7e1f --- /dev/null +++ b/src/main/java/com/essa/pageObject/StorageManage/CabineTaskManagemenPage.java @@ -0,0 +1,68 @@ +package com.essa.pageObject.StorageManage; + +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()); +// } + sendKeys(selectKey, Model.getPoNum()); + click(search); + forceWait(1000); + click(firstTr); + click(deal); + return new CabineTaskManagemenPage(driver); + + } + +} diff --git a/src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java b/src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java new file mode 100644 index 0000000..8c9e74d --- /dev/null +++ b/src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java @@ -0,0 +1,82 @@ +package com.essa.pageObject.StorageManage; + +import com.essa.framework.BasePage; +import com.essa.framework.Tools; +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.Date; + + +/** + * 装柜任务处理页面 + * 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); + sendKeys(loadCompleteDate, Tools.getToday()); + click(submit); + dynamicLoad(); + return new HandlingLoadingOrders(driver); + } + + +} diff --git a/src/main/java/com/essa/testSuite/TestConfirmCabinet.java b/src/main/java/com/essa/testSuite/TestConfirmCabinet.java index 00a44e6..336a3cd 100644 --- a/src/main/java/com/essa/testSuite/TestConfirmCabinet.java +++ b/src/main/java/com/essa/testSuite/TestConfirmCabinet.java @@ -11,8 +11,8 @@ 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 com.essa.pageObject.StorageManage.CabineTaskManagemenPage; +import com.essa.pageObject.StorageManage.HandlingLoadingOrders; import java.io.IOException; @@ -29,10 +29,10 @@ public class TestConfirmCabinet extends BaseTest { loginValid("chenyijie"); } -// @AfterClass -// public void tearDown() { -// driver.quit(); -// } + @AfterClass + public void tearDown() { + driver.quit(); + } /** * 查到存在有装柜任务,进入处理页面 @@ -48,15 +48,6 @@ public class TestConfirmCabinet extends BaseTest { handlingLoadingOrders.setHandlingCabinet(); } - /** - * 进入处理页面(默认单号可以装柜) - */ -// @Test(description="进入装柜操作页面,进行操作") -// public void handlingLoadingOrders(){ -// driver = getDriver(); -// //已进入处理页面 -// -// } } diff --git a/src/main/java/com/essa/testSuite/TestLoadContainer.java b/src/main/java/com/essa/testSuite/TestLoadContainer.java index 823eeb5..408e268 100644 --- a/src/main/java/com/essa/testSuite/TestLoadContainer.java +++ b/src/main/java/com/essa/testSuite/TestLoadContainer.java @@ -1,15 +1,21 @@ package com.essa.testSuite; +import com.essa.framework.Model; import com.essa.pageObject.BaseTest; import com.essa.pageObject.DocumentaryManage.BillingCenterPage; import com.essa.pageObject.DocumentaryManage.ConvertTailPage; import com.essa.pageObject.DocumentaryManage.POBoardPage; import com.essa.pageObject.DocumentaryManage.PODocumentaryListPage; import com.essa.pageObject.HomePage; -import com.essa.pageObject.StorageManage.GoodsReceiveTaskPage; -import com.essa.pageObject.StorageManage.NoticeReceivePage; -import com.essa.pageObject.StorageManage.ReceiveTaskDealPage; +import com.essa.pageObject.LogisticShipp.BookingCarPage; +import com.essa.pageObject.LogisticShipp.CabinInfoPage; +import com.essa.pageObject.LogisticShipp.LogisticsShippPage; +import com.essa.pageObject.LogisticShipp.SendCarPage; +import com.essa.pageObject.StorageManage.*; +import com.essa.pageObject.needDealt.LargeDcofdPage; import com.essa.pageObject.needDealt.NeedDealtApplyPage; +import com.essa.pageObject.needDealt.RegisOptShpDatePage; +import com.essa.pageObject.needDealt.SellerFillInfoPage; import org.openqa.selenium.WebDriver; import org.openqa.selenium.support.PageFactory; import org.testng.annotations.AfterClass; @@ -35,7 +41,7 @@ public class TestLoadContainer extends BaseTest { /** * 转尾货 */ - @Test + @Test(description = "转在途尾货") public void toTail() { driver = getDriver(); loginValid("chenyijie"); @@ -52,7 +58,7 @@ public class TestLoadContainer extends BaseTest { /** * 设置收货、装柜的仓库地址 */ - @Test + @Test(description = "设置收货、装柜的仓库地址") public void noticReceive() { driver = getDriver(); HomePage homePage = PageFactory.initElements(driver, HomePage.class); @@ -93,7 +99,7 @@ public class TestLoadContainer extends BaseTest { /** * 收货任务管理，处理 */ - @Test + @Test (description = "收货任务处理") public void dealWithDelivery() { driver = getDriver(); HomePage homePage = PageFactory.initElements(driver, HomePage.class); @@ -104,12 +110,16 @@ public class TestLoadContainer extends BaseTest { goodsReceiveTaskPage.dealReceive(); receiveTaskDealPage.allReceive(); }while (!(goodsReceiveTaskPage.isFinish())); + + homePage.getHome(); + homePage.dealAlert(true);//确认弹框：离开 + homePage.logout(); } /** * 大跟单确认船期 */ - @Test + @Test (description = "大跟单确认船期") public void confirmSailingDate() { driver = getDriver(); loginValid("yuwanhang"); @@ -123,7 +133,7 @@ public class TestLoadContainer extends BaseTest { * @param * @return */ - @Test + @Test(description = "制单、发单") public void Billing(){ this.driver = getDriver(); HomePage homePage = PageFactory.initElements(driver, HomePage.class); @@ -133,4 +143,79 @@ public class TestLoadContainer extends BaseTest { homePage.getHome(); homePage.logout(); } + @Test(description = "通知确认船务资料、订车、发车") + public void confirmLogisticsTest() { + this.driver = getDriver(); + loginValid("chenhong"); + HomePage homePage = PageFactory.initElements(driver, HomePage.class); + homePage.toLogisticsShippPage(); + + //通知业务人员和客户，进行船务资料确认 + LogisticsShippPage logisticsShippPage = PageFactory.initElements(driver, LogisticsShippPage.class); + logisticsShippPage.isSucceed(); + + homePage.getHome(); + homePage.logout(); + loginValid(Model.getSalesman());//登录对应的业务员账号 + + //待办 +// homePage.toSailingDateConfirmPage(); + homePage.toWriteShipping(); + //业务员补充船务资料 + SellerFillInfoPage sellerFillInfo = PageFactory.initElements(driver, SellerFillInfoPage.class); + sellerFillInfo.toSellerFillInfo(); + + //登记备选船期待办 +// homePage.getHome(); + homePage.logout(); + loginValid("wangmiaodan"); + homePage.toSailingDateConfirmPage(); +// homePage.toShippingMarkWait();//根据流水号进入待办 + RegisOptShpDatePage regisOptShpDatePage = PageFactory.initElements(driver,RegisOptShpDatePage.class); + regisOptShpDatePage.toRegisOptShpDatePage(); + + //大跟单确认 +// homePage.getHome(); + homePage.logout(); + loginValid("yuwanhang"); +// homePage.toSailingDateConfirmPage(); + homePage.toShippingMarkWait();//根据流水号进入待办 + LargeDcofdPage largeDcofdPage = PageFactory.initElements(driver,LargeDcofdPage.class); + largeDcofdPage.toLargeDcofdPage(); + + //订舱 +// homePage.getHome(); + homePage.logout(); + loginValid("chenhong"); + + homePage.toLogisticsShippPage(); + CabinInfoPage cabinInfoPage = PageFactory.initElements(driver, CabinInfoPage.class); + cabinInfoPage.toCabinInfoPage(); + + //订车信息确认 + BookingCarPage bookingCarPage = PageFactory.initElements(driver, BookingCarPage.class); + bookingCarPage.toBookingCarPage(); + + //确认发车 + SendCarPage sendCarPage = PageFactory.initElements(driver, SendCarPage.class); + sendCarPage.toSendCarPage(); + + homePage.getHome(); + homePage.logout(); + } + + /** + * 查到存在有装柜任务,进入处理页面 + */ + @Test(description="根据PO单号，确认装柜") + public void ConfirmCabinet(){ + driver = getDriver(); + loginValid("chenyijie"); + 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(); + } } diff --git a/src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java b/src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java deleted file mode 100644 index 2d92864..0000000 --- a/src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java +++ /dev/null @@ -1,67 +0,0 @@ -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 deleted file mode 100644 index 6af29f7..0000000 --- a/src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java +++ /dev/null @@ -1,14 +0,0 @@ -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 deleted file mode 100644 index 1ed8e39..0000000 --- a/src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java +++ /dev/null @@ -1,86 +0,0 @@ -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); - } - - -} diff --git a/src/main/resources/suites/LoadContainer.xml b/src/main/resources/suites/LoadContainer.xml index 66416dc..fdd5505 100644 --- a/src/main/resources/suites/LoadContainer.xml +++ b/src/main/resources/suites/LoadContainer.xml @@ -30,18 +30,20 @@ - - - - - + + + + + + + - + -- libgit2 0.21.2