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

zengjin
1 parent 887b8a0e
Showing 9 changed files with 138 additions and 70 deletions Show diff stats
src/main/java/com/essa/framework/Model.java
src/main/java/com/essa/pageObject/HomePage.java
src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java
src/main/java/pageObiect/CabinetTask/CabineTaskManagemenPage.java -> src/main/java/com/essa/pageObject/StorageManage/CabineTaskManagemenPage.java
src/main/java/pageObiect/CabinetTask/HandlingLoadingOrders.java -> src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java
src/main/java/com/essa/testSuite/TestConfirmCabinet.java
src/main/java/com/essa/testSuite/TestLoadContainer.java
src/main/java/pageObiect/CabinetTask/CabinetsNoticePage.java
src/main/resources/suites/LoadContainer.xml
@@ -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;//待办流水号
 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
@@ -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);
-package pageObiect.CabinetTask;
+package com.essa.pageObject.StorageManage;
 import com.essa.framework.BasePage;
 import com.essa.framework.Model;
@@ -39,7 +39,7 @@ public class CabineTaskManagemenPage extends BasePage{
     /*
     * 页面参数
      * */
-    String poNo="";
+//    String poNo="";
     /*
 	 * 页面方法
@@ -50,12 +50,13 @@ public class CabineTaskManagemenPage extends BasePage{
      */
     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());
-        }
+//        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);
-package pageObiect.CabinetTask;
+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.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 {
@@ -73,12 +67,14 @@ public class HandlingLoadingOrders extends BasePage {
         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);
+//        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);
     }
@@ -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();
-//         //已进入处理页面
-//
-//     }
 }
 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();
+	}
 }
@@ -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);
-    }
-}
@@ -30,18 +30,20 @@
 		<classes>
 			<class name="com.essa.testSuite.TestLoadContainer">
 				<methods>
-					<include name="Billing"/>
-					<include name="toTail"/>
-					<include name="NoticeReceiveAndLoad"/>
-					<include name="noticReceive"/>
-					<include name="dealWithDelivery"/>
+					<include name="Billing"/><!--制单发单-->
+					<include name="toTail"/><!--转在途尾货-->
+					<include name="NoticeReceiveAndLoad"/><!--通知收货、装柜-->
+					<include name="noticReceive"/><!--设置收货、装柜的仓库地址-->
+					<include name="dealWithDelivery"/><!--收货任务处理-->
+					<include name="confirmLogisticsTest"/><!--船务-->
+					<include name="ConfirmCabinet"/><!--装柜完成-->
 				</methods>
 			</class>
-			<class name="com.essa.testSuite.TestConfirLogistics">
+<!--			<class name="com.essa.testSuite.TestConfirLogistics">
 				<methods>
 					<include name="confirmLogisticsTest"/>
 				</methods>
-			</class>
+			</class>-->
 		</classes>
 	</test>
 </suite>