优化脚本

air_case/b2_herp3_bs/o7科室管理_科室产品分配_科室新增产品.air/o7科室管理_科室产品分配_科室新增产品.py

@@ -62,6 +62,7 @@ def test1():
         import time
         time.sleep(6)
         from r_b8库房管理_库区设置_同步库房信息 import test1
+        test1()
     except Exception as e:
         print("r_b8库房管理_库区设置_同步库房信息发生异常：", str(e))
 

air_case/b2_herp3_bs/r_b8库房管理_库区设置_同步库房信息.air/r_b8库房管理_库区设置_同步库房信息.py

@@ -83,7 +83,7 @@ def test1():
     if code == 0 and data == 1:
         commonFuc().check_text_exist(0, result)
     else:
-        print('error',data)
+        print('error',result)
         commonFuc().check_text_exist('error', result)
 
 import time

air_case/b2_herp3_bs/r_f0用户管理_用户管理_新增用户.air/r_f0用户管理_用户管理_新增用户.py

@@ -44,9 +44,9 @@ def test1(orgName='d69a68df361a4289b2262e4ef75b55a5'):
                                             commonFuc().get_business_data(module, "json_contentType"), token,
                                             commonFuc().get_business_data(module, "X-APP-CODE"))
 
+    name = commonFuc().randomString(5)
     # # 请求体
-
-    request_body = commonFuc().get_business_data(module, "payload63_9", orgName)
+    request_body = commonFuc().get_business_data(module, "payload63_9",name,name, orgName,name)
     print('request_body', request_body)
     # # # # 发送请求
     result = commonFuc().http_post(url, request_body, headers)

air_case/b2_herp3_bs/r_f5用户管理_用户管理_重置密码.air/r_f5用户管理_用户管理_重置密码.py

@@ -58,3 +58,5 @@ def test1(orgName='d69a68df361a4289b2262e4ef75b55a5',mgrRangeId='feb0cc16618c437
     else:
         commonFuc().check_text_exist('error', result)
 test1()
+#删除用户
+delData().Delete_user()
\ No newline at end of file

common/db/sql/sql_del_branch_info.py

@@ -133,16 +133,28 @@ class delData(object):
         connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
                                      charset="utf8")
         cursor = connection.cursor()
-        # 删除货位信息
+        # 删除角色信息
         sql = "delete from  sys_role where cname like '%自动化测试2%';"
         print(sql)
         cursor.execute(sql)
         cursor.execute("commit;")
         print('角色信息删除成功 ')
         cursor.close()
+    def Delete_user(self):
+        connection = pymysql.connect(host="10.17.65.108", user="root", password="Cmic.2023", database="spd3_herp_test2",
+                                     charset="utf8")
+        cursor = connection.cursor()
+        # 删除用户信息
+        sql = "delete from  sys_user where user_code like '%自动化测试%';"
+        print(sql)
+        cursor.execute(sql)
+        cursor.execute("commit;")
+        print('用户信息删除成功 ')
+        cursor.close()
 # delData().Delete_branch_by_id()
 # delData().Delete_goods_change_info()
 # delData().Delete_sys_config()
 # delData().Delete_sys_message_template()
 # delData().get_shelf_name_version()
 # delData().Delete_role()
+# delData().Delete_user()
\ No newline at end of file

data/b2_herp3_bs/data

