From 0571f51449aa0ff0956e74c38245ae4c41e4f2b2 Mon Sep 17 00:00:00 2001 From: zengjin Date: Tue, 30 Oct 2018 16:41:29 +0800 Subject: [PATCH] 增加swing新增开发商品 --- src/main/java/com/essa/framework/SuitesEnum.java | 3 ++- src/main/java/swing/SwingMain.java | 293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----------------------------------------------------------------------------------------------------------------------------------------------- 2 files changed, 152 insertions(+), 144 deletions(-) diff --git a/src/main/java/com/essa/framework/SuitesEnum.java b/src/main/java/com/essa/framework/SuitesEnum.java index ca99c98..88487f1 100644 --- a/src/main/java/com/essa/framework/SuitesEnum.java +++ b/src/main/java/com/essa/framework/SuitesEnum.java @@ -18,7 +18,8 @@ public enum SuitesEnum { PRODUCT_INQUIRY("PRODUCT_INQUIRY","productInquiry.xml","成品询价(正常)"), ACTIVITY_SEND_PO("ACTIVITY_SEND_PO","activitySendPO.xml","生成PO(活动)"), SEND_PO("SEND_PO","sendPO.xml","生成PO(正常)"), - PO_INQUIRY("PO_INQUIRY","POInquiry.xml","PO询价") + PO_INQUIRY("PO_INQUIRY","POInquiry.xml","PO询价"), + ADD_DEV_GOODS("ADD_DEV_GOODS","addDevGoods.xml","新增开发商品"); ; /** diff --git a/src/main/java/swing/SwingMain.java b/src/main/java/swing/SwingMain.java index 0d67e09..7514c65 100644 --- a/src/main/java/swing/SwingMain.java +++ b/src/main/java/swing/SwingMain.java @@ -201,6 +201,7 @@ public class SwingMain { POnum.setBounds(25, 5, 68, 25); POInquiry.add(POnum); + // po单号文本值 po = new JTextField(); po.setBounds(90, 6, 110, 25); @@ -239,23 +240,23 @@ public class SwingMain { //场景选择，插入对应的值，并打印在日志上 final JComboBox selectSystem = new JComboBox(); selectSystem.setBounds(102, 51, 114, 20); - selectSystem.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if ("SIT".equals((String) selectSystem.getSelectedItem())) { - Model.setEnv("SIT"); - ja.append(getCurrentTime() + "已选择环境：SIT\r\n"); - } else if ("DIT".equals((String) selectSystem.getSelectedItem())) { - Model.setEnv("DIT"); - ja.append(getCurrentTime() + "已选择环境：DIT\r\n"); - } else if ("HOTFIX".equals((String) selectSystem.getSelectedItem())) { - Model.setEnv("HOTFIX"); - ja.append(getCurrentTime() + "已选择环境：HOTFIX\r\n"); - } else if ("UAT".equals((String) selectSystem.getSelectedItem())) { - Model.setEnv("UAT"); - ja.append(getCurrentTime() + "已选择环境：UAT\r\n"); - } - } - }); +// selectSystem.addActionListener(new ActionListener() { +// public void actionPerformed(ActionEvent e) { +// if ("SIT".equals((String) selectSystem.getSelectedItem())) { +// Model.setEnv("SIT"); +// ja.append(getCurrentTime() + "已选择环境：SIT\r\n"); +// } else if ("DIT".equals((String) selectSystem.getSelectedItem())) { +// Model.setEnv("DIT"); +// ja.append(getCurrentTime() + "已选择环境：DIT\r\n"); +// } else if ("HOTFIX".equals((String) selectSystem.getSelectedItem())) { +// Model.setEnv("HOTFIX"); +// ja.append(getCurrentTime() + "已选择环境：HOTFIX\r\n"); +// } else if ("UAT".equals((String) selectSystem.getSelectedItem())) { +// Model.setEnv("UAT"); +// ja.append(getCurrentTime() + "已选择环境：UAT\r\n"); +// } +// } +// }); selectSystem.setFont(new Font("微软雅黑", Font.PLAIN, 14)); for (EnvEnum envEnum : EnvEnum.values()) { selectSystem.addItem(envEnum.getCode()); @@ -299,52 +300,59 @@ public class SwingMain { ToCart.setVisible(false); POInquiry.setVisible(false); register.setVisible(false); - if ("新增原厂商品".equals((String) selectScene.getSelectedItem())) { - process.setText( - "新增原厂商品场景流程:
1.商品建档
2.更新商品图片
3.审核商品
4.检查商品库，验证是否新增成功
PS：以上均由账号（linxun）操作

"); - addOriginal.setVisible(true); - ja.append(getCurrentTime() + "已选择场景：新增原厂商品\r\n"); - } else if ("新增市场商品".equals((String) selectScene.getSelectedItem())) { - process.setText("新增市场商品场景流程：
" + "1.指定采购商编号(默认:RUS00833)
" - + "2.使用账号（maomeixiang)对指定采购商进行市场商品建档并选择审核人为\"邢昌勇\"
" - + "3.使用账号（xingchangyong）对市场商品审核
"); - addOriginal.setVisible(true); - addMarket.setVisible(true); - ja.append(getCurrentTime() + "已选择场景：新增市场商品\r\n"); - } else if ("发布团购".equals((String) selectScene.getSelectedItem())) { - ja.append(getCurrentTime() + "已选择场景：发布团购，运行过程中将会打开关闭浏览器2次！\r\n"); - process.setText( - "发布团购场景流程：
1.先执行新增原厂商品流程，生成一个原厂SKU
2.使用账号（linrong）为新增的SKU分配类目经理
3.团购设置中添加该SKU，并发布团购，验证团购发布结果"); - addOriginal.setVisible(true); - } else if ("采购商注册".equals((String) selectScene.getSelectedItem())) { - register.setVisible(true); - ja.append(getCurrentTime() + "已选择场景：采购商注册，运行过程中将会打开关闭浏览器2次！\r\n"); - process.setText( - "采购商注册流程：
1.使用账号（admin）在bpms后台生成一个邀请码
2.采购商平台填写注册信息，并填入上一步生成的邀请码
PS:新账号密码默认为：essa123


"); - } else if ("添加SKU至购物车".equals((String) selectScene.getSelectedItem())) { - ToCart.setVisible(true); - ja.append(getCurrentTime() + "已选择场景：添加SKU至购物车\r\n"); - process.setText( - "添加SKU至购物车流程：
1.Buyer平台根据填入的采购
商信息进行登录操作
2.若未填写商品编号，将从数
据库随机查出一个符合要求的
sku添加至购物车


"); - } else if ("成品询价".equals((String) selectScene.getSelectedItem())) { - ToCart.setVisible(true); - ja.append(getCurrentTime() + "已选择场景：成品询价，将重启浏览器多次\r\n"); - process.setText( - "成品询价流程：
1.Buyer平台根据填入的采购
商信息加入sku，若未填写sku
编号，将随机从数据库获取符
合要求的sku
2.bpms后台登录账号（chenhong）对该sku进行成
品询价审核
"); - } else if ("生成PO".equals((String) selectScene.getSelectedItem())) { - ToCart.setVisible(true); - ja.append(getCurrentTime() + "已选择场景：生成PO，将重启浏览器多次\r\n"); - process.setText( - "生成PO流程：
1.采购商平台加入商品至购物车
2.bpms后台登录账号（chenhong）对该sku进行成品询价审核
3.再次登录采购商平台，进行拼柜、设置唛头、贴纸和提交PO操作"); - } else if ("PO询价".equals((String) selectScene.getSelectedItem())) { - POInquiry.setVisible(true); - ja.append(getCurrentTime() + "已选择场景：PO询价\r\n"); - process.setText("PO询价使用介绍：
1.填入需要询价的PO单号
2.工具将对该PO单号循环进行询价，直到所有商品均询价完成
3.如果运行过程中出现询价异常等弹框，手工关闭弹窗后脚本仍会继续执行之后的操作"); + switch ((String)selectScene.getSelectedItem()){ + default: + process.setText( + "新增原厂商品场景流程:
1.商品建档
2.更新商品图片
3.审核商品
4.检查商品库，验证是否新增成功
PS：以上均由账号（linxun）操作

"); + addOriginal.setVisible(true); + ja.append(getCurrentTime() + "已选择场景：新增原厂商品\r\n"); + break; + case "新增市场商品": + process.setText("新增市场商品场景流程：
" + "1.指定采购商编号(默认:RUS00833)
" + + "2.使用账号（maomeixiang)对指定采购商进行市场商品建档并选择审核人为\"邢昌勇\"
" + + "3.使用账号（xingchangyong）对市场商品审核
"); + addOriginal.setVisible(true); + addMarket.setVisible(true); + ja.append(getCurrentTime() + "已选择场景：新增市场商品\r\n"); + break; + case "发布团购": + ja.append(getCurrentTime() + "已选择场景：发布团购，运行过程中将会打开关闭浏览器2次！\r\n"); + process.setText( + "发布团购场景流程：
1.先执行新增原厂商品流程，生成一个原厂SKU
2.使用账号（linrong）为新增的SKU分配类目经理
3.团购设置中添加该SKU，并发布团购，验证团购发布结果"); + addOriginal.setVisible(true); + break; + case "采购商注册": + register.setVisible(true); + ja.append(getCurrentTime() + "已选择场景：采购商注册，运行过程中将会打开关闭浏览器2次！\r\n"); + process.setText( + "采购商注册流程：
1.使用账号（admin）在bpms后台生成一个邀请码
2.采购商平台填写注册信息，并填入上一步生成的邀请码
PS:新账号密码默认为：essa123


"); + break; + case "成品询价": + ToCart.setVisible(true); + ja.append(getCurrentTime() + "已选择场景：成品询价，将重启浏览器多次\r\n"); + process.setText( + "成品询价流程：
1.Buyer平台根据填入的采购
商信息加入sku，若未填写sku
编号，将随机从数据库获取符
合要求的sku
2.bpms后台登录账号（chenhong）对该sku进行成
品询价审核
"); + break; + case "生成PO": + ToCart.setVisible(true); + ja.append(getCurrentTime() + "已选择场景：生成PO，将重启浏览器多次\r\n"); + process.setText( + "生成PO流程：
1.采购商平台加入商品至购物车
2.bpms后台登录账号（chenhong）对该sku进行成品询价审核
3.再次登录采购商平台，进行拼柜、设置唛头、贴纸和提交PO操作"); + break; + case "PO询价": + POInquiry.setVisible(true); + ja.append(getCurrentTime() + "已选择场景：PO询价\r\n"); + process.setText("PO询价使用介绍：
1.填入需要询价的PO单号
2.工具将对该PO单号循环进行询价，直到所有商品均询价完成
3.如果运行过程中出现询价异常等弹框，手工关闭弹窗后脚本仍会继续执行之后的操作"); + break; + case "新增开发商品": + addOriginal.setVisible(true); + ja.append(getCurrentTime() + "已选择场景：新增开发商品\r\n"); + break; } } }); selectScene.setModel( - new DefaultComboBoxModel(new String[] { "新增原厂商品", "新增市场商品", "发布团购", "采购商注册", "成品询价", "生成PO", "PO询价" })); + new DefaultComboBoxModel(new String[] { "新增原厂商品", "新增市场商品", "发布团购", "采购商注册", "成品询价", "生成PO", "PO询价","新增开发商品" })); frmvBy.getContentPane().add(selectScene); JLabel label_3 = new JLabel("供应商名称："); @@ -563,94 +571,93 @@ public class SwingMain { BrowserEngine.setInit(Environment, Browser); TestNG testNG = new TestNG(); List suites = new ArrayList(); - if (Scene == "新增原厂商品") { - AddOriginalGoodsPage.setSupplierName(supplierName.getText()); -// UpdatePicPage.setPicPath(picPath.getText()); - Model.setPicPath(picPath.getText()); - suites.add(SuitesEnum.ADD_ORIGINAL_GOODS.getSuiteName()); -// suites.add(".\\resources\\suites\\addOriginalGoods.xml");// 图形界面 - } else if (Scene == "新增市场商品") { - Model.setBuyerNo(buyerNo2.getText()); - Model.setPicPath(picPath.getText()); - Model.setSupplierName(supplierName.getText()); - suites.add(SuitesEnum.ADD_MARKET_GOODS.getSuiteName()); -// suites.add(".\\resources\\suites\\addMarketGoods.xml");// 图形界面 - } else if (Scene == "发布团购") { - AddOriginalGoodsPage.setSupplierName(supplierName.getText()); -// UpdatePicPage.setPicPath(picPath.getText()); - Model.setPicPath(picPath.getText()); - suites.add(SuitesEnum.PUBLISH_GROUP_PURCHASE.getSuiteName()); -// suites.add(".\\resources\\suites\\publishGroupPurchase.xml");// 图形界面 - } else if (Scene == "采购商注册") { - if (!(registerAccount.getText().equals("") - || registerAccount.getText().equals("若不填写将自动生成"))) { - Model.setEmail(registerAccount.getText()); - } - suites.add(SuitesEnum.BUYER_REGISTER.getSuiteName()); -// suites.add(".\\resources\\suites\\buyerRegister.xml");// 图形界面 - } else if (Scene == "添加SKU至购物车") {// 暂时舍弃 - Model.setBuyerAccount(account.getText()); - Model.setBuyerPassword(password.getText()); - Model.setSkuNo(SkuNo.getText()); - suites.add(SuitesEnum.ADD_SKU_TO_CART.getSuiteName()); -// suites.add(".\\resources\\suites\\addSkuToCart.xml"); - } else if (Scene == "成品询价") { - Model.setBuyerAccount(account.getText()); - Model.setBuyerPassword(password.getText()); - Model.setSkuNo(SkuNo.getText()); - if (Model.getIsactivity() == 1) { - suites.add(SuitesEnum.ACTIVITY_INQUIRY.getSuiteName()); -// suites.add(".\\resources\\suites\\activityInquiry.xml"); - }else { - suites.add(SuitesEnum.PRODUCT_INQUIRY.getSuiteName()); -// suites.add(".\\resources\\suites\\productInquiry.xml"); - } - } else if (Scene == "生成PO") { - Model.setBuyerAccount(account.getText()); - Model.setBuyerPassword(password.getText()); - Model.setSkuNo(SkuNo.getText()); - if (Model.getIsactivity() == 1) { - suites.add(SuitesEnum.ACTIVITY_SEND_PO.getSuiteName()); -// suites.add(".\\resources\\suites\\activitySendPO.xml"); - }else { - suites.add(SuitesEnum.SEND_PO.getSuiteName()); -// suites.add(".\\resources\\suites\\sendPO.xml"); - } - } else if (Scene == "PO询价") { - Model.setPoNum(po.getText()); - suites.add(SuitesEnum.PO_INQUIRY.getSuiteName()); -// suites.add(".\\resources\\suites\\POInquiry.xml"); + 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 { + suites.add(SuitesEnum.PRODUCT_INQUIRY.getSuiteName()); + } + 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 { + suites.add(SuitesEnum.SEND_PO.getSuiteName()); + } + 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()); } testNG.setTestSuites(suites); testNG.run(); ja.append(getCurrentTime() + "=======" + Scene + "场景,执行完毕！=======\r\n"); - if (Scene == "新增原厂商品" || Scene == "新增市场商品" || Scene == "发布团购") { - no = Model.getSkuNo(); - if (no != null) { - ja.append(getCurrentTime() + "SKU商品编号：" + no + "\r\n"); - } else { - ja.append(getCurrentTime() - + "程序执行失败了！\r\n你可查看目录中test-output/index.html的测试报告，或者查看Log中的执行日志检查原因\r\n"); - } - } else if (Scene == "采购商注册") { - String code = Model.getInvateCode(); - String email = Model.getEmail(); - if (code != null && email != null) { - ja.append(getCurrentTime() + "生成的邀请码：" + Model.getInvateCode() + "\r\n"); - ja.append(getCurrentTime() + "新采购商邮箱：" + Model.getEmail() + "\r\n"); - } else { - ja.append(getCurrentTime() - + "程序执行失败了！\r\n你可以分析目录中test-output/index.html的测试报告，或者查看目录中Log文件夹生成的执行日志\r\n"); - } - } else if (Scene == "添加SKU至购物车") { - ja.append(getCurrentTime() + "所选采购商账号：" + Model.getBuyerAccount() + "\r\n"); - ja.append(getCurrentTime() + "添加的SKU编号为：" + Model.getSkuNo() + "\r\n"); - } else if (Scene == "成品询价") { - ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n"); - ja.append(getCurrentTime() + "SKU编号：" + Model.getSkuNo() + "\r\n"); - } else if (Scene == "生成PO") { - ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n"); - ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n"); + switch (Scene){ + default: //默认新增原厂商品 + case "新增市场商品": + case "发布团购": + no = Model.getSkuNo(); + if (no != null) { + ja.append(getCurrentTime() + "SKU商品编号：" + no + "\r\n"); + } else { + ja.append(getCurrentTime() + + "程序执行失败了！\r\n"); + } + break; + case "采购商注册": + String code = Model.getInvateCode(); + String email = Model.getEmail(); + if (code != null && email != null) { + ja.append(getCurrentTime() + "生成的邀请码：" + Model.getInvateCode() + "\r\n"); + ja.append(getCurrentTime() + "新采购商邮箱：" + Model.getEmail() + "\r\n"); + } else { + ja.append(getCurrentTime() + + "程序执行失败了！\r\n"); + } + break; + case "成品询价": + ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n"); + ja.append(getCurrentTime() + "SKU编号：" + Model.getSkuNo() + "\r\n"); + break; + case "生成PO": + ja.append(getCurrentTime() + "采购商账号：" + Model.getBuyerAccount() + "\r\n"); + ja.append(getCurrentTime() + "PO单号：" + Model.getPoNum() + "\r\n"); + break; } return null; } -- libgit2 0.21.2