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

zengjin
1 parent aaa54ba4
Showing 22 changed files with 301 additions and 90 deletions Show diff stats
src/main/java/com/buyer/pageObject/PayDepositPage.java
src/main/java/com/essa/framework/BasePage.java
src/main/java/com/essa/framework/Model.java
src/main/java/com/essa/framework/SuitesEnum.java
src/main/java/com/essa/framework/Tools.java
src/main/java/com/essa/pageObject/DocumentaryManage/POBoardPage.java
src/main/java/com/essa/pageObject/HomePage.java
src/main/java/com/essa/pageObject/LogisticShipp/BookingCarPage.java
src/main/java/com/essa/pageObject/LogisticShipp/CabinInfoPage.java
src/main/java/com/essa/pageObject/LogisticShipp/LogisticsShippPage.java
src/main/java/com/essa/pageObject/LogisticShipp/SendCarPage.java
src/main/java/com/essa/pageObject/PODocumentary/POBoardPage.java
src/main/java/com/essa/pageObject/StorageManage/LoadContainerHandlePage.java
src/main/java/com/essa/pageObject/StorageManage/LoadContainerManagePage.java
src/main/java/com/essa/pageObject/LogisticShipp/LargeDcofdPage.java -> src/main/java/com/essa/pageObject/needDealt/LargeDcofdPage.java
src/main/java/com/essa/pageObject/needDealt/NeedDealtApplyPage.java
src/main/java/com/essa/pageObject/LogisticShipp/RegisOptShpDatePage.java -> src/main/java/com/essa/pageObject/needDealt/RegisOptShpDatePage.java
src/main/java/com/essa/pageObject/LogisticShipp/SellerFillInfoPage.java -> src/main/java/com/essa/pageObject/needDealt/SellerFillInfoPage.java
src/main/java/com/essa/testSuite/TestConfirLogistics.java
src/main/java/com/essa/testSuite/TestLoadContainer.java
@@ -52,11 +52,9 @@ public class PayDepositPage extends BasePage {
 	}
 	public void operate() {
-		/*while (!(isVisibility(By.xpath("//*[contains(text(),'PO information')]")))) {
-			forceWait(1000);
-		}*/
 		dynamicWait(By.xpath("//*[contains(text(),'PO information')]"));
 		Model.setPoNum(poNum.getText());
+
 		if (isVisibility(By.xpath("//button[@class='submit-payment-deposit-button btn btn-primary']"))) {
 			//如果是可用资金不足，跳转到资金管理
 			toAssetManagementPage();
@@ -520,6 +520,16 @@ public class BasePage {
 //		Logger.Output(LogType.LogTypeName.INFO, "等待元素在页面上加载可见，最多5秒");
 		wait.until(ExpectedConditions.visibilityOf(element));
 	}
+
+	/**要的元素是否存在，传递元素表达式，最多5秒
+	 * @param
+	 */
+	protected void mywait(By by) {
+
+		WebDriverWait wait = new WebDriverWait(driver, 7);
+//		Logger.Output(LogType.LogTypeName.INFO, "等待元素在页面上加载可见，最多5秒");
+		wait.until(ExpectedConditions.visibilityOf(driver.findElement(by)));
+	}
 	/**
 	 * 设立检查点，判断页面是否是我们要的
@@ -665,8 +675,8 @@ public class BasePage {
 	 * @param by
 	 */
 	protected void dynamicWait(By by) {
-		for(int count=0;count<7&&!(isVisibility(by));count++) {
-			forceWait(1000);
+		for(int count=0;count<14&&!(isVisibility(by));count++) {
+			forceWait(500);
 		}
 	}
 //	/**
@@ -681,8 +691,8 @@ public class BasePage {
 	 * @param by
 	 */
 	protected void dynamicLoad(By by) {
-		for(int count=0;count<7&&isVisibility(by);count++) {
-			forceWait(1000);
+		for(int count=0;count<14&&isVisibility(by);count++) {
+			forceWait(500);
 		}
 	}
 	/**
@@ -9,20 +9,29 @@ public class Model {
 	public static String skuNo;//商品编号
 	public static String buyerNo;//采购商编号
 	public static String supplierName;//供应商名称
-	public static String picPath = "C:\\Users\\Administrator\\Pictures\\Camera Roll\\ya.jpg";//图片路径
+	public static String picPath;//图片路径
 	public static String email = "buyer"+Tools.getTime()+"@essa.cn";//采购商邮箱
 	public static String invateCode;//邀请码
 	public static String env;//所选环境
-	public static String buyerAccount="meng18@essa.cn";//采购商账号
-	public static String buyerPassword="essa123";//采购商密码
-	public static String poNum="A181115T9194K";//po单号
+	public static String buyerAccount;//采购商账号
+	public static String buyerPassword;//采购商密码
+	public static String poNum = "DK180126T0278";//po单号
 	public static int isactivity=0;//是否是活动商品 1：是 0：否 
 	public static String manager;//商品的类目经理
-	public static String serialNum="RW2018060800058";//待办流水号
+	public static String serialNum;//待办流水号
 	public static String materialName;//物料名称
 	public static String projectName;//项目立项书名称
+    public static String salesman="yanqingping";//业务员
-	public static String getProjectName() {
+    public static String getSalesman() {
+        return salesman;
+    }
+
+    public static void setSalesman(String salesman) {
+        Model.salesman = salesman;
+    }
+
+    public static String getProjectName() {
 		return projectName;
 	}
@@ -19,7 +19,8 @@ public enum SuitesEnum {
     ACTIVITY_SEND_PO("ACTIVITY_SEND_PO","activitySendPO.xml","生成PO(活动)"),
     SEND_PO("SEND_PO","sendPO.xml","生成PO(正常)"),
     PO_INQUIRY("PO_INQUIRY","POInquiry.xml","PO询价"),
-    ADD_DEV_GOODS("ADD_DEV_GOODS","addDevGoods.xml","新增开发商品");
+    ADD_DEV_GOODS("ADD_DEV_GOODS","addDevGoods.xml","新增开发商品"),
+    LOAD_FINISH("LOAD_FINISH","LoadContainer.xml","装柜完成");
     ;
     /**
 package com.essa.framework;
 import java.text.SimpleDateFormat;
+import java.time.Year;
+import java.util.Calendar;
 import java.util.Date;
 public class Tools {
@@ -37,5 +39,52 @@ public class Tools {
 		int i = (int)(1+Math.random()*(10-1+1));
 		return time+i;
 	}
-    
+	/**
+	 *获取当前时间的下一个月
+	 * @param
+	 * @return String 格式化后的时间
+	 */
+    public static String getNextMonth(){
+		Date today = new Date();
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(today);
+		cal.add(Calendar.MONTH,1);
+		return  myForm(cal);
+	}
+	/**
+	 *获取当前时间+i天,传入的i为当前时间往后推的天数
+	 * @param
+	 * @return String
+	 */
+	public static String moreDays(int i){
+		Date today = new Date();
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(today);
+		cal.add(Calendar.DATE,i);
+		return myForm(cal);
+	}
+
+	/**
+	 *获取格式化后的当天
+	 * @param
+	 * @return String
+	 */
+	public static String getToday(){
+		Date today = new Date();
+		Calendar cal = Calendar.getInstance();
+		cal.setTime(today);
+		return myForm(cal);
+	}
+
+	/**
+	 *由于bpms系统遇到日期中“天”为0开头时无法输入，故自己写一个格式
+	 * @param
+	 * @return
+	 */
+	public static String myForm(Calendar cal){
+		int day = cal.get(Calendar.DATE);
+		int month = cal.get(Calendar.MONTH)+1;
+		int year = cal.get(Calendar.YEAR);
+		return month+"/"+day+"/"+ year;
+	}
 }
 package com.essa.pageObject.DocumentaryManage;
 import com.essa.framework.Model;
+import com.essa.framework.Tools;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
@@ -9,7 +10,11 @@ import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
 import java.util.Date;
-
+/**
+* @Description: Po看板页面
+* @Author: ZengJin
+* @CreateTime: 2018/11/1
+*/
 public class POBoardPage extends BasePage {
 	public POBoardPage(WebDriver driver) {
@@ -88,8 +93,7 @@ public class POBoardPage extends BasePage {
 	public POBoardPage noticeReceive(){
 		click(noticeReceive);
 		jsExecutorRemoveAttribute(inputReceiveDate,"readonly");
-		String date = getDateTimeByFormat(new Date(),"MM/dd/yyyy");
-		sendKeys(inputReceiveDate,date);
+		sendKeys(inputReceiveDate, Tools.getToday());
 		click(reveiveDate);
 		click(submit);
 		return new POBoardPage(driver);
@@ -104,8 +108,7 @@ public class POBoardPage extends BasePage {
 	public POBoardPage noticeLoad(){
 		click(noticeLoad);
 		jsExecutorRemoveAttribute(inutLoadDate,"readonly");
-		String date = getDateTimeByFormat(new Date(),"MM/dd/yyyy");
-		sendKeys(inutLoadDate,date);
+		sendKeys(inutLoadDate,Tools.getToday());
 		click(loadDate);
 		forceWait(1000);
 		click(submit);
@@ -200,7 +200,7 @@ public class HomePage extends BasePage{
     WebElement LogisticsskippBoard;
     //船务看板
-    @FindBy (xpath = "//*[@id='essa-left-menu']/div/dl[1]/dd[2]")
+    @FindBy (xpath = "//*[text()='船务看板']")
     WebElement skippBoard;
@@ -444,6 +444,7 @@ public class HomePage extends BasePage{
      */
     public NeedDealtApplyPage toSailingDateConfirmPage() {
     	click(confirmDailingDate);
+    	forceWait(1000);
     	click(firstNeedDealt);
     	switchMoreWindow();
     	return new NeedDealtApplyPage(driver);
@@ -541,11 +542,22 @@ public class HomePage extends BasePage{
      *进入船务看板界面
      */
     public LogisticsShippPage toLogisticsShippPage(){
-        mywait(LogisticsskippBoard);
+//        mywait(LogisticsskippBoard);
         click(LogisticsskippBoard);
-        mywait(skippBoard);
+//        forceWait(1000);
         click(skippBoard);
+//        jsExecutorClick(skippBoard);
         return new LogisticsShippPage(driver);
     }
+    /**
+     *业务员进入待办详情页，填写船务资料
+     * @param
+     * @return
+     */
+    public NeedDealtApplyPage toWriteShipping() {
+        click(firstNeedDealt);
+        switchMoreWindow();
+        return new NeedDealtApplyPage(driver);
+    }
 }
 \ No newline at end of file
 package com.essa.pageObject.LogisticShipp;
 import com.essa.framework.BasePage;
+import com.essa.framework.Model;
+import com.essa.framework.Tools;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -13,7 +15,7 @@ public class BookingCarPage extends BasePage {
     }
     //订车看板
-    @FindBy(xpath = "//*[@id='tableViewList']/div/div/div/ul/li[4]")
+    @FindBy(xpath = "//*[text()='订车']")
     WebElement BookingCarBoard;
     //查询条件
@@ -47,16 +49,16 @@ public class BookingCarPage extends BasePage {
     public BookingCarPage toBookingCarPage() {
         mywait(BookingCarBoard);
         click(BookingCarBoard);
-        SetQuery.sendKeys("D180411T0278");
+        SetQuery.sendKeys(Model.getPoNum());
         click(QueryBtn);
         forceWait(1000);
         click(QueryRsult);
         click(BookingCarBtn);
         mywait(BookingCarSeclType);
         click(BookingCarSeclType);
-        mywait(BookingCarDate);
+//        mywait(BookingCarDate);
         jsExecutorRemoveAttribute(BookingCarDate, "readonly");
-        sendKeys(BookingCarDate, "2018/10/23");
+        sendKeys(BookingCarDate, Tools.getToday());
         click(SubmitBtn);
         return new BookingCarPage(driver);
     }
 package com.essa.pageObject.LogisticShipp;
 import com.essa.framework.BasePage;
+import com.essa.framework.Model;
+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;
@@ -11,7 +14,7 @@ public class CabinInfoPage extends BasePage {
         super(driver);
     }
-    public String FilePath = "C:\Users\hanlei\Desktop\1.png";
+//    public String FilePath = "C:\Users\hanlei\Desktop\1.png";
     //订舱看板
     @FindBy(xpath = "//*[@id='tableViewList']/div/div/div/ul/li[3]")
@@ -57,25 +60,36 @@ public class CabinInfoPage extends BasePage {
     @FindBy(xpath = "/html/body/div[6]/div/div/div[2]/div")
     WebElement Body;
+    //预计到港时间
+    @FindBy (xpath = "//*[@id='expectArrivalTime']")
+    WebElement expectArrivalTime;
+
+
     public CabinInfoPage toCabinInfoPage() {
+        forceWait(1000);
         click(BookingCabin);
         mywait(FirstDate);
-        SetQuery.sendKeys("D180411T0278");
+        SetQuery.sendKeys(Model.getPoNum());
         click(QueryBtn);
-        mywait(SelectFirstDate);
+//        mywait(SelectFirstDate);
+        forceWait(1000);
         click(SelectFirstDate);
         click(BookingCabinBtn);
         mywait(SetCabinSONo);
         SetCabinSONo.sendKeys("TestCabinNo");
+        jsExecutorRemoveAttribute(expectArrivalTime,"readonly");
+        sendKeys(expectArrivalTime,Tools.getNextMonth());
         jsExecutorRemoveAttribute(LastLoadTimeSet, "readonly");
-        sendKeys(LastLoadTimeSet,"10/23/2018");
+        sendKeys(LastLoadTimeSet, Tools.getToday());//最后装柜时间设置为今天
 //        LastLoadTimeSet.sendKeys("10/23/2018");
         click(Body);
 //        jsExecutorClick(FileUp);
         actionClick(FileUp);
-        uploadFile(FilePath);
-        forceWait(2000);
+        uploadFile(Model.getPicPath());
+//        forceWait(2000);
+        dynamicLoad(By.xpath("//img[@ng-src='/img/nopic.jpg']"));//直到默认的图片找不到时，执行下一步
         click(CommitBtn);
+        dynamicLoad();
         return new CabinInfoPage(driver);
     }
 }
@@ -2,6 +2,9 @@ package com.essa.pageObject.LogisticShipp;
 import com.essa.framework.BasePage;
+import com.essa.framework.Model;
+import com.essa.pageObject.HomePage;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -45,10 +48,12 @@ public class LogisticsShippPage extends BasePage {
     WebElement logout;
     //搜索并通知业务补充船务资料
-    public LogisticsShippPage isSucceed() {
+    public HomePage isSucceed() {
+        forceWait(1000);
         click(NoticeBoard);
-        mywait(resultDate);
-        setPono.sendKeys("D180411T0278");
+        dynamicWait(By.xpath("//tbody/tr[1]/td[1]/input[1]"));//列表加载
+//        setPono.sendKeys("D180411T0278");
+        sendKeys(setPono, Model.getPoNum());
         click(querySubBtn);
         mywait(selectedpo);
         click(selectedpo);
@@ -56,6 +61,10 @@ public class LogisticsShippPage extends BasePage {
         click(skippSubBtn);
         mywait(submitSubBtn);
         click(submitSubBtn);
-        return new LogisticsShippPage(driver);
+        String saleman = DBSqlSearch("select a.account_name from pri_user a INNER JOIN\n" +
+                "sale_po b on a.id=b.salesman_id\n" +
+                "where b.`code` = '"+ Model.getPoNum()+"';","account_name");//根据PO单号查出对应的业务员
+        Model.setSalesman(saleman);//将查询出的业务员存储在model中
+        return new HomePage(driver);
     }
 }
 package com.essa.pageObject.LogisticShipp;
 import com.essa.framework.BasePage;
+import com.essa.framework.Model;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -48,10 +49,12 @@ public class SendCarPage extends BasePage {
     WebElement SubmitBtn;
     public SendCarPage toSendCarPage() {
+        forceWait(1000);
         click(BookingCarBoard);
         mywait(WaitForBookingCarBoard);
         click(WaitForBookingCarBoard);
-        QueryWaitForBooking.sendKeys("D180411T0278");
+        forceWait(500);
+        QueryWaitForBooking.sendKeys(Model.getPoNum());
         click(QueryWaitForBookingCarBtn);
         mywait(FristWaitForBookingCarDate);
         click(FristWaitForBookingCarDate);
 package com.essa.pageObject.PODocumentary;
+import com.essa.framework.Tools;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import com.essa.framework.BasePage;
@@ -64,8 +65,8 @@ public class POBoardPage extends BasePage {
     public POBoardPage toNotificationLoading(){
         click(NotificationLoading);
         jsExecutorRemoveAttribute(loadingDate,"readonly");
-        String Loadingdate = getDateTimeByFormat(new Date(), "MM/dd/yyyy");
-        sendKeys(loadingDate,Loadingdate);
+//        String Loadingdate = getDateTimeByFormat(new Date(), "MM/dd/yyyy");
+        sendKeys(loadingDate, Tools.getToday());
         click(BlankPlace);
         click(submit);
         forceWait(4000);
@@ -2,6 +2,7 @@ package com.essa.pageObject.StorageManage;
 import com.essa.framework.BasePage;
 import com.essa.framework.Model;
+import com.essa.framework.Tools;
 import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
@@ -48,8 +49,8 @@ public class LoadContainerHandlePage extends BasePage {
     public LoadContainerHandlePage loadTaskHandle(){
         forceWait(1000);
         jsExecutorRemoveAttribute(actLoadTime,"readonly");
-        String date = getDateTimeByFormat(new Date(), "MM/dd/yyyy");
-        sendKeys(actLoadTime,date);
+//        String date = getDateTimeByFormat(new Date(), "MM/dd/yyyy");
+        sendKeys(actLoadTime, Tools.getToday());
         // 获取‘可装柜数量’字符串中的数量
         String qua = partiaStr(mayLoadQuantity,0,1);
         // 对切片结果进行int转换
@@ -7,7 +7,11 @@ import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
-
+/**
+* @Description: 装柜任务管理列表
+* @Author: ZengJin
+* @CreateTime: 2018/11/1
+*/
 public class LoadContainerManagePage extends BasePage {
     public LoadContainerManagePage(WebDriver driver) {
-package com.essa.pageObject.LogisticShipp;
+package com.essa.pageObject.needDealt;
 import com.essa.framework.BasePage;
+import com.essa.pageObject.HomePage;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -15,9 +17,16 @@ public class LargeDcofdPage extends BasePage {
     @FindBy(xpath = "//*[@id='tableViewList']/div/div/div/div[4]/span[1]/button[2]")
     WebElement ConfirmationShipDate;
-    public LargeDcofdPage toLargeDcofdPage(){
-        mywait(ConfirmationShipDate);
+    /**
+     *大跟单确认船期
+     * @param
+     * @return
+     */
+    public HomePage toLargeDcofdPage(){
+//        mywait(ConfirmationShipDate);
+        dynamicWait(By.xpath("//*[contains(text(),'待办工作')]"));
         click(ConfirmationShipDate);
-        return new LargeDcofdPage(driver);
+        dynamicLoad();
+        return new HomePage(driver);
     }
 }
 package com.essa.pageObject.needDealt;
+import com.essa.framework.Tools;
 import org.openqa.selenium.By;
 import org.openqa.selenium.JavascriptExecutor;
 import org.openqa.selenium.WebDriver;
@@ -10,6 +11,8 @@ import com.essa.framework.BasePage;
 import com.essa.framework.Model;
 import com.essa.pageObject.HomePage;
+import java.util.Date;
+
 /**
  * 当团购活动成功时，类目经理采购计划单申请页面
  * @author Administrator
@@ -157,11 +160,12 @@ public class NeedDealtApplyPage extends BasePage {
 		//设置开船日期
 		jsExecutorRemoveAttribute(inputShipperStartDate,"readonly");
 		inputShipperStartDate.clear();
-		sendKeys(inputShipperStartDate,"10/25/2018");
+//		String date = getDateTimeByFormat(new Date(),"MM/dd/yyyy");
+		sendKeys(inputShipperStartDate, Tools.getNextMonth());
 		//设置预计到港日期
 		jsExecutorRemoveAttribute(inputShipperArriveDate,"readonly");
 		inputShipperArriveDate.clear();
-		sendKeys(inputShipperArriveDate,"11/10/2018");
+		sendKeys(inputShipperArriveDate,Tools.getNextMonth());
 		//提交
 		click(submit);
 		dynamicLoad();
-package com.essa.pageObject.LogisticShipp;
+package com.essa.pageObject.needDealt;
 import com.essa.framework.BasePage;
+import com.essa.framework.Model;
+import com.essa.framework.Tools;
+import com.essa.pageObject.HomePage;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -35,19 +39,32 @@ public class RegisOptShpDatePage extends BasePage {
     @FindBy(xpath = "//*[@id='tableViewList']/div/div/div/div[4]/span[1]/button[2]")
     WebElement SubmitBtn;
-    public RegisOptShpDatePage toRegisOptShpDatePage(){
-        mywait(ClaimTask);
-        forceWait(1000);
-        click(ClaimTask);
+    //流水号
+    @FindBy (xpath = "//*[contains(text(),'流水号：RW')]")
+    WebElement serialNumber;
+
+    /**
+     *登记船期
+     * @param
+     * @return HomePage
+     */
+    public HomePage toRegisOptShpDatePage(){
+        dynamicWait(By.xpath("//*[contains(text(),'待办工作')]"));
+        if (isVisibility(By.xpath("//*[@id='tableViewList']/div/div/div/div[4]/button"))){
+            click(ClaimTask);//如果需要认领，则认领
+            forceWait(4000);
+        }
         mywait(AddShippInfo);
+        Model.setSerialNum(partialStr(serialNumber.getText(), "流水号："));
         click(AddShippInfo);
         mywait(AddShippCompanyInfo);
         AddShippCompanyInfo.sendKeys("TestShippCompanyInfo");
         jsExecutorRemoveAttribute(SetdeliveryDate0, "readonly");
-        sendKeys(SetdeliveryDate0,"10/23/2018");
+        sendKeys(SetdeliveryDate0, Tools.moreDays(20));
         jsExecutorRemoveAttribute(SetEstimatedArrivalDate0, "readonly");
-        sendKeys(SetEstimatedArrivalDate0,"10/23/2018");
+        sendKeys(SetEstimatedArrivalDate0,Tools.moreDays(20));
         click(SubmitBtn);
-        return new RegisOptShpDatePage(driver);
+        dynamicLoad();
+        return new HomePage(driver);
     }
 }
-package com.essa.pageObject.LogisticShipp;
+package com.essa.pageObject.needDealt;
 import com.essa.framework.BasePage;
+import com.essa.framework.Model;
+import com.essa.pageObject.HomePage;
+import org.openqa.selenium.By;
 import org.openqa.selenium.WebDriver;
 import org.openqa.selenium.WebElement;
 import org.openqa.selenium.support.FindBy;
@@ -95,12 +98,23 @@ public class SellerFillInfoPage extends BasePage {
     @FindBy(xpath = "//*[text()='确认']")
     WebElement SubmitBtn;
-    public SellerFillInfoPage toSellerFillInfo() {
-        mywait(AppointSet);
+    //流水号
+    @FindBy (xpath = "//*[contains(text(),'流水号：RW')]")
+    WebElement serialNumber;
+
+    /**
+     *业务员填写船务资料
+     * @param
+     * @return
+     */
+    public HomePage toSellerFillInfo() {
+//        mywait(AppointSet);
+        dynamicWait(By.xpath("//*[contains(text(),'待办工作')]"));
+        Model.setSerialNum(partialStr(serialNumber.getText(), "流水号："));//将流水号传递出去
         click(AppointSet);
         click(DeclareSet);
         click(AppointCompanySet);
-        mywait(AppointCompanySec);
+        forceWait(1000);
         click(AppointCompanySec);
         click(CommitAppointCompanySec);
         mywait(TargetPortSet);
@@ -122,6 +136,7 @@ public class SellerFillInfoPage extends BasePage {
         MailZipcode.sendKeys("TestMailZipCode");
         MailFax.sendKeys("TestMailFax");
         click(SubmitBtn);
-        return new SellerFillInfoPage(driver);
+        dynamicLoad();
+        return new HomePage(driver);
     }
 }
 package com.essa.testSuite;
+import com.essa.framework.Model;
 import com.essa.pageObject.LogisticShipp.*;
+import com.essa.pageObject.needDealt.LargeDcofdPage;
+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;
@@ -36,32 +40,35 @@ public class TestConfirLogistics extends BaseTest {
         homePage.getHome();
         homePage.logout();
-        loginValid("yanqingping");
+        loginValid(Model.getSalesman());//登录对应的业务员账号
         //待办
-        homePage.toSailingDateConfirmPage();
+//        homePage.toSailingDateConfirmPage();
+        homePage.toWriteShipping();
         //业务员补充船务资料
         SellerFillInfoPage sellerFillInfo = PageFactory.initElements(driver, SellerFillInfoPage.class);
         sellerFillInfo.toSellerFillInfo();
         //登记备选船期待办
-        homePage.getHome();
+//        homePage.getHome();
         homePage.logout();
         loginValid("wangmiaodan");
         homePage.toSailingDateConfirmPage();
+//        homePage.toShippingMarkWait();//根据流水号进入待办
         RegisOptShpDatePage regisOptShpDatePage = PageFactory.initElements(driver,RegisOptShpDatePage.class);
         regisOptShpDatePage.toRegisOptShpDatePage();
         //大跟单确认
-        homePage.getHome();
+//        homePage.getHome();
         homePage.logout();
         loginValid("yuwanhang");
-        homePage.toSailingDateConfirmPage();
+//        homePage.toSailingDateConfirmPage();
+        homePage.toShippingMarkWait();//根据流水号进入待办
         LargeDcofdPage largeDcofdPage = PageFactory.initElements(driver,LargeDcofdPage.class);
         largeDcofdPage.toLargeDcofdPage();
         //订舱
-        homePage.getHome();
+//        homePage.getHome();
         homePage.logout();
         loginValid("chenhong");
@@ -76,6 +83,5 @@ public class TestConfirLogistics extends BaseTest {
         //确认发车
         SendCarPage sendCarPage = PageFactory.initElements(driver, SendCarPage.class);
         sendCarPage.toSendCarPage();
-
     }
 }
@@ -130,6 +130,7 @@ public class TestLoadContainer extends BaseTest {
 		BillingCenterPage billingCenterPage = PageFactory.initElements(driver,BillingCenterPage.class);
 		homePage.toBillingCenterPage();
 		billingCenterPage.MoreBilling();
+		homePage.getHome();
 		homePage.logout();
 	}
 }
@@ -164,6 +164,9 @@ public class SwingMain {
 		frmvBy.getContentPane().add(ToCart);
 		ToCart.setLayout(null);
+
+
+
 		//可视化操作选项
 		JLabel label_1 = new JLabel("可视化操作：");
 		label_1.setBounds(10, 119, 88, 15);
@@ -279,6 +282,7 @@ public class SwingMain {
 				ToCart.setVisible(false);
 				POInquiry.setVisible(false);
 				register.setVisible(false);
+//				loadFinish.setVisible(false);
 				switch ((String)selectScene.getSelectedItem()){
 					default:
 						process.setText(
@@ -327,11 +331,17 @@ public class SwingMain {
 						addOriginal.setVisible(true);
 						ja.append(getCurrentTime() + "已选择场景：新增开发商品\r\n");
 						break;
+					case "装柜完成":
+						ToCart.setVisible(true);
+						ja.append(getCurrentTime() + "已选择场景：装柜完成，将重启浏览器多次\r\n");
+						process.setText(
+								"<html><body>装柜流程：<br>1.添加商品到购物车<br>2.询价并拼柜生成PO<br>3.仓储管理船务管理至装柜完成<br><br><br></body></html>");
+						break;
 				}
 			}
 		});
 		selectScene.setModel(
-				new DefaultComboBoxModel(new String[] { "新增原厂商品", "新增市场商品", "发布团购", "采购商注册", "成品询价", "生成PO", "PO询价","新增开发商品" }));
+				new DefaultComboBoxModel(new String[] { "新增原厂商品", "新增市场商品","新增开发商品","装柜完成", "发布团购", "采购商注册", "成品询价", "生成PO", "PO询价" }));
 		frmvBy.getContentPane().add(selectScene);
 		JLabel label_3 = new JLabel("供应商名称：");
@@ -370,6 +380,15 @@ public class SwingMain {
 		picPath.setVisible(false);
 		addOriginal.add(picPath);
+//		//装柜完成场景=============
+//		final JPanel loadFinish = new JPanel();
+//		loadFinish.setBounds(231, 42, 230, 128);
+////		loadFinish.setVisible(false);
+//		loadFinish.add(picPath);//添加图片按钮
+//		loadFinish.add(label_7);//必填项
+//		frmvBy.getContentPane().add(loadFinish);
+//		loadFinish.setLayout(null);
+
 		JLabel label_5 = new JLabel("采购商编号：");
 		label_5.setFont(new Font("微软雅黑", Font.PLAIN, 14));
 		label_5.setBounds(8, 15, 86, 15);
@@ -449,7 +468,7 @@ public class SwingMain {
 		ToCart.add(account);
 		account.setColumns(10);
-		password = new JTextField();
+		password = new JPasswordField();
 		password.setText("essa123");
 		password.setToolTipText("");
 		password.setFont(new Font("微软雅黑", Font.PLAIN, 14));
@@ -547,33 +566,46 @@ public class SwingMain {
 						setData("buyerNo", buyerNo2.getText());
 						setData("buyerAccount", account.getText());
 						ja.append(getCurrentTime() + "程序正在启动中……切勿双击【开始】\r\n");
+
+						Model.setBuyerNo(buyerNo2.getText());
+						Model.setPicPath(picPath.getText());
+						Model.setSupplierName(supplierName.getText());
 						BrowserEngine.setInit(Environment, Browser);
+						if (!(registerAccount.getText().equals("")
+								|| registerAccount.getText().equals("若不填写将自动生成"))) {
+							Model.setEmail(registerAccount.getText());
+						}
+						Model.setBuyerAccount(account.getText());
+						Model.setBuyerPassword(password.getText());
+						Model.setSkuNo(SkuNo.getText());
+						Model.setPoNum(po.getText());
+
 						TestNG testNG = new TestNG();
 						List<String> suites = new ArrayList<String>();
 						switch (Scene){
 							case "新增市场商品":
-								Model.setBuyerNo(buyerNo2.getText());
-								Model.setPicPath(picPath.getText());
-								Model.setSupplierName(supplierName.getText());
+//								Model.setBuyerNo(buyerNo2.getText());
+//								Model.setPicPath(picPath.getText());
+//								Model.setSupplierName(supplierName.getText());
 								suites.add(SuitesEnum.ADD_MARKET_GOODS.getSuiteName());
 								break;
 							case "发布团购":
 								AddOriginalGoodsPage.setSupplierName(supplierName.getText());
-								Model.setPicPath(picPath.getText());
+//								Model.setPicPath(picPath.getText());
 								suites.add(SuitesEnum.PUBLISH_GROUP_PURCHASE.getSuiteName());
 								break;
 							case "采购商注册":
-								if (!(registerAccount.getText().equals("")
-										|| registerAccount.getText().equals("若不填写将自动生成"))) {
-									Model.setEmail(registerAccount.getText());
-								}
+//								if (!(registerAccount.getText().equals("")
+//										|| registerAccount.getText().equals("若不填写将自动生成"))) {
+//									Model.setEmail(registerAccount.getText());
+//								}
 								suites.add(SuitesEnum.BUYER_REGISTER.getSuiteName());
 								break;
 							case "成品询价":
-								Model.setBuyerAccount(account.getText());
-								Model.setBuyerPassword(password.getText());
-								Model.setSkuNo(SkuNo.getText());
+//								Model.setBuyerAccount(account.getText());
+//								Model.setBuyerPassword(password.getText());
+//								Model.setSkuNo(SkuNo.getText());
 								if (Model.getIsactivity() == 1) {
 									suites.add(SuitesEnum.ACTIVITY_INQUIRY.getSuiteName());
 								}else {
@@ -581,9 +613,9 @@ public class SwingMain {
 								}
 								break;
 							case "生成PO":
-								Model.setBuyerAccount(account.getText());
-								Model.setBuyerPassword(password.getText());
-								Model.setSkuNo(SkuNo.getText());
+//								Model.setBuyerAccount(account.getText());
+//								Model.setBuyerPassword(password.getText());
+//								Model.setSkuNo(SkuNo.getText());
 								if (Model.getIsactivity() == 1) {
 									suites.add(SuitesEnum.ACTIVITY_SEND_PO.getSuiteName());
 								}else {
@@ -591,18 +623,24 @@ public class SwingMain {
 								}
 								break;
 							case "PO询价":
-								Model.setPoNum(po.getText());
+//								Model.setPoNum(po.getText());
 								suites.add(SuitesEnum.PO_INQUIRY.getSuiteName());
 								break;
 							default : //默认新增原厂商品
 								AddOriginalGoodsPage.setSupplierName(supplierName.getText());
-								Model.setPicPath(picPath.getText());
+//								Model.setPicPath(picPath.getText());
 								suites.add(SuitesEnum.ADD_ORIGINAL_GOODS.getSuiteName());
 								break;
 							case "新增开发商品":
-								Model.setPicPath(picPath.getText());
+//								Model.setPicPath(picPath.getText());
 								suites.add(SuitesEnum.ADD_DEV_GOODS.getSuiteName());
 								break;
+							case "装柜完成":
+//								Model.setBuyerAccount(account.getText());
+//								Model.setBuyerPassword(password.getText());
+//								Model.setPicPath(picPath.getText());
+								suites.add(SuitesEnum.LOAD_FINISH.getSuiteName());
+								break;
 						}
 						testNG.setTestSuites(suites);
 						testNG.run();
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
 <suite name="装柜">
-	<!--<test name="generatePO">
+	<test name="generatePO">
 		<classes>
 			<class name="com.buyer.testSuite.TestAddToCart">
 				<methods>
@@ -25,7 +25,7 @@
 				</methods>
 			</class>
 		</classes>
-	</test>-->
+	</test>
 	<test name="loadContainer">
 		<classes>
 			<class name="com.essa.testSuite.TestLoadContainer">
@@ -37,6 +37,11 @@
 					<include name="dealWithDelivery"/>
 				</methods>
 			</class>
+			<class name="com.essa.testSuite.TestConfirLogistics">
+				<methods>
+					<include name="confirmLogisticsTest"/>
+				</methods>
+			</class>
 		</classes>
 	</test>
 </suite>