commit

testcase/test_scene1/scene1_mainflow.py

@@ -164,18 +164,18 @@ class PurchaseOrder():#普通采购单界面操作
         chrome.find_element_by_xpath('//span[@class="awsui-tabs-icon close"]').click()
         sleep(1)
 
-    def button_click1(self,type=2):#保存/提交订单：type=1为保存，否则为提交
+    def button_click1(self,type=2,el1='el-loading-spinner',el2='//p[text()="办理成功"]'):#保存/提交订单：type=1为保存，否则为提交
         if type == 1:
             chrome.find_element_by_xpath('//span[text()="保存"]').click()
             sleep(1)
-            locator = (By.CLASS_NAME, 'el-loading-spinner')
+            locator = (By.CLASS_NAME, f'{el1}')
             wait.until_not(ec.presence_of_element_located(locator))
             print('订单保存成功')
         else:
             chrome.find_element_by_xpath('//span[text()="提交"]').click()
             sleep(1)
-            locator = (By.XPATH, '//span[text()="办理成功"]')
-            wait.until_not(ec.presence_of_element_located(locator))
+            locator = (By.XPATH, f'{el2}')
+            wait.until(ec.presence_of_element_located(locator))
             print('订单提交成功')
         self.closetab()
 
@@ -347,6 +347,15 @@ class Instore(PurchaseOrder):
         PurchaseOrder.button_click1(self,type)
         print('仓库验收成功')
 
+    def goods_grounding(self,orderno,type=2):
+        PurchaseOrder.query_click(self, '仓库上架', orderno,
+                                  'vxe-body--column col_19 col--left col--ellipsis dw-click-cell')
+        chrome.switch_to.frame(chrome.find_element_by_xpath('//iframe[contains(@name,"awsui-dialog-iframe")]'))
+        sleep(0.5)
+        wait.until(ec.presence_of_element_located((By.XPATH, '//span[text()="提交"]')))
+        sleep(0.5)
+        PurchaseOrder.button_click1(self, type,el2='//p[text()="流程结束"]')
+        print('仓库上架成功')
 
 if __name__ == '__main__':
     step1 = LoginSys()
@@ -362,4 +371,6 @@ if __name__ == '__main__':
     step3.switch_loggin(usr4,pwd4)
     step3.take_over_goods(purchord)#1为收货单据撤回，2为提交，其余为保存
     step3.switch_loggin(usr5, pwd5)
-    step3.goods_check(purchord)
+    step3.goods_check(purchord)#仓库验收：1为保存，否则为提交
+    step3.switch_loggin(usr4, pwd4)
+    step3.goods_grounding(purchord)#仓库上架：1为保存，否则为提交