曾谨 / EssaAuto

Commit a3e6db11aaefba29e670287d6d22d93c44882643

Authored by zengjin
1 parent 3b58efeb

修改bug

Showing 9 changed files with 55 additions and 57 deletions   Show diff stats
Inline Side-by-side
src/main/java/com/buyer/pageObject/ConslidationPage.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -27,6 +27,14 @@ public class ConslidationPage extends BasePage {
27 27 //选择散货
28 28 @FindBy (xpath ="//button[text()='Bulk cargo']")
29 29 WebElement bulkCargo;
  30 +
  31 + //选择整柜
  32 + @FindBy (xpath = "//button[text()='FCL']")
  33 + WebElement FCL;
  34 +
  35 + //选择40HQ
  36 + @FindBy (xpath = "//*[text()='40HQ']/..")
  37 + WebElement hq40;
30 38  
31 39 //确认
32 40 @FindBy (xpath="//button[text()='OK']")
... ... @@ -72,7 +80,9 @@ public class ConslidationPage extends BasePage {
72 80 forceWait(1000);
73 81 //是否有选择货柜
74 82 if(isVisibility(By.xpath("//button[text()='Bulk cargo']"))) {
75   - click(bulkCargo);
  83 +// click(bulkCargo);
  84 + click(FCL);
  85 + click(hq40);
76 86 click(ok);
77 87 forceWait(1000);
78 88 }
... ...
src/main/java/com/buyer/pageObject/IndexPage.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -90,29 +90,14 @@ public class IndexPage extends BasePage {
90 90 // if (Model.getIsactivity()==0 &&(Model.getSkuNo().equals("选填，勿填活动商品")||Model.getSkuNo().equals(""))) {
91 91 if (Model.getIsactivity()==0 &&(("选填，勿填活动商品").equals(Model.getSkuNo())||("").equals(Model.getSkuNo()))) {
92 92 //判断是否自定义输入商品编号
93   - String sql = "SELECT s.id,s.`no` from prd_category c\r\n" +
94   - "LEFT JOIN prd_goods g on c.id = g.category_id\r\n" +
95   - "LEFT JOIN prd_goods_sku s on s.goods_id = g.id\r\n" +
96   - "where find_in_set(5,REPLACE(c.path,'.',','))\r\n" +
97   - "AND s.`no` > 200000000\r\n" +
98   - "AND s.id NOT IN (SELECT g.sku_id FROM sale_group_buy g)\r\n" +
99   - "AND s.id NOT IN (SELECT t.sku_id FROM sale_shopping_cart t)\r\n" +
100   - "AND s.src = 1\r\n" +
101   - "AND s.`status` = 2\r\n" +
102   - "AND s.is_stop_product = 0\r\n" +
103   - "AND s.is_delete = 0\r\n" +
104   - "limit 1";
  93 + 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" +
  94 + "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" +
  95 + "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;";
105 96 Model.setSkuNo(DBSqlSearch(sql, "no"));
106 97 }else if (Model.getIsactivity()==1 &&(("选填，勿填非活动商品").equals(Model.getSkuNo())||("").equals(Model.getSkuNo()))) {
107 98 //活动商品
108   - String sql = "SELECT s.id,s.`no` from prd_category c\r\n" +
109   - "LEFT JOIN prd_goods g on c.id = g.category_id\r\n" +
110   - "LEFT JOIN prd_goods_sku s on s.goods_id = g.id\r\n" +
111   - "LEFT JOIN sale_group_buy a on a.sku_id = s.id\r\n" +
112   - "where s.`no` > 200000000\r\n" +
113   - "AND s.id NOT IN (SELECT t.sku_id FROM sale_shopping_cart t)\r\n" +
114   - "AND a.`status` = 20 and s.src = 1 \r\n" +
115   - "limit 1;";
  99 + 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" +
  100 + "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;";
116 101 Model.setSkuNo(DBSqlSearch(sql, "no"));
117 102 }
118 103 // System.out.println(Model.getSkuNo());
... ...
src/main/java/com/buyer/pageObject/PayDepositPage.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -26,8 +26,12 @@ public class PayDepositPage extends BasePage {
26 26 WebElement FundDetail;
27 27  
28 28 //免定金模式--确认按钮
29   - @FindBy (xpath ="//*[@ng-click='submit()']")
  29 + @FindBy (xpath ="//button[@class='btn btn-primary queding']")
30 30 WebElement ok;
  31 +
  32 + //其他支付模式
  33 + @FindBy (xpath = "//button[@class='btn btn-primary btn-sm loading']")
  34 + WebElement confirm;
31 35  
32 36 //po单号
33 37 @FindBy (xpath ="//*[contains(text(),'PO number:')]/../../td[2]/span")
... ... @@ -38,6 +42,7 @@ public class PayDepositPage extends BasePage {
38 42 * @return AssetManagementPage
39 43 */
40 44 public AssetManagementPage toAssetManagementPage() {
  45 +
41 46 click(FundDetail);
42 47 return new AssetManagementPage(driver);
43 48 }
... ... @@ -48,6 +53,9 @@ public class PayDepositPage extends BasePage {
48 53 */
49 54 public MyOrderPage confirm() {
50 55 click(ok);
  56 + if(isVisibility(By.xpath("//button[@class='btn btn-primary btn-sm loading']"))){
  57 + click(confirm);
  58 + }
51 59 return new MyOrderPage(driver);
52 60 }
53 61  
... ... @@ -58,7 +66,8 @@ public class PayDepositPage extends BasePage {
58 66 if (isVisibility(By.xpath("//button[@class='submit-payment-deposit-button btn btn-primary']"))) {
59 67 //如果是可用资金不足，跳转到资金管理
60 68 toAssetManagementPage();
61   - }else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) {
  69 +// }else if (isVisibility(By.xpath("//*[@ng-click='submit()']"))) {
  70 + }else {
62 71 //免定金模式，确认po，跳转到我的订单列表
63 72 confirm();
64 73 }
... ...
src/main/java/com/buyer/pageObject/SettingMarksPage.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -19,6 +19,10 @@ public class SettingMarksPage extends BasePage {
19 19 //不应用唛头
20 20 @FindBy (xpath ="//*[@title='No shipping marks for these products']")
21 21 WebElement noNeedMarks;
  22 +
  23 + //第一个唛头
  24 + @FindBy (xpath = "//ul[@class='list']/li[2]")
  25 + WebElement firstMarks;
22 26  
23 27 //下一步
24 28 @FindBy (xpath ="//*[text()='Next step']")
... ... @@ -37,6 +41,9 @@ public class SettingMarksPage extends BasePage {
37 41 forceWait(1000);
38 42 }*/
39 43 dynamicWait(By.xpath("//*[@title='No shipping marks for these products']"));
  44 + if(isVisibility(By.xpath("//ul[@class='list']/li[2]"))){
  45 + click(firstMarks);
  46 + }
40 47 click(noNeedMarks);
41 48 click(next);
42 49 forceWait(500);
... ...
src/main/java/com/buyer/pageObject/SettingStickerPage.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -18,7 +18,11 @@ public class SettingStickerPage extends BasePage {
18 18 //不应用贴纸
19 19 @FindBy (xpath ="//*[@title='No stickers for these products']")
20 20 WebElement noNeedSticker;
21   -
  21 +
  22 + //第一个贴纸
  23 + @FindBy (xpath = "//ul[@class='list']/li[2]")
  24 + WebElement firstSticker;
  25 +
22 26 //下一步
23 27 @FindBy (xpath ="//*[text()='Next step']")
24 28 WebElement next;
... ... @@ -32,10 +36,10 @@ public class SettingStickerPage extends BasePage {
32 36 * @return OrderPreviewPage
33 37 */
34 38 public OrderPreviewPage setSticker() {
35   - /*while (!(isVisibility(By.xpath("//*[@title='No stickers for these products']")))) {
36   - forceWait(1000);
37   - }*/
38 39 dynamicWait(By.xpath("//*[@title='No stickers for these products']"));
  40 + if (isVisibility(By.xpath("//ul[@class='list']/li[2]"))){
  41 + click(firstSticker);
  42 + }
39 43 click(noNeedSticker);
40 44 click(next);
41 45 click(ok);
... ...
src/main/java/com/essa/framework/BasePage.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -434,7 +434,7 @@ public class BasePage {
434 434 Toolkit.getDefaultToolkit().getSystemClipboard().setContents(sel, null);
435 435 // 新建一个Robot类的对象
436 436 Robot robot = new Robot();
437   - Thread.sleep(1000);
  437 + Thread.sleep(2000);
438 438  
439 439 // 按下回车
440 440 robot.keyPress(KeyEvent.VK_ENTER);
... ...
src/main/java/com/essa/framework/Model.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -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 = "A181120T9194B";//po单号
  18 + public static String poNum = "A181120T9194A";//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/StorageManage/HandlingLoadingOrders.java
  Show/Hide comments   View file @a3e6db1
... ... @@ -30,28 +30,9 @@ public class HandlingLoadingOrders extends BasePage {
30 30 WebElement loadCompleteDate;
31 31  
32 32 //获取装柜商品列表
33   - //@FindBy(xpath ="//td[@ng-repeat='item in taskInfo.skuList']")
34   - //WebElement tdList;
35 33 @FindBy(xpath = "//tbody[2]/tr[1]/td[6]")
36 34 WebElement firstTr;//定位第一行
37 35  
38   -// //获取元素列表循环读取值
39   -// public ArrayList<String> getTrtd() {
40   -// String trs=testtrList.getText();
41   -//
42   -// WebElement temp;
43   -// for (int kk=0;kk<0;kk++){
44   -// temp= driver.findElement(By.xpath("//tbody[2]/tr["+kk+"]/td[6]"));
45   -// temp.getText();
46   -//
47   -// }
48   -
49   -// ArrayList arryList = new ArrayList();
50   -// //arryList.set(0,trs);
51   -// System.out.print(trs+"123456789---------");
52   -// return arryList;
53   -// }
54   -
55 36 //输入实装箱数
56 37 @FindBy(xpath = "//input[@id='actLoadBoxQuantity']")
57 38 WebElement realNumber;
... ... @@ -60,21 +41,23 @@ public class HandlingLoadingOrders extends BasePage {
60 41 @FindBy(xpath = "//*[text()='提交']")
61 42 WebElement submit;
62 43  
  44 + //可装柜箱数
  45 + @FindBy (xpath = "//tr[@class='ng-scope']//td[6]/div")
  46 + WebElement canLoadNum;
  47 +
63 48 /**
64 49 * 设置装柜处理参数
65 50 */
66 51 public HandlingLoadingOrders setHandlingCabinet() {
67   - dynamicLoad(By.xpath("//div[@style='display: none;' and @id='mask']"));
  52 + forceWait(1000);
68 53 //设置实际装柜日期
69 54 jsExecutorRemoveAttribute(loadCompleteDate, "readonly");
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());
76 55 click(loadCompleteDate);
77 56 paste(Tools.getFormatTime());
  57 + String context = canLoadNum.getText();
  58 + String nums = context.substring(0,2);
  59 + int num = Integer.parseInt(nums)-8;
  60 + sendKeys(realNumber,num+"");
78 61 click(submit);
79 62 dynamicLoad();
80 63 return new HandlingLoadingOrders(driver);
... ...
src/main/resources/data.xml
  Show/Hide comments   View file @a3e6db1
... ... @@ -2,8 +2,8 @@
2 2 <test>
3 3 <data>
4 4 <!-- <buyerAccount>buyer11159@essa.cn</buyerAccount> -->
5   - <buyerAccount>meng18@essa.cn</buyerAccount>
6   - <supplier>ESSA</supplier>
  5 + <buyerAccount>yang471872497@163.com</buyerAccount>
  6 + <supplier>物料分析</supplier>
7 7 <buyerNo>COK09161</buyerNo>
8 8 </data>
9 9 </test>
... ...