曾谨 / EssaAuto

Commit 81a4681fe8395d0b3aff70511f19ea94c81f7c15

Authored by zengjin
1 parent 887b8a0e

修改时间工具，还有船务相关

Showing 9 changed files with 138 additions and 70 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/essa/framework/Model.java
  Show/Hide comments   View file @81a4681
... ... @@ -15,7 +15,7 @@ public class Model {
15 15 public static String env;//所选环境
16 16 public static String buyerAccount;//采购商账号
17 17 public static String buyerPassword;//采购商密码
18   - public static String poNum = "DK180126T0278";//po单号
  18 + public static String poNum = "A181117T9194B";//po单号
19 19 public static int isactivity=0;//是否是活动商品 1：是 0：否
20 20 public static String manager;//商品的类目经理
21 21 public static String serialNum;//待办流水号
... ...
src/main/java/com/essa/pageObject/HomePage.java
  Show/Hide comments   View file @81a4681
1 1 package com.essa.pageObject;
2 2  
3 3 import com.essa.pageObject.DocumentaryManage.BillingCenterPage;
4   -import com.essa.pageObject.DocumentaryManage.POBoardPage;
5 4 import com.essa.pageObject.DocumentaryManage.ReceiptCorePage;
6 5 import com.essa.pageObject.GoodsManage.*;
7 6 import com.essa.pageObject.LogisticShipp.LogisticsShippPage;
... ... @@ -24,7 +23,7 @@ import com.essa.pageObject.inquiryManage.ProductInquiryTaskPage;
24 23 import com.essa.pageObject.marketingManage.GroupControlPage;
25 24 import com.essa.pageObject.marketingManage.GroupSettingPage;
26 25 import com.essa.pageObject.needDealt.NeedDealtApplyPage;
27   -import pageObiect.CabinetTask.CabineTaskManagemenPage;
  26 +import com.essa.pageObject.StorageManage.CabineTaskManagemenPage;
28 27  
29 28 /**
30 29 * @author Administrator
... ... @@ -580,5 +579,13 @@ public class HomePage extends BasePage{
580 579 click(CabineTaskManagemen);
581 580 return new CabineTaskManagemenPage(driver);
582 581 }
  582 + /**
  583 + *对浏览器弹框处理
  584 + * @param
  585 + * @return
  586 + */
  587 + public void dealAlert(boolean isAccept){
  588 + alert(isAccept);
  589 + }
583 590  
584 591 }
585 592 \ No newline at end of file
... ...
src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java
  Show/Hide comments   View file @81a4681