@@ -500,13 +500,13 @@ json_headers2: {
 "payload63": {"cname":"自动化测试","projectCode":"herp"}
 "payload63_1": {"projectCode":"herp","roleType":"1"}
 "payload63_2": {"projectCode":"herp","roleCode":"%s"}
-"payload63_3": '[{"addMenus":[{"menuCode":"herp.pc.pm01631.pm01632.pm01633","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01632.pm01634","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01632.pm01635","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01632.pm01923","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01642","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01643","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01644","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01645","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01646","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01718","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01926","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm02197","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01779","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm01912","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01636.pm02108","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01641.pm02180","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01637.pm01647","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01648","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01649","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01650","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01651","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01652","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01653","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01668","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01638.pm01654","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01639.pm01655","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01639.pm01656","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01639.pm01658","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01639.pm01734","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01639.pm01735","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01640.pm01659","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01640.pm02192","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01641.pm01660","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm01641.pm01661","btnCodes":null},{"menuCode":"herp.pc.pm01921.pm01922","btnCodes":null},{"menuCode":"herp.pc.pm01921.pm02193","btnCodes":null},{"menuCode":"herp.pc.pm01631.pm02168.pm02169","btnCodes":null},{"menuCode":"herp.pc.pm01898.pm01899","btnCodes":null},{"menuCode":"herp.pc.pm01898.pm01900","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm01693","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm01694","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm01695","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm02160","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm01707","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm01883","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm01882","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm02155","btnCodes":null},{"menuCode":"herp.pc.pm01692.pm02199","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01721.pm01724","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01721.pm01728","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01721.pm01727","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01721.pm01902","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01721.pm02200","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01721.pm02179","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01725","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01729","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01730","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01723","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01736","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01737","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01738","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01739","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm01740","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01722.pm02156","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01742","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01743","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01744","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01745","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01746","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01747","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01770","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01741.pm01748","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01787.pm01788","btnCodes":null},{"menuCode":"herp.pc.pm01720.pm01787.pm01808","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm01688","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm01690","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm01691","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm01708","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm02158","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm02161","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01687.pm02196","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01749.pm01751","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01749.pm01752","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01750.pm01762","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01763.pm01765","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01763.pm01764","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01763.pm02198","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm02188.pm02189","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01750.pm01761","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01750.pm01755","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01750.pm01756","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01750.pm01753","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01750.pm01754","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01750.pm02165","btnCodes":null},{"menuCode":"herp.pc.pm01686.pm01785.pm01786","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01760","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01711","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01712","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01714","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01713","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01715","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01716","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01710.pm01768","btnCodes":null},{"menuCode":"herp.pc.pm01709.pm01924.pm01925","btnCodes":null},{"menuCode":"herp.pc.pm01676.pm01677","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01814.pm01824","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01814.pm01822","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01814.pm01823","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01815.pm01827","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01815.pm01825","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01815.pm01826","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01816.pm01828","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01816.pm01829","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01816.pm01830","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01816.pm01831","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01816.pm01832","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01816.pm01833","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01817.pm01835","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01817.pm01836","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01817.pm01837","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01817.pm01838","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01817.pm01839","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01817.pm01840","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01818.pm01841","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01819.pm01843","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01820.pm01844","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01820.pm01845","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01821.pm01846","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01821.pm01847","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01821.pm01848","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm01821.pm01849","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm02170.pm02171","btnCodes":null},{"menuCode":"herp.pc.pm01812.pm02174.pm02175","btnCodes":null},{"menuCode":"herp.pc.pm01935.cuspm01934.cuspm01941","btnCodes":null},{"menuCode":"herp.pc.pm01935.cuspm01934.cuspm01940","btnCodes":null},{"menuCode":"herp.pc.pm01935.cuspm01934.cuspm01943","btnCodes":null},{"menuCode":"herp.pc.pm01935.cuspm01934.cuspm01942","btnCodes":null},{"menuCode":"herp.pc.pm02185.cuspm01944","btnCodes":null}],"delMenus":[],"projectCode":"herp.pc","roleCode":"ro00529"},{"addMenus":[],"delMenus":[],"projectCode":"herp.pda","roleCode":"ro00529"}]'
+"payload63_3": '[{"addMenus":[],"delMenus":[],"projectCode":"herp.pc","roleCode":"ro00442"},{"addMenus":[],"delMenus":[],"projectCode":"herp.pda","roleCode":"ro00442"}]'
 "payload63_4": {"cname":"自动化测试2","projectCode":"herp","id":"%s","roleTemplateId":null}
 "payload63_5": {"pageNum":1,"pageSize":50,"queryObject":{"cname":"","orgName":"","corpId":"h0347"}}
 "payload63_6": {"pageNum":1,"pageSize":50,"queryObject":{"cname":"%s","orgName":"","corpId":"h0347"}}
 "payload63_7": {"pageNum":1,"pageSize":50,"queryObject":{"cname":"xhs1009","roleCode":"ro00442","orgName":"%s","corpId":"h0347"}}
 "payload63_8": {"pageNum":1,"pageSize":50,"queryObject":{"cname":"%s","roleCode":"ro00442","orgName":"%s","corpId":"h0347"}}
-"payload63_9": {"userCode":"自动化测试","cname":"自动化测试","tel":"xhs0301","orgCode":"","orgId":"%s","roleCode":"ro00442","projectCode":"herp","erpCode":"自动化测试"}
+"payload63_9": {"userCode":"自动化测试%s","cname":"自动化测试%s","tel":"xhs0301","orgCode":"","orgId":"%s","roleCode":"ro00442","projectCode":"herp","erpCode":"自动化测试%s"}
 "payload63_10": {"userCode":"自动化测试","cname":"自动化测试_update","tel":"xhs0301","orgCode":"001","orgId":"%s","id":"h0347_UID-051050","enableFlag":"0","roleCode":"ro00442","projectCode":"herp","erpCode":"自动化测试_update"}
 "payload63_11": {"userCode":"自动化测试","cname":"自动化测试_update","tel":"xhs0301","orgCode":"001","orgId":"%s","id":"h0347_UID-051050","enableFlag":"1","roleCode":"ro00442","projectCode":"herp","erpCode":"自动化测试_update"}
 "payload63_12": {"roleCode":"ro00442","userId":"h0347_UID-051050","projectCode":"herp","grantInfos":[{"corpId":"h0347","corpName":"","mgrBranchId":"h0347-2011","mgrBranchName":"东土城院区","mgrRangeId":"%s","mgrRangeName":"001","roleCode":"ro00442"},{"corpId":"h0347","corpName":"","mgrBranchId":"h0347-2011","mgrBranchName":"东土城院区","mgrRangeId":"%s","mgrRangeName":"008","roleCode":"ro00442"}]}

report/summary.html

@@ -72,9 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/r_b8库房管理_库区设置_同步库房信息/log.html' target='_blank'>r_b8库房管理_库区设置_同步库房信息</a></td>
+            <td class="details-col-elapsed"><a href='../log/r_f0用户管理_用户管理_新增用户/log.html' target='_blank'>r_f0用户管理_用户管理_新增用户</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">2.219</td>
+            <td class="details-col-elapsed">2.314</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>