修改模块结构

air_case/a2_herp3_bs/g0_请领出库渠道设置_转移产品到边仓.air/g0_请领出库渠道设置_转移产品到边仓.py → air_case/a99_herp3_bs/g0_请领出库渠道设置_转移产品到边仓.air/g0_请领出库渠道设置_转移产品到边仓.py

@@ -17,7 +17,7 @@ case_tag:api,herp-web,g0_请领出库渠道设置_转移产品到边仓,id2263,i
 """
 
 from common.common_func import commonFuc
-from air_case.a1_herp3_login.登录内网系统.登录内网系统 import login_system
+from air_case.a98_herp3_login.登录内网系统.登录内网系统 import login_system
 module = "a2_herp3_bs"
 def goods_move():
     """

air_case/a2_herp3_bs/g1_请领出库渠道设置_转移产品到供应商直配.air/g1_请领出库渠道设置_转移产品到供应商直配.py → air_case/a99_herp3_bs/g1_请领出库渠道设置_转移产品到供应商直配.air/g1_请领出库渠道设置_转移产品到供应商直配.py

@@ -17,7 +17,7 @@ case_tag:api,herp-web,g0_请领出库渠道设置_转移产品到供应商直配
 """
 
 from common.common_func import commonFuc
-from air_case.a1_herp3_login.登录内网系统.登录内网系统 import login_system
+from air_case.a98_herp3_login.登录内网系统.登录内网系统 import login_system
 module = "a2_herp3_bs"
 def goods_move():
     """

air_case/mdm3_cm/a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air/a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.py

@@ -15,7 +15,7 @@ def h_login():
     module = "mdm3_cm"
     pro_path=commonFuc().get_pro_path()
     sys.path.append(pro_path+r'\\air_case\\mdm3_hs\\注册医院审核通过.air')
-    using(pro_path+r'\\air_case\\mdm3_es\\注册医院审核通过.air')
+    using(pro_path+r'\\air_case\\mdm3_hs\\注册医院审核通过.air')
     from 注册医院审核通过 import reg_and_audit_hospital
     h_name=reg_and_audit_hospital()
     """

air_case/mdm3_cm/a2供货关系申请_客户类型_医院_登录_企业登录.air/a2供货关系申请_客户类型_医院_登录_企业登录.py

@@ -19,6 +19,7 @@ def e_login():
     using(pro_path+r'\\air_case\\mdm3_pim\\a8产品新增和审核通过.air')
     from a8产品新增和审核通过 import Enterprise_audit
     username=Enterprise_audit()
+    print('aaaaaaaaaaaaaaaaaaaaaaaaaaa',username)
     """
      场景:a2供货关系申请_客户类型_医院_登录_企业登录
      用例名称：a2供货关系申请_客户类型_医院_登录_企业登录
@@ -30,7 +31,13 @@ def e_login():
     password = commonFuc().get_business_data(module, "password")
     # print(username, password)
     # 获取token和projectCode
-    token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
-    return token,projectCode,uxid,corpId,username
+    while True:
+        try:
+            token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
+        except:
+            continue
+        else:
+            return token, projectCode, uxid, corpId, username
+            # break
 
 e_login()
\ No newline at end of file

air_case/mdm3_pim/a8产品新增和审核通过.air/a8产品新增和审核通过.py

@@ -88,10 +88,10 @@ def Enterprise_audit():
     # 企业注册提交接口_审核通过_开始
     url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "auditCompanyRegistBill_url")
     request_body = commonFuc().get_business_data(module, "payload5", id1)
-    print('aaaaaaaaaaaaaaaaaaaaaaaaa',id1,url,headers)
+    # print('aaaaaaaaaaaaaaaaaaaaaaaaa',id1,url,headers)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    print('企业审核通过aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',result)
+    # print('企业审核通过aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',result)
     # 获取接口返回数据
     code = commonFuc().analysis_json('code', result)
     check_dict1 = commonFuc().get_business_data(module, "checkDict1")
@@ -105,12 +105,22 @@ def p_m_a():
     module = "mdm3_pim"
     # 登录
     username = Enterprise_audit()
+    print('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',username)
     password = commonFuc().get_business_data(module, "password")
     print(username, password)
     # 获取token和projectCode
     print('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
-    print('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',token, projectCode, uxid, corpId,info)
+    while True:
+        try:
+            token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
+        except:
+            import time
+            time.sleep(6)
+            continue
+        else:
+            break
+    print('baaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',token, projectCode, uxid, corpId,info)
+    print('token',token)
     # 分页查询供应商产品数据接口
     url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listVoPage_url")
 
@@ -226,4 +236,5 @@ def p_m_a():
     print('username',username)
     return username,goodsName,module
 # p_m_a()
-FileUtils().w_info(p_m_a(),'产品新增')
+if __name__ == '__main__':
+    FileUtils().w_info(p_m_a(),'产品新增')

report/summary.html

@@ -54,10 +54,10 @@
         </tr>
 
         <tr width="600">
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0</td>
+            <td class='details-col-elapsed'>5</td>
+            <td class='details-col-elapsed'>4</td>
             <td class='details-col-elapsed'>0分4秒</td>
-            <td class="details-col-elapsed">0.0%</td>
+            <td class="details-col-elapsed">80.0%</td>
         </tr>
     </table>
 
@@ -72,9 +72,37 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a8产品新增和审核通过/log.html' target='_blank'>a8产品新增和审核通过</a></td>
+            <td class="details-col-elapsed"><a href='../log/医院注册_正常注册_私立医院/log.html' target='_blank'>医院注册_正常注册_私立医院</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">0.341</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/医院注册_注册时医院已存在/log.html' target='_blank'>医院注册_注册时医院已存在</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">0.249</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/医院注册正常注册公立医院/log.html' target='_blank'>医院注册正常注册公立医院</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">0.21</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/注册医院审核通过/log.html' target='_blank'>注册医院审核通过</a></td>
             <td class="fail">失败</td>
-            <td class="details-col-elapsed">4.733</td>
+            <td class="details-col-elapsed">2.411</td>
+            <td class="details-col-elapsed">xiaohesheng</td>
+        </tr>
+        
+        <tr width="600">
+            <td class="details-col-elapsed"><a href='../log/注册医院审核驳回/log.html' target='_blank'>注册医院审核驳回</a></td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">1.207</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>