... ... @@ -56,7 +56,7 @@ public class SendCarPage extends BasePage {
56 56 forceWait(500);
57 57 QueryWaitForBooking.sendKeys(Model.getPoNum());
58 58 click(QueryWaitForBookingCarBtn);
59   - mywait(FristWaitForBookingCarDate);
  59 + forceWait(1000);
60 60 click(FristWaitForBookingCarDate);
61 61 click(ConfirmBookingCar);
62 62 mywait(SetContainerNo);
... ...
src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java renamed to src/main/java/com/essa/pageObject/StorageManage/CabineTaskManagemenPage.java
  Show/Hide comments   View file @81a4681
1   -package pageObiect.CabinetTask;
  1 +package com.essa.pageObject.StorageManage;
2 2  
3 3 import com.essa.framework.BasePage;
4 4 import com.essa.framework.Model;
... ... @@ -39,7 +39,7 @@ public class CabineTaskManagemenPage extends BasePage{
39 39 /*
40 40 * 页面参数
41 41 * */
42   - String poNo="";
  42 +// String poNo="";
43 43  
44 44 /*
45 45 * 页面方法
... ... @@ -50,12 +50,13 @@ public class CabineTaskManagemenPage extends BasePage{
50 50 */
51 51 public CabineTaskManagemenPage setWareHouse() {
52 52 dynamicLoad(By.xpath("//div[@style='display: none;' and @id='mask']"));
53   - if(Model.getPoNum()!=""|| Model.getPoNum()!=null){
54   - poNo="B180828T9165";
55   - sendKeys(selectKey, poNo);
56   - }else{
57   - sendKeys(selectKey, Model.getPoNum());
58   - }
  53 +// if(Model.getPoNum()!=""|| Model.getPoNum()!=null){
  54 +// poNo="B180828T9165";
  55 +// sendKeys(selectKey, poNo);
  56 +// }else{
  57 +// sendKeys(selectKey, Model.getPoNum());
  58 +// }
  59 + sendKeys(selectKey, Model.getPoNum());
59 60 click(search);
60 61 forceWait(1000);
61 62 click(firstTr);
... ...
src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java renamed to src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java
  Show/Hide comments   View file @81a4681
1   -package pageObiect.CabinetTask;
  1 +package com.essa.pageObject.StorageManage;
2 2  
3 3 import com.essa.framework.BasePage;
  4 +import com.essa.framework.Tools;
4 5 import org.openqa.selenium.By;
5 6 import org.openqa.selenium.WebDriver;
6 7 import org.openqa.selenium.WebElement;
7 8 import org.openqa.selenium.support.FindBy;
8 9  
9 10 import java.text.SimpleDateFormat;
10   -import java.util.ArrayList;
11 11 import java.util.Date;
12   -import java.util.List;
13   -
14   -import static jdk.nashorn.internal.objects.Global.print;
15   -
16   -import com.essa.framework.BasePage;
17   -import com.essa.framework.LogType;
18   -import com.essa.framework.Logger;
19 12  
20 13  
21 14 /**
  15 + * 装柜任务处理页面
22 16 * Created by Administrator on 2018/10/30 0030.
23 17 */
24 18 public class HandlingLoadingOrders extends BasePage {
... ... @@ -73,12 +67,14 @@ public class HandlingLoadingOrders extends BasePage {
73 67 dynamicLoad(By.xpath("//div[@style='display: none;' and @id='mask']"));
74 68 //设置实际装柜日期
75 69 jsExecutorRemoveAttribute(loadCompleteDate, "readonly");
76   - loadCompleteDate.click();
77   - forceWait(500);
78   - SimpleDateFormat zs=new SimpleDateFormat("MM/dd/yyyy");
79   - String s =zs.format(new Date());
80   - sendKeys(loadCompleteDate,s);
  70 +// loadCompleteDate.click();
  71 +// forceWait(500);
  72 +// SimpleDateFormat zs=new SimpleDateFormat("MM/dd/yyyy");
  73 +// String s =zs.format(new Date());
  74 +// sendKeys(loadCompleteDate,s);
  75 + sendKeys(loadCompleteDate, Tools.getToday());
81 76 click(submit);
  77 + dynamicLoad();
82 78 return new HandlingLoadingOrders(driver);
83 79 }
84 80  
... ...
src/main/java/com/essa/testSuite/TestConfirmCabinet.java
  Show/Hide comments   View file @81a4681
... ... @@ -11,8 +11,8 @@ import org.openqa.selenium.support.PageFactory;
11 11 import org.testng.annotations.AfterClass;
12 12 import org.testng.annotations.BeforeClass;
13 13 import org.testng.annotations.Test;
14   -import pageObiect.CabinetTask.CabineTaskManagemenPage;
15   -import pageObiect.CabinetTask.HandlingLoadingOrders;
  14 +import com.essa.pageObject.StorageManage.CabineTaskManagemenPage;
  15 +import com.essa.pageObject.StorageManage.HandlingLoadingOrders;
16 16  
17 17 import java.io.IOException;
18 18  
... ... @@ -29,10 +29,10 @@ public class TestConfirmCabinet extends BaseTest {
29 29 loginValid("chenyijie");
30 30 }
31 31  
32   -// @AfterClass
33   -// public void tearDown() {
34   -// driver.quit();
35   -// }
  32 + @AfterClass
  33 + public void tearDown() {
  34 + driver.quit();
  35 + }
36 36  
37 37 /**
38 38 * 查到存在有装柜任务,进入处理页面
... ... @@ -48,15 +48,6 @@ public class TestConfirmCabinet extends BaseTest {
48 48 handlingLoadingOrders.setHandlingCabinet();
49 49 }
50 50  
51   - /**
52   - * 进入处理页面(默认单号可以装柜)
53   - */
54   -// @Test(description="进入装柜操作页面,进行操作")
55   -// public void handlingLoadingOrders(){
56   -// driver = getDriver();
57   -// //已进入处理页面
58   -//
59   -// }
60 51  
61 52 }
62 53  
... ...
src/main/java/com/essa/testSuite/TestLoadContainer.java
  Show/Hide comments   View file @81a4681
1 1 package com.essa.testSuite;
2 2  
  3 +import com.essa.framework.Model;
3 4 import com.essa.pageObject.BaseTest;
4 5 import com.essa.pageObject.DocumentaryManage.BillingCenterPage;
5 6 import com.essa.pageObject.DocumentaryManage.ConvertTailPage;
6 7 import com.essa.pageObject.DocumentaryManage.POBoardPage;
7 8 import com.essa.pageObject.DocumentaryManage.PODocumentaryListPage;
8 9 import com.essa.pageObject.HomePage;
9   -import com.essa.pageObject.StorageManage.GoodsReceiveTaskPage;
10   -import com.essa.pageObject.StorageManage.NoticeReceivePage;
11   -import com.essa.pageObject.StorageManage.ReceiveTaskDealPage;
  10 +import com.essa.pageObject.LogisticShipp.BookingCarPage;
  11 +import com.essa.pageObject.LogisticShipp.CabinInfoPage;
  12 +import com.essa.pageObject.LogisticShipp.LogisticsShippPage;
  13 +import com.essa.pageObject.LogisticShipp.SendCarPage;
  14 +import com.essa.pageObject.StorageManage.*;
  15 +import com.essa.pageObject.needDealt.LargeDcofdPage;
12 16 import com.essa.pageObject.needDealt.NeedDealtApplyPage;
  17 +import com.essa.pageObject.needDealt.RegisOptShpDatePage;
  18 +import com.essa.pageObject.needDealt.SellerFillInfoPage;
13 19 import org.openqa.selenium.WebDriver;
14 20 import org.openqa.selenium.support.PageFactory;
15 21 import org.testng.annotations.AfterClass;
... ... @@ -35,7 +41,7 @@ public class TestLoadContainer extends BaseTest {
35 41 /**
36 42 * 转尾货
37 43 */
38   - @Test
  44 + @Test(description = "转在途尾货")
39 45 public void toTail() {
40 46 driver = getDriver();
41 47 loginValid("chenyijie");
... ... @@ -52,7 +58,7 @@ public class TestLoadContainer extends BaseTest {
52 58 /**
53 59 * 设置收货、装柜的仓库地址
54 60 */
55   - @Test
  61 + @Test(description = "设置收货、装柜的仓库地址")
56 62 public void noticReceive() {
57 63 driver = getDriver();
58 64 HomePage homePage = PageFactory.initElements(driver, HomePage.class);
... ... @@ -93,7 +99,7 @@ public class TestLoadContainer extends BaseTest {
93 99 /**
94 100 * 收货任务管理，处理
95 101 */
96   - @Test
  102 + @Test (description = "收货任务处理")
97 103 public void dealWithDelivery() {
98 104 driver = getDriver();
99 105 HomePage homePage = PageFactory.initElements(driver, HomePage.class);
... ... @@ -104,12 +110,16 @@ public class TestLoadContainer extends BaseTest {
104 110 goodsReceiveTaskPage.dealReceive();
105 111 receiveTaskDealPage.allReceive();
106 112 }while (!(goodsReceiveTaskPage.isFinish()));
  113 +
  114 + homePage.getHome();
  115 + homePage.dealAlert(true);//确认弹框：离开
  116 + homePage.logout();
107 117 }
108 118  
109 119 /**
110 120 * 大跟单确认船期
111 121 */
112   - @Test
  122 + @Test (description = "大跟单确认船期")
113 123 public void confirmSailingDate() {
114 124 driver = getDriver();
115 125 loginValid("yuwanhang");
... ... @@ -123,7 +133,7 @@ public class TestLoadContainer extends BaseTest {
123 133 * @param
124 134 * @return
125 135 */
126   - @Test
  136 + @Test(description = "制单、发单")
127 137 public void Billing(){
128 138 this.driver = getDriver();
129 139 HomePage homePage = PageFactory.initElements(driver, HomePage.class);
... ... @@ -133,4 +143,79 @@ public class TestLoadContainer extends BaseTest {
133 143 homePage.getHome();
134 144 homePage.logout();
135 145 }
  146 + @Test(description = "通知确认船务资料、订车、发车")
  147 + public void confirmLogisticsTest() {
  148 + this.driver = getDriver();
  149 + loginValid("chenhong");
  150 + HomePage homePage = PageFactory.initElements(driver, HomePage.class);
  151 + homePage.toLogisticsShippPage();
  152 +
  153 + //通知业务人员和客户，进行船务资料确认
  154 + LogisticsShippPage logisticsShippPage = PageFactory.initElements(driver, LogisticsShippPage.class);
  155 + logisticsShippPage.isSucceed();
  156 +
  157 + homePage.getHome();
  158 + homePage.logout();
  159 + loginValid(Model.getSalesman());//登录对应的业务员账号
  160 +
  161 + //待办
  162 +// homePage.toSailingDateConfirmPage();
  163 + homePage.toWriteShipping();
  164 + //业务员补充船务资料
  165 + SellerFillInfoPage sellerFillInfo = PageFactory.initElements(driver, SellerFillInfoPage.class);
  166 + sellerFillInfo.toSellerFillInfo();
  167 +
  168 + //登记备选船期待办
  169 +// homePage.getHome();
  170 + homePage.logout();
  171 + loginValid("wangmiaodan");
  172 + homePage.toSailingDateConfirmPage();
  173 +// homePage.toShippingMarkWait();//根据流水号进入待办
  174 + RegisOptShpDatePage regisOptShpDatePage = PageFactory.initElements(driver,RegisOptShpDatePage.class);
  175 + regisOptShpDatePage.toRegisOptShpDatePage();
  176 +
  177 + //大跟单确认
  178 +// homePage.getHome();
  179 + homePage.logout();
  180 + loginValid("yuwanhang");
  181 +// homePage.toSailingDateConfirmPage();
  182 + homePage.toShippingMarkWait();//根据流水号进入待办
  183 + LargeDcofdPage largeDcofdPage = PageFactory.initElements(driver,LargeDcofdPage.class);
  184 + largeDcofdPage.toLargeDcofdPage();
  185 +
  186 + //订舱
  187 +// homePage.getHome();
  188 + homePage.logout();
  189 + loginValid("chenhong");
  190 +
  191 + homePage.toLogisticsShippPage();
  192 + CabinInfoPage cabinInfoPage = PageFactory.initElements(driver, CabinInfoPage.class);
  193 + cabinInfoPage.toCabinInfoPage();
  194 +
  195 + //订车信息确认
  196 + BookingCarPage bookingCarPage = PageFactory.initElements(driver, BookingCarPage.class);
  197 + bookingCarPage.toBookingCarPage();
  198 +
  199 + //确认发车
  200 + SendCarPage sendCarPage = PageFactory.initElements(driver, SendCarPage.class);
  201 + sendCarPage.toSendCarPage();
  202 +
  203 + homePage.getHome();
  204 + homePage.logout();
  205 + }
  206 +
  207 + /**
  208 + * 查到存在有装柜任务,进入处理页面
  209 + */
  210 + @Test(description="根据PO单号，确认装柜")
  211 + public void ConfirmCabinet(){
  212 + driver = getDriver();
  213 + loginValid("chenyijie");
  214 + HomePage homePage = PageFactory.initElements(driver, HomePage.class);
  215 + homePage.toCabineTaskManagemenPage();
  216 + CabineTaskManagemenPage searchCabineTaskManagemenPage = PageFactory.initElements(driver, CabineTaskManagemenPage.class);
  217 + searchCabineTaskManagemenPage.setWareHouse();
  218 + HandlingLoadingOrders handlingLoadingOrders = PageFactory.initElements(driver, HandlingLoadingOrders.class);
  219 + handlingLoadingOrders.setHandlingCabinet();
  220 + }
136 221 }
... ...
src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java deleted
View file @887b8a0
... ... @@ -1,14 +0,0 @@
1   -package pageObiect.CabinetTask;
2   -
3   -import com.essa.framework.BasePage;
4   -import org.openqa.selenium.WebDriver;
5   -
6   -/**
7   - * Created by Administrator on 2018/10/26 0026.
8   - */
9   -public class CabinetsNoticePage extends BasePage{
10   -
11   - public CabinetsNoticePage(WebDriver driver) {
12   - super(driver);
13   - }
14   -}
src/main/resources/suites/LoadContainer.xml
  Show/Hide comments   View file @81a4681
... ... @@ -30,18 +30,20 @@
30 30 <classes>
31 31 <class name="com.essa.testSuite.TestLoadContainer">
32 32 <methods>
33   - <include name="Billing"/>
34   - <include name="toTail"/>
35   - <include name="NoticeReceiveAndLoad"/>
36   - <include name="noticReceive"/>
37   - <include name="dealWithDelivery"/>
  33 + <include name="Billing"/><!--制单发单-->
  34 + <include name="toTail"/><!--转在途尾货-->
  35 + <include name="NoticeReceiveAndLoad"/><!--通知收货、装柜-->
  36 + <include name="noticReceive"/><!--设置收货、装柜的仓库地址-->
  37 + <include name="dealWithDelivery"/><!--收货任务处理-->
  38 + <include name="confirmLogisticsTest"/><!--船务-->
  39 + <include name="ConfirmCabinet"/><!--装柜完成-->
38 40 </methods>
39 41 </class>
40   - <class name="com.essa.testSuite.TestConfirLogistics">
  42 +<!-- <class name="com.essa.testSuite.TestConfirLogistics">
41 43 <methods>
42 44 <include name="confirmLogisticsTest"/>
43 45 </methods>
44   - </class>
  46 + </class>-->
45 47 </classes>
46 48 </test>
47 49 </suite>
... ...