commit

testcase/test_scene1/scene1_mainflow.py

@@ -227,7 +227,6 @@ class PurchaseOrder():###普通采购单界面操作
         chrome.find_element_by_xpath('//label[text()="%s"]/parent::div/div/div/div/input'%qrcond).send_keys(orderno)
         sleep(1)
         chrome.find_element_by_xpath('//label[text()="%s"]/parent::div/div/div/div/input'%qrcond).send_keys(Keys.ENTER)
-        wait.until(ec.visibility_of_element_located((By.XPATH,'//td[@class="%s"]'%el)))
         sleep(2)
         # locator = (By.CLASS_NAME, 'el-loading-spinner')
         # wait.until_not(ec.presence_of_element_located(locator))
@@ -236,6 +235,8 @@ class PurchaseOrder():###普通采购单界面操作
         # chrome.find_element_by_xpath(
         #     '//span[text()="%s"]//parent::div/parent::td//preceding-sibling::td[1]/div/span' % orderno1).click()
         #点击订单，进入表单视图
+        wait.until(ec.visibility_of_element_located((By.XPATH,'//td[@class="%s"]'%el)))
+        sleep(0.5)
         chrome.find_element_by_xpath('//td[@class="%s"]'%el).click()
         sleep(1)
         chrome.switch_to.frame(chrome.find_element_by_xpath('//iframe[contains(@name,"awsui-dialog-iframe")]'))

testcase/test_scene4/scene4_mainflow.py

@@ -215,6 +215,8 @@ class Instore1(Instore):
 
 class TransferOffSetting(PurchaseOrder):
     def ottorder_cancel(self):
+        wait.until(ec.visibility_of_element_located((By.XPATH,'//span[@title="全选/取消"]')))
+        sleep(0.5)
         chrome.find_element_by_xpath('//span[@title="全选/取消"]').click()
         sleep(0.5)
         chrome.find_element_by_xpath('//span[text()="整单取消"]').click()

testcase/test_scene4/test_scene4_mainflow1.py

@@ -27,12 +27,6 @@ def test_scene4_mainflow1():
         step3.switch_loggin(usr1, pwd1)
         step4.transfer_in(sttorder)#检查自动审配订单状态
         ottorder = step4.return_ottorder()#获取调拨入库单号
-        # step5.switch_loggin(usr4, pwd4)
-        # step5.take_over_goods(ottorder)  # 仓库收货：1为收货单据撤回，2为提交，其余为保存
-        # step5.switch_loggin(usr5, pwd5)
-        # step5.goods_check(ottorder,type=3)  # 仓库验收：1为保存，否则为提交
-        # step5.switch_loggin(usr4, pwd4)
-        # step5.goods_grounding(ottorder)  # 仓库上架：1为保存，否则为提交
         step6.ottorder_cancel()#整单取消调拨入库单
         step6.switch_loggin(usr2,pwd2)
         step6.ottorder_offset(sttorder)#新建调拨出库红冲单