From 3b58efeb96fdf8e1acd84cd45a3551a4019dfe95 Mon Sep 17 00:00:00 2001 From: zengjin Date: Mon, 5 Nov 2018 12:04:28 +0800 Subject: [PATCH] 调试完成 --- src/main/java/com/essa/framework/BasePage.java | 35 ++++++++++++++++++++++++++++++++--- src/main/java/com/essa/framework/Model.java | 4 ++-- src/main/java/com/essa/framework/Tools.java | 15 +++++++++++++++ src/main/java/com/essa/pageObject/LogisticShipp/BookingCarPage.java | 4 +++- src/main/java/com/essa/pageObject/LogisticShipp/CabinInfoPage.java | 9 ++------- src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java | 4 +++- src/main/java/com/essa/testSuite/TestLoadContainer.java | 2 +- src/main/java/swing/SwingMain.java | 72 ++++++++++++++++++++++++++++-------------------------------------------- 8 files changed, 86 insertions(+), 59 deletions(-) diff --git a/src/main/java/com/essa/framework/BasePage.java b/src/main/java/com/essa/framework/BasePage.java index f2b7c24..87d5f8d 100644 --- a/src/main/java/com/essa/framework/BasePage.java +++ b/src/main/java/com/essa/framework/BasePage.java @@ -676,7 +676,11 @@ public class BasePage { */ protected void dynamicWait(By by) { for(int count=0;count<14&&!(isVisibility(by));count++) { - forceWait(500); + try { + Thread.sleep(500); + } catch (Exception e) { + Logger.Output(LogType.LogTypeName.ERROR, "强行等待失败"); + } } } // /** @@ -692,7 +696,11 @@ public class BasePage { */ protected void dynamicLoad(By by) { for(int count=0;count<14&&isVisibility(by);count++) { - forceWait(500); + try { + Thread.sleep(500); + } catch (Exception e) { + Logger.Output(LogType.LogTypeName.ERROR, "强行等待失败"); + } } } /** @@ -723,6 +731,27 @@ public class BasePage { } return null; } + + /** + *粘贴方法 + * @param content 要粘贴的文本 + * @return + */ + protected void paste(String content){ + StringSelection stringSelection = new StringSelection(content); + Toolkit.getDefaultToolkit().getSystemClipboard() + .setContents(stringSelection, null); + Robot robot = null; + try { + robot = new Robot(); + } catch (Exception e1) { + e1.printStackTrace(); + } + robot.keyPress(KeyEvent.VK_CONTROL); + robot.keyPress(KeyEvent.VK_V); + robot.keyRelease(KeyEvent.VK_V); + robot.keyRelease(KeyEvent.VK_CONTROL); + } /** * 获取当前系统时间，得到格式化时间字符串 @@ -736,5 +765,5 @@ public class BasePage { return df.format(date); - } + } } \ No newline at end of file diff --git a/src/main/java/com/essa/framework/Model.java b/src/main/java/com/essa/framework/Model.java index 1251c93..ab2df5a 100644 --- a/src/main/java/com/essa/framework/Model.java +++ b/src/main/java/com/essa/framework/Model.java @@ -15,13 +15,13 @@ public class Model { public static String env;//所选环境 public static String buyerAccount;//采购商账号 public static String buyerPassword;//采购商密码 - public static String poNum = "A181117T9194B";//po单号 + public static String poNum = "A181120T9194B";//po单号 public static int isactivity=0;//是否是活动商品 1：是 0：否 public static String manager;//商品的类目经理 public static String serialNum;//待办流水号 public static String materialName;//物料名称 public static String projectName;//项目立项书名称 - public static String salesman="yanqingping";//业务员 + public static String salesman;//业务员 public static String getSalesman() { return salesman; diff --git a/src/main/java/com/essa/framework/Tools.java b/src/main/java/com/essa/framework/Tools.java index 2a93139..2ef03fa 100644 --- a/src/main/java/com/essa/framework/Tools.java +++ b/src/main/java/com/essa/framework/Tools.java @@ -27,6 +27,21 @@ public class Tools { String time = format.format(today); return time; } + /** + *格式化当前时间，由于服务器时间与北京时间有误差，这里取值当前时间-5分钟 + * @param + * @return yyyy/MM/dd HH:mm:ss + */ + public static String getFormatTime(){ + SimpleDateFormat format = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); + Date today = new Date(); + Calendar cal = Calendar.getInstance(); + cal.setTime(today); + cal.add(Calendar.MINUTE,-5); + today = cal.getTime(); + String time = format.format(today); + return time; + } /** * 获取当前分和秒，另外加一个随机数，作为注册邮箱的区分的数字 diff --git a/src/main/java/com/essa/pageObject/LogisticShipp/BookingCarPage.java b/src/main/java/com/essa/pageObject/LogisticShipp/BookingCarPage.java index b1b4cc6..b591bb5 100644 --- a/src/main/java/com/essa/pageObject/LogisticShipp/BookingCarPage.java +++ b/src/main/java/com/essa/pageObject/LogisticShipp/BookingCarPage.java @@ -58,7 +58,9 @@ public class BookingCarPage extends BasePage { click(BookingCarSeclType); // mywait(BookingCarDate); jsExecutorRemoveAttribute(BookingCarDate, "readonly"); - sendKeys(BookingCarDate, Tools.getToday()); +// sendKeys(BookingCarDate,); + click(BookingCarDate); + paste(Tools.getFormatTime()); click(SubmitBtn); return new BookingCarPage(driver); } diff --git a/src/main/java/com/essa/pageObject/LogisticShipp/CabinInfoPage.java b/src/main/java/com/essa/pageObject/LogisticShipp/CabinInfoPage.java index 6e1096f..bc3f781 100644 --- a/src/main/java/com/essa/pageObject/LogisticShipp/CabinInfoPage.java +++ b/src/main/java/com/essa/pageObject/LogisticShipp/CabinInfoPage.java @@ -71,22 +71,17 @@ public class CabinInfoPage extends BasePage { mywait(FirstDate); SetQuery.sendKeys(Model.getPoNum()); click(QueryBtn); -// 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, Tools.getToday());//最后装柜时间设置为今天 -// LastLoadTimeSet.sendKeys("10/23/2018"); + click(LastLoadTimeSet); + paste(Tools.getFormatTime());//用键盘粘贴的方式填入时间 click(Body); -// jsExecutorClick(FileUp); actionClick(FileUp); uploadFile(Model.getPicPath()); -// forceWait(2000); dynamicLoad(By.xpath("//img[@ng-src='/img/nopic.jpg']"));//直到默认的图片找不到时，执行下一步 click(CommitBtn); dynamicLoad(); diff --git a/src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java b/src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java index 8c9e74d..be7f54a 100644 --- a/src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java +++ b/src/main/java/com/essa/pageObject/StorageManage/HandlingLoadingOrders.java @@ -72,7 +72,9 @@ public class HandlingLoadingOrders extends BasePage { // SimpleDateFormat zs=new SimpleDateFormat("MM/dd/yyyy"); // String s =zs.format(new Date()); // sendKeys(loadCompleteDate,s); - sendKeys(loadCompleteDate, Tools.getToday()); +// sendKeys(loadCompleteDate, Tools.getToday()); + click(loadCompleteDate); + paste(Tools.getFormatTime()); click(submit); dynamicLoad(); return new HandlingLoadingOrders(driver); diff --git a/src/main/java/com/essa/testSuite/TestLoadContainer.java b/src/main/java/com/essa/testSuite/TestLoadContainer.java index 408e268..57c47dc 100644 --- a/src/main/java/com/essa/testSuite/TestLoadContainer.java +++ b/src/main/java/com/essa/testSuite/TestLoadContainer.java @@ -146,7 +146,7 @@ public class TestLoadContainer extends BaseTest { @Test(description = "通知确认船务资料、订车、发车") public void confirmLogisticsTest() { this.driver = getDriver(); - loginValid("chenhong"); + loginValid("chenhong");// HomePage homePage = PageFactory.initElements(driver, HomePage.class); homePage.toLogisticsShippPage(); diff --git a/src/main/java/swing/SwingMain.java b/src/main/java/swing/SwingMain.java index 7eb799a..144046e 100644 --- a/src/main/java/swing/SwingMain.java +++ b/src/main/java/swing/SwingMain.java @@ -164,9 +164,6 @@ public class SwingMain { frmvBy.getContentPane().add(ToCart); ToCart.setLayout(null); - - - //可视化操作选项 JLabel label_1 = new JLabel("可视化操作："); label_1.setBounds(10, 119, 88, 15); @@ -268,6 +265,19 @@ public class SwingMain { browser.setBounds(102, 147, 114, 20); browser.setModel(new DefaultComboBoxModel(new String[] { "Chrome", "Firefox", "IE" })); frmvBy.getContentPane().add(browser); + + //选择图片 + JButton button = new JButton("选择图片"); + button.setFont(new Font("微软雅黑", Font.PLAIN, 14)); + button.setBounds(91, 44, 91, 23); + addOriginal.add(button); + + //必填 + final JLabel notnull = new JLabel("*必填"); + notnull.setFont(new Font("微软雅黑", Font.PLAIN, 12)); + notnull.setBounds(192, 48, 42, 15); + addOriginal.add(notnull); + notnull.setForeground(Color.RED); //场景选择，根据随选场景做对应的交互 final JComboBox selectScene = new JComboBox(); @@ -282,6 +292,10 @@ public class SwingMain { ToCart.setVisible(false); POInquiry.setVisible(false); register.setVisible(false); + addOriginal.add(button); + addOriginal.add(notnull); + button.setBounds(91, 44, 91, 23); + notnull.setBounds(192, 48, 42, 15); // loadFinish.setVisible(false); switch ((String)selectScene.getSelectedItem()){ default: @@ -332,10 +346,14 @@ public class SwingMain { ja.append(getCurrentTime() + "已选择场景：新增开发商品\r\n"); break; case "装柜完成": + process.setText( + "装柜流程：
1.添加商品到购物车
2.询价并拼柜生成PO
3.发单、制单
4.仓储管理、船务管理至装柜完成


"); + button.setBounds(0, 120, 91, 23); + notnull.setBounds(100, 125, 42, 15); + process.add(button); + process.add(notnull); ToCart.setVisible(true); ja.append(getCurrentTime() + "已选择场景：装柜完成，将重启浏览器多次\r\n"); - process.setText( - "装柜流程：
1.添加商品到购物车
2.询价并拼柜生成PO
3.仓储管理船务管理至装柜完成


"); break; } } @@ -358,36 +376,19 @@ public class SwingMain { supplierName.setText(supplier); supplierName.setColumns(10); - //选择图片 - JButton button = new JButton("选择图片"); - button.setFont(new Font("微软雅黑", Font.PLAIN, 14)); - button.setBounds(91, 44, 91, 23); - addOriginal.add(button); JLabel lblSku = new JLabel("商品图片："); lblSku.setFont(new Font("微软雅黑", Font.PLAIN, 14)); lblSku.setBounds(22, 48, 70, 15); addOriginal.add(lblSku); - final JLabel label_7 = new JLabel("*必填"); - label_7.setFont(new Font("微软雅黑", Font.PLAIN, 12)); - label_7.setBounds(192, 48, 42, 15); - addOriginal.add(label_7); - label_7.setForeground(Color.RED); + //图片地址 final JLabel picPath = new JLabel(""); 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)); @@ -419,7 +420,7 @@ public class SwingMain { } else { ja.append(getCurrentTime() + "选择的图片为：" + s + "\r\n"); picPath.setText(s); - label_7.setText("已选"); + notnull.setText("已选"); } } }); @@ -585,27 +586,16 @@ public class SwingMain { switch (Scene){ case "新增市场商品": -// 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()); suites.add(SuitesEnum.PUBLISH_GROUP_PURCHASE.getSuiteName()); break; case "采购商注册": -// 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()); if (Model.getIsactivity() == 1) { suites.add(SuitesEnum.ACTIVITY_INQUIRY.getSuiteName()); }else { @@ -613,9 +603,6 @@ public class SwingMain { } break; case "生成PO": -// Model.setBuyerAccount(account.getText()); -// Model.setBuyerPassword(password.getText()); -// Model.setSkuNo(SkuNo.getText()); if (Model.getIsactivity() == 1) { suites.add(SuitesEnum.ACTIVITY_SEND_PO.getSuiteName()); }else { @@ -623,22 +610,16 @@ public class SwingMain { } break; case "PO询价": -// Model.setPoNum(po.getText()); suites.add(SuitesEnum.PO_INQUIRY.getSuiteName()); break; default : //默认新增原厂商品 AddOriginalGoodsPage.setSupplierName(supplierName.getText()); -// Model.setPicPath(picPath.getText()); suites.add(SuitesEnum.ADD_ORIGINAL_GOODS.getSuiteName()); break; case "新增开发商品": -// 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; } @@ -677,6 +658,9 @@ public class SwingMain { ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n"); ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n"); break; + case "装柜完成": + ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n"); + break; } return null; } -- libgit2 0.21.2