修改bug

zengjin
1 parent 3b58efeb
Showing 9 changed files with 55 additions and 57 deletions Show diff stats
src/main/java/com/buyer/pageObject/ConslidationPage.java
src/main/java/com/buyer/pageObject/IndexPage.java
src/main/java/com/buyer/pageObject/PayDepositPage.java
src/main/java/com/buyer/pageObject/SettingMarksPage.java
src/main/java/com/buyer/pageObject/SettingStickerPage.java
src/main/java/com/essa/framework/BasePage.java
src/main/java/com/essa/framework/Model.java
src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java
src/main/resources/data.xml
@@ -27,6 +27,14 @@ public class ConslidationPage extends BasePage {
 	//选择散货
 	@FindBy (xpath ="//button[text()='Bulk cargo']")
 	WebElement bulkCargo;
+
+	//选择整柜
+	@FindBy (xpath = "//button[text()='FCL']")
+	WebElement FCL;
+
+	//选择40HQ
+	@FindBy (xpath = "//*[text()='40HQ']/..")
+	WebElement hq40;
 	//确认
 	@FindBy (xpath="//button[text()='OK']")
@@ -72,7 +80,9 @@ public class ConslidationPage extends BasePage {
 		forceWait(1000);
 		//是否有选择货柜
 		if(isVisibility(By.xpath("//button[text()='Bulk cargo']"))) {
-			click(bulkCargo);
+//			click(bulkCargo);
+			click(FCL);
+			click(hq40);
 			click(ok);
 			forceWait(1000);
 		}
@@ -90,29 +90,14 @@ public class IndexPage extends BasePage {
 //		if (Model.getIsactivity()==0 &&(Model.getSkuNo().equals("选填，勿填活动商品")||Model.getSkuNo().equals(""))) {
 		if (Model.getIsactivity()==0 &&(("选填，勿填活动商品").equals(Model.getSkuNo())||("").equals(Model.getSkuNo()))) {
 			//判断是否自定义输入商品编号
-			String sql = "SELECT s.id,s.`no` from prd_category c\r\n" + 
-					"LEFT JOIN prd_goods g on c.id = g.category_id\r\n" + 
-					"LEFT JOIN prd_goods_sku s on s.goods_id = g.id\r\n" + 
-					"where find_in_set(5,REPLACE(c.path,'.',','))\r\n" + 
-					"AND s.`no` > 200000000\r\n" + 
-					"AND s.id NOT IN (SELECT g.sku_id FROM sale_group_buy g)\r\n" + 
-					"AND s.id NOT IN (SELECT	t.sku_id FROM	sale_shopping_cart t)\r\n" + 
-					"AND s.src = 1\r\n" + 
-					"AND s.`status` = 2\r\n" + 
-					"AND s.is_stop_product = 0\r\n" + 
-					"AND s.is_delete = 0\r\n" + 
-					"limit 1";
+			String sql = "SELECT s.id,s.`no` from prd_category c LEFT JOIN prd_goods g on c.id = g.category_id LEFT JOIN prd_goods_sku s on s.goods_id = g.id where find_in_set(5,REPLACE(c.path,'.',',')) AND s.`no` > 200120000\n" +
+					"AND s.id NOT IN (SELECT g.sku_id FROM sale_group_buy g) AND s.id NOT IN (SELECT t.sku_id FROM sale_shopping_cart t) AND s.src = 1 AND s.`status` = 2 AND s.is_stop_product = 0 AND s.is_delete = 0 \n" +
+					"AND g.is_category_error = 0 AND G.is_attribute_error = 0 AND G.is_option_error = 0 AND G.is_spec_error = 0 limit 1;";
 			Model.setSkuNo(DBSqlSearch(sql, "no"));
 		}else if (Model.getIsactivity()==1 &&(("选填，勿填非活动商品").equals(Model.getSkuNo())||("").equals(Model.getSkuNo()))) {
 			//活动商品	
-			String sql = "SELECT s.id,s.`no` from prd_category c\r\n" + 
-					"LEFT JOIN prd_goods g on c.id = g.category_id\r\n" + 
-					"LEFT JOIN prd_goods_sku s on s.goods_id = g.id\r\n" + 
-					"LEFT JOIN sale_group_buy a on a.sku_id = s.id\r\n" + 
-					"where s.`no` > 200000000\r\n" + 
-					"AND s.id NOT IN (SELECT	t.sku_id FROM	sale_shopping_cart t)\r\n" + 
-					"AND a.`status` = 20 and s.src = 1 \r\n" + 
-					"limit 1;";
+			String sql = "SELECT s.id,s.`no` from prd_category c LEFT JOIN prd_goods g on c.id = g.category_id LEFT JOIN prd_goods_sku s on s.goods_id = g.id LEFT JOIN sale_group_buy a on a.sku_id = s.id \n" +
+					"where s.`no` > 200000000 AND s.id NOT IN (SELECT t.sku_id FROM sale_shopping_cart t) AND a.`status` = 20 and s.src = 1 AND g.is_category_error = 0 AND G.is_attribute_error = 0 AND G.is_option_error = 0 AND G.is_spec_error = 0 limit 1;";
 			Model.setSkuNo(DBSqlSearch(sql, "no"));
 		}
 //		System.out.println(Model.getSkuNo());
@@ -26,8 +26,12 @@ public class PayDepositPage extends BasePage {
 	WebElement FundDetail;
 	//免定金模式--确认按钮
-	@FindBy (xpath ="//*[@ng-click='submit()']")
+	@FindBy (xpath ="//button[@class='btn btn-primary queding']")
 	WebElement ok;
+
+	//其他支付模式
+	@FindBy (xpath = "//button[@class='btn btn-primary btn-sm loading']")
+	WebElement confirm;
 	//po单号
 	@FindBy (xpath ="//*[contains(text(),'PO number:')]/../../td[2]/span")
@@ -38,6 +42,7 @@ public class PayDepositPage extends BasePage {
 	 * @return AssetManagementPage
 	 */
 	public AssetManagementPage toAssetManagementPage() {
+
 		click(FundDetail);
 		return new AssetManagementPage(driver);
 	}
@@ -48,6 +53,9 @@ public class PayDepositPage extends BasePage {
 	 */
 	public MyOrderPage confirm() {
 		click(ok);
+		if(isVisibility(By.xpath("//button[@class='btn btn-primary btn-sm loading']"))){
+			click(confirm);
+		}
 		return new MyOrderPage(driver);
 	}
@@ -58,7 +66,8 @@ public class PayDepositPage extends BasePage {
 		if (isVisibility(By.xpath("//button[@class='submit-payment-deposit-button btn btn-primary']"))) {
 			//如果是可用资金不足，跳转到资金管理
 			toAssetManagementPage();
-		}else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) {
+//		}else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) {
+		}else {
 			//免定金模式，确认po，跳转到我的订单列表
 			confirm();
 		}
@@ -19,6 +19,10 @@ public class SettingMarksPage extends BasePage {
 	//不应用唛头
 	@FindBy (xpath ="//*[@title='No shipping marks for these products']")
 	WebElement noNeedMarks;
+
+	//第一个唛头
+	@FindBy (xpath = "//ul[@class='list']/li[2]")
+	WebElement firstMarks;
 	//下一步
 	@FindBy (xpath ="//*[text()='Next step']")
@@ -37,6 +41,9 @@ public class SettingMarksPage extends BasePage {
 			forceWait(1000);
 		}*/
 		dynamicWait(By.xpath("//*[@title='No shipping marks for these products']"));
+		if(isVisibility(By.xpath("//ul[@class='list']/li[2]"))){
+			click(firstMarks);
+		}
 		click(noNeedMarks);
 		click(next);
 		forceWait(500);
@@ -18,7 +18,11 @@ public class SettingStickerPage extends BasePage {
 	//不应用贴纸
 	@FindBy (xpath ="//*[@title='No stickers for these products']")
 	WebElement noNeedSticker;
-	
+
+	//第一个贴纸
+	@FindBy (xpath = "//ul[@class='list']/li[2]")
+	WebElement firstSticker;
+
 	//下一步
 	@FindBy (xpath ="//*[text()='Next step']")
 	WebElement next;
@@ -32,10 +36,10 @@ public class SettingStickerPage extends BasePage {
 	 * @return OrderPreviewPage
 	 */
 	public OrderPreviewPage setSticker() {
-		/*while (!(isVisibility(By.xpath("//*[@title='No stickers for these products']")))) {
-			forceWait(1000);
-		}*/
 		dynamicWait(By.xpath("//*[@title='No stickers for these products']"));
+		if (isVisibility(By.xpath("//ul[@class='list']/li[2]"))){
+			click(firstSticker);
+		}
 		click(noNeedSticker);
 		click(next);
 		click(ok);
@@ -434,7 +434,7 @@ public class BasePage {
 			Toolkit.getDefaultToolkit().getSystemClipboard().setContents(sel, null);
 			// 新建一个Robot类的对象
 			Robot robot = new Robot();
-			Thread.sleep(1000);
+			Thread.sleep(2000);
 			// 按下回车
 			robot.keyPress(KeyEvent.VK_ENTER);
@@ -15,7 +15,7 @@ public class Model {
 	public static String env;//所选环境
 	public static String buyerAccount;//采购商账号
 	public static String buyerPassword;//采购商密码
-	public static String poNum = "A181120T9194B";//po单号
+	public static String poNum = "A181120T9194A";//po单号
 	public static int isactivity=0;//是否是活动商品 1：是 0：否 
 	public static String manager;//商品的类目经理
 	public static String serialNum;//待办流水号
@@ -30,28 +30,9 @@ public class HandlingLoadingOrders extends BasePage {
     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<String> 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;
@@ -60,21 +41,23 @@ public class HandlingLoadingOrders extends BasePage {
     @FindBy(xpath = "//*[text()='提交']")
     WebElement submit;
+    //可装柜箱数
+    @FindBy (xpath = "//tr[@class='ng-scope']//td[6]/div")
+    WebElement canLoadNum;
+
     /**
      * 设置装柜处理参数
      */
     public HandlingLoadingOrders setHandlingCabinet() {
-        dynamicLoad(By.xpath("//div[@style='display: none;' and @id='mask']"));
+        forceWait(1000);
         //设置实际装柜日期
         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(loadCompleteDate);
         paste(Tools.getFormatTime());
+        String context = canLoadNum.getText();
+        String nums = context.substring(0,2);
+        int num = Integer.parseInt(nums)-8;
+        sendKeys(realNumber,num+"");
         click(submit);
         dynamicLoad();
         return new HandlingLoadingOrders(driver);
@@ -2,8 +2,8 @@
 <test>
 	<data>
 		<!-- <buyerAccount>buyer11159@essa.cn</buyerAccount> -->
-		<buyerAccount>meng18@essa.cn</buyerAccount>
-		<supplier>ESSA</supplier>
+		<buyerAccount>yang471872497@163.com</buyerAccount>
+		<supplier>物料分析</supplier>
 		<buyerNo>COK09161</buyerNo>
 	</data>
 </test>