commit

testcase/test_scene1/scene1_mainflow.py

@@ -240,7 +240,7 @@ class PurchaseOrder():###普通采购单界面操作
         #点击订单，进入表单视图
         wait.until(ec.visibility_of_element_located((By.XPATH,'//td[@class="%s"]'%el)))
         sleep(2)
-        chrome.find_element_by_xpath('//td[@class="%s"]'%el).click()
+        chrome.find_element_by_xpath('//td[@class="%s"]/div/span'%el).click()
         sleep(1)
         chrome.switch_to.frame(chrome.find_element_by_xpath('//iframe[contains(@name,"awsui-dialog-iframe")]'))
         sleep(0.5)

testcase/test_scene3/scene3_mainflow.py

@@ -199,7 +199,6 @@ class SalesOrder():
         chrome.find_element_by_xpath('//label[text()="关联来源单号"]/parent::div/div/div/div/input').send_keys(Keys.ENTER)
         sleep(2)
         wait.until(ec.visibility_of_element_located((By.XPATH,'//td[@class="vxe-body--column col_104 col--ellipsis dw-click-cell"]/div/div')))
-
         salesorder = chrome.find_element_by_xpath('//td[@class="vxe-body--column col_104 col--ellipsis dw-click-cell"]/div/div').text
         print('生成的销售订单号为:',salesorder)
         status = chrome.find_element_by_xpath('//td[@class="vxe-body--column col_107 col--ellipsis"]/div/div').text

testcase/test_scene4/scene4_mainflow.py

@@ -24,7 +24,7 @@ errmsg4 = '流程四：调拨出库-入库-红冲流程异常，请检查！'#
 
 class TransferOut():
     def data_add_allocate(self):
-        ###打开普调拨出库单###
+        ###打开调拨出库单###
         wait.until(ec.presence_of_element_located((By.XPATH,'//span[text()="调拨出库单"]')))
         order_link = chrome.find_element_by_xpath('//span[text()="调拨出库单"]')
         chrome.execute_script("arguments[0].click();", order_link)

testcase/test_scene6/scene6_mainflow.py

@@ -332,6 +332,89 @@ class Outstore1(PurchaseOrder):  # 出库三步曲
         PurchaseOrder.button_click1(self,type,el2='//p[text()="流程结束"]')
         print('出库复核成功')
 
+class SurgicalReturn(PurchaseOrder):
+    def data_add_surgicalreturn(self,jctorder):
+        ###打开手术还回收货单###
+        wait.until(ec.presence_of_element_located((By.XPATH,'//span[text()="手术还回收货"]')))
+        order_link = chrome.find_element_by_xpath('//span[text()="手术还回收货"]')
+        chrome.execute_script("arguments[0].click();", order_link)
+        chrome.switch_to.frame(chrome.find_element_by_xpath('(//iframe[@class="metro-main-frame"])[2]'))
+        sleep(0.5)
+        # 点击新建按钮
+        wait.until(ec.visibility_of_element_located((By.XPATH,'//span[text()="新建"]')))
+        sleep(0.5)
+        chrome.find_element_by_xpath('//span[text()="新建"]').click()
+        sleep(4)
+        chrome.switch_to.frame(chrome.find_element_by_xpath('//iframe[contains(@name,"awsui-dialog-iframe")]'))
+        sleep(2)
+
+        ###获取手术还回订单号###
+        global orderno3
+        orderno3 = chrome.find_element_by_xpath('//div[text() = "收货单号 "]/following-sibling::div/span').text
+        print('手术还回收货单号为:', orderno3)
+
+        # 还回仓库名称
+        chrome.find_element_by_xpath(
+            '//div[text()="还回仓库名称 "]/following-sibling::div/div/div/div/div/div/div/div/span/span/i').click()
+        wait.until(ec.visibility_of_element_located((By.XPATH, '//input[@placeholder="模糊检索:仓库名称,仓库编码"]')))
+        sleep(0.5)
+        chrome.find_element_by_xpath('//input[@placeholder="模糊检索:仓库名称,仓库编码"]').send_keys(lendout)
+        sleep(0.5)
+        chrome.find_element_by_xpath('//input[@placeholder="模糊检索:仓库名称,仓库编码"]').send_keys(Keys.ENTER)
+        sleep(0.5)
+        btn_div = chrome.find_element_by_xpath(
+            '//span/input[@type="radio" and @value="0b950dc6692b193591bd8ac06876791ec"]')
+        chrome.execute_script("arguments[0].click();", btn_div)
+        chrome.find_element_by_xpath('(//button[@class="el-button el-button--primary el-button--default"])[2]').click()
+        sleep(1)
+
+        #填写客户名称
+        chrome.find_element_by_xpath('//div[text()="客户名称 "]/following-sibling::div/div/div/div/div/div/div/div/span/span/i').click()
+        wait.until(ec.visibility_of_element_located((By.XPATH,'//input[@placeholder="模糊检索:客户编码,客户名称"]')))
+        sleep(1)
+        chrome.find_element_by_xpath('//input[@placeholder="模糊检索:客户编码,客户名称"]').send_keys(custname)
+        sleep(1)
+        chrome.find_element_by_xpath('//input[@placeholder="模糊检索:客户编码,客户名称"]').send_keys(Keys.ENTER)
+        sleep(1)
+        btn_div= chrome.find_element_by_xpath('//span/input[@type="radio" and @value="04bb72d56ca59576d0c205f2509d66836"]')
+        chrome.execute_script("arguments[0].click();", btn_div)
+        chrome.find_element_by_xpath('(//button[@class="el-button el-button--primary el-button--default"])[2]').click()
+        sleep(1)
+
+        #保存主表
+        chrome.find_element_by_xpath('//span[text()="保存"]').click()
+        wait.until(ec.presence_of_element_located((By.XPATH,'//p[text()="保存成功"]')))
+        sleep(1)
+
+        # 点击添加商品并输入借出单号，查询出结果
+        chrome.find_element_by_xpath('//span[text()="添加商品"]').click()
+        sleep(1)
+        chrome.find_element_by_xpath(
+            '//input[@placeholder="模糊检索:还回单号,借出单号,商品编码,商品名称,序列号"]').send_keys(jctorder)
+        sleep(0.5)
+        chrome.find_element_by_xpath(
+            '//input[@placeholder="模糊检索:还回单号,借出单号,商品编码,商品名称,序列号"]').send_keys(Keys.ENTER)
+        sleep(2)
+        # 勾选查询出的商品并点击确定按钮
+        chrome.find_element_by_xpath(
+            '//th[@class="el-table_12_column_426 multiple-column el-table-column--selection is-leaf headerCellClassName el-table__cell"]/div/label/span/span').click()
+        sleep(0.5)
+        chrome.find_element_by_xpath('(//div[@class="el-dialog__body"]/div[2]/span/button[1]/span)[3]').click()
+        sleep(3)
+
+        # 提交订单
+        chrome.find_element_by_xpath('//span[text()="提交"]').click()
+        wait.until(ec.presence_of_element_located((By.XPATH, '//p[text()="流程结束"]')))
+        sleep(0.5)
+        PurchaseOrder.closetab(self)
+
+        print('手术还回收货单提交成功')
+
+
+    def return_hhshtorder(self):
+        return orderno3
+
+
 
 if __name__ == '__main__':
     step1 = LoginSys()
@@ -341,6 +424,7 @@ if __name__ == '__main__':
     step4 = SurgicalLending()
     step5_1 = Outstore()
     step5_2 = Outstore1()
+    step6 = SurgicalReturn()
     step1.loginsys(SIT_URL, usr2, pwd2)
     step2_1.data_add_surgical()
     step2_2.button_click1()
@@ -357,4 +441,7 @@ if __name__ == '__main__':
     step5_1.deliver_goods(jctorder)  # 仓库发货
     step5_1.picking_goods(jctorder)  # 仓库拣货
     step5_1.switch_loggin(usr5, pwd5)
-    step5_2.outbound_review1(jctorder,type=3)  # 出库复核
+    step5_2.outbound_review1(jctorder,type=3)  # 出库复核
\ No newline at end of file
+    step5_1.switch_loggin(usr2, pwd2)
+    step6.data_add_surgicalreturn(jctorder)#新增手术还回收货
+    hhshtorder = step6.return_hhshtorder()
\ No newline at end of file