优化脚本

air_case/a6_mdm3_dp/a7_5代配送下单_不合格补送列表数据查询.air/a7_5代配送下单_不合格补送列表数据查询.py

@@ -19,8 +19,8 @@ def select1():
     from a1企业登录 import e_login
     token, projectCode, uxid, corpId, e_name = e_login()
     # # 获取医院corpId
-    # sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
-    # using(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
+    # sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id2.air')
+    # using(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id2.air')
     # from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
     # h_token, h_projectCode, h_uxid, h_corpId, h_name = h_login()
     """

air_case/a6_mdm3_dp/a7_6代配送下单_不合格补送_配送.air/a7_6代配送下单_不合格补送_配送.py

@@ -21,8 +21,8 @@ def select1():
     from a1企业登录 import e_login
     token, projectCode, uxid, corpId, e_name = e_login()
     # # 获取医院corpId
-    # sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
-    # using(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
+    # sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id2.air')
+    # using(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id2.air')
     # from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
     # h_token, h_projectCode, h_uxid, h_corpId, h_name = h_login()
     """

air_case/a6_mdm3_si/a1结算单查询_列表数据查询.air/a1结算单查询_列表数据查询.py

@@ -19,8 +19,8 @@ def select1():
     from a1企业登录 import e_login
     token, projectCode, uxid, corpId, e_name = e_login()
     # # 获取医院corpId
-    # sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
-    # using(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id.air')
+    # sys.path.append(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id2.air')
+    # using(pro_path + r'\\air_case\\a4_mdm3_cm\\a1供货关系申请_客户类型_医院_登录_医院登录获取医院id2.air')
     # from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
     # h_token, h_projectCode, h_uxid, h_corpId, h_name = h_login()
     """

air_case/b5_spd3_core_business_flow/a_a1_流程一外网企业注册审批.air/a_a1_流程一外网企业注册审批.py

+# -*- encoding=utf8 -*-
+from common.db.sql.sql_get_info import sql_get_info
+from common.fileUtls import FileUtils
+from common.run_cmd_script import execute_command
+from common.timeUtils import timeUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,herp-web,a_a1_期初录入_新增_低值,id9999,id9999-1,sit,on
+内网:a_a1_期初录入_新增_低值 
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+from airtest.core.api import using
+import sys
+
+
+def test1():
+    #企业注册
+    execute_command("python runner.py tag id2232 debug mdm3")
+    #企业审核
+    execute_command("python runner.py tag id2248 debug mdm3")
+    #医院注册审核
+    execute_command("python runner.py tag id2249 debug mdm3")
+try:
+    test1()
+except:
+    commonFuc().check_text_exist('error','error')

air_case/b5_spd3_core_business_flow/a_a2_流程二供货关系申请提交审批.air/a_a2_流程二供货关系申请提交审批.py

+# -*- encoding=utf8 -*-
+from common.fileUtls import FileUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web1,a_a2_流程二供货关系申请提交审批,id9999,id9999-2,sit,on
+主数据平台:a_a2_流程二供货关系申请提交审批 
+"""
+
+from common.common_func import commonFuc
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+from airtest.core.api import using
+import sys
+#type=1是默认，医院是之前注册的医院
+def h_login(type=1):
+    module = "a4_mdm3_cm2"
+    # pro_path=commonFuc().get_pro_path()
+    # sys.path.append(pro_path+r'\\air_case\\mdm3_hs\\注册医院审核通过.air')
+    # using(pro_path+r'\\air_case\\mdm3_hs\\注册医院审核通过.air')
+    # from 注册医院审核通过 import reg_and_audit_hospital
+    # h_name=reg_and_audit_hospital()
+
+    # info = FileUtils().r_info("a3_mdm3_hs", "医院信息")
+    # print(info)
+    # h_name = info['h_name']
+    # print(h_name)
+    """
+     场景:a1供货关系申请_客户类型_医院_登录_医院登录获取医院id
+     用例名称：a1供货关系申请_客户类型_医院_登录_医院登录获取医院id
+     输入：用户名,密码
+     输出："rtn_msg": token,projectCode,uxid,corpId,h_name
+    """
+    #供货关系申请_客户类型_医院_登录_医院登录获取医院id
+    module = "a4_mdm3_cm"
+    #如果需要h0347医院账号登录,这里就从data文件获取登录医院的用户名
+    #username = commonFuc().get_business_data(module, "username")
+
+
+    username =  commonFuc().get_business_data(module, "username")
+    password = commonFuc().get_business_data(module, "password1")
+    print('医院名称', username)
+    print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # 获取token和projectCode
+    import time
+    while True:
+        try:
+            token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
+        except:
+            time.sleep(6)
+            continue
+        else:
+            return token,projectCode,uxid,corpId,username
+
+h_login(2)
\ No newline at end of file

air_case/mdm_login/登录外网系统/登录外网系统.py

@@ -71,7 +71,7 @@ class login_system():
         return token,projectCode,uxid,corpId,info
 
 
-login_system('test001', '1qaz!QAZ').get_token()
+# login_system('test001', '1qaz!QAZ').get_token()
 # if __name__ == '__main__':
 #     print(login_system('test001','1qaz!QAZ').get_token())
 #1679886114521 a123456!

data/a2_mdm3_ea/message

 企业信息:
-  e_id: CR202312080011
-  cname: 国药集团公司3zPqg
+  e_id: CR202404120042
+  cname: 国药集团公司7C1o8

data/a3_mdm3_hs/message

 医院信息:
-  h_id: 湖南省人民医院!mMDj
-  h_name: 湖南省人民医院!mMDj
+  h_id: 湖南省人民医院v7(@o
+  h_name: 湖南省人民医院v7(@o

data/a4_mdm3_cm/data

 "username": "test001"
 "password": "a123456!"
+"password1": "1qaz!QAZ"
+
 
 "submitSupplyRelation_url": "/api/hdiFusion/supplyRelation/submitSupplyRelation"
 "listVoPage_url": "/api/hdiFusion/supplyRelation/listVoPage/"

data/a4_mdm3_cm/message

 供货关系申请:
-  e_corpId: p1df21
-  h_corpId: h2811
-  e_username: 国药集团公司3zPqg
-  h_name: 湖南省人民医院!mMDj
+  e_corpId: p1e0e8
+  h_corpId: h287b
+  e_username: 国药集团公司7C1o8
+  h_name: 湖南省人民医院v7(@o

data/a4_mdm3_cm2/data

+"username": "test001"
+"password": "a123456!"
+"password1": "1qaz!QAZ"
+
+
+"submitSupplyRelation_url": "/api/hdiFusion/supplyRelation/submitSupplyRelation"
+"listVoPage_url": "/api/hdiFusion/supplyRelation/listVoPage/"
+"editSupplyRelation_url": "/api/mdmService/supplyRelation/editSupplyRelation/"
+"auditSupplyRelation_url": "/api/hdiFusion/supplyRelation/auditSupplyRelation/"
+"listProvInfoBySubProv_url": "/api/mdmService/supplyRelation/listProvInfoBySubProv/"
+"listVo_url": "/api/mdmService/provGoodsInfo/listVo/"
+"addGoodsHandleInfos_url": "/api/hdiFusion/import/goods/addGoodsHandleInfos?flag=true"
+"getSupplyHosList_url": "/api/hdiFusion/supplyRelation/getSupplyHosList"
+"listHosInfoVoPage_url": "/api/hdiFusion/supplyRelation/listHosInfoVoPage"
+json_contentType: "application/json"
+json_headers: {
+  "Content-Type": "%s"
+}
+
+json_headers2: {
+  "Content-Type": "%s",
+  "token": "%s",
+  "X-APP-CODE":"%s"
+}
+json_headers2_2: {
+  "Content-Type": "%s",
+  "token": "%s",
+  "X-APP-CODE":"%s",
+  "X-SESSION-ID":"%s"
+}
+"payload": {
+    "id": "",
+    "provName": "",
+    "hosName": "",
+    "invitationCode": "",
+    "hosId": "%s",
+    "clientType": "1",
+    "provId": "",
+    "contactUser": "%s",
+    "contactWay": "%s",
+    "version": ""
+}
+"payload_1": {"id":"","subProvName":"","hosName":"","invitationCode":"","hosId":"%s","clientType":"1","provId":"","contactUser":"%s","contactWay":"%s","version":""}
+"payload_2": {"id":"","subProvName":"","hosName":"","invitationCode":"","hosId":"%s","clientType":"2","provId":"p00001604","contactUser":"%s","contactWay":"%s","version":""}
+
+"payload1": {
+    "pageNum": 1,
+    "pageSize": 10,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+
+
+"payload2": {
+    "pageNum": 1,
+    "pageSize": 20,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+"payload3": {
+    "pageNum": 1,
+    "pageSize": 50,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+"payload4": {
+    "pageNum": 1,
+    "pageSize": 100,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": "",
+        "subProvId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+"payload5": {
+    "id": "",
+    "provName": "",
+    "hosName": "",
+    "invitationCode": "",
+    "hosId": "%s",
+    "clientType": "1",
+    "provId": "",
+    "contactUser": "%s",
+    "contactWay": "%s",
+    "version": ""
+}
+"payload6": {
+    "pageNum": 1,
+    "pageSize": 10,
+    "queryObject": {
+        "provName": "",
+        "clientType": "",
+        "tbStatus": 10,
+        "hosId": "%s"
+    },
+    "orderBy": "sr.create_time desc"
+}
+"payload7": {
+    "id": "%s",
+    "contactUser": "%s",
+    "contactWay": "%s",
+    "tbStatus": 30,
+    "auditComment": "驳回",
+    "activeFlag": "",
+    "version": 0
+}
+"payload7_2": {
+    "id": "%s",
+    "contactUser": "%s",
+    "contactWay": "%s",
+    "tbStatus": 20,
+    "activeFlag": "1",
+    "version": 0
+}
+"payload8": {
+    "provId": "%s",
+    "hosId": "%s",
+    "tbStatus": 20,
+    "activeFlag": 1
+}
+"payload9": {
+    "searchMdmGoodsCode": "MG",
+    "hosId": "%s",
+    "provId": "%s"
+}
+"payload10_1": {"hosId":"h277b","hosName":"湖南省人民医院6)sJI","hosVersion":3,"collectorId":"p1df18","collectorName":"国药集团公司*&Xer","goodsName":"一次性注射器1206","goodsGg":"G-31891","made":"德国","unit":"套","mfrsName":"德国歌德公司 Geuder AG","mfrsId":"mfrs-11229","purMode":"10","provGoodsJDECode":"","salePrice":99.9999,"purPrice":99.9999,"taxRate":0.13,"unitRate":1,"miCode":"","hisPrice":"0","sendPackage":100,"hitCode":"12","hitPrice":99.9999,"hosGoodsCode":"","xvmecCode":"123456789","xvmecPrice":99.9999,"hitId":"123456789","ygptPrimaryCode":"123456789","isDistrRel":"0","isOnline":"0","onlineKind":"dictOnlineKind:1","hosFactId":"","hosFcatKind":0,"remark":"无 ","storageConditions":"","hrpInfo":{"store":"","trans":"","cla":""},"ext1":"","ext2":"","cla":"","errorDesc":"","generalName":"一次性注射器","hosGoodsErpCode":"","provName":"国药集团公司*&Xer","provId":"p1df18","subProvErpCode":"","hosLbsx":"","hosKindLevelCode":"","certificateCode":"","brand":"","hosUnit":"支","mfrsCode":"","masterCode":"","goodsDesc":"","hwDesc":"1","packeage":"1","icdCode":"","icd20Code":"","icdName":"","ext3":"{\"store\":\"\",\"trans\":\"\",\"cla\":\"\"}","ext4":"","ext5":"","ext6":"","tempPurchase":"0","charging":"1","isMetering":"1","isSubprov":"0","midPackageUnit":"","useUnit":"","useUnitCount":"1","hosUnitCount":"1","provUnitCount":"1","functional":"","material":"","keySupervision":"0","handleStatus":"0","dataSource":"2","errorFlag":"","userId":""}
+"payload10": {
+    "hosId": "%s",
+    "hosName": "%s",
+    "hosVersion": 3,
+    "collectorId": "%s",
+    "collectorName": "%s",
+    "goodsName": "一次性注射器%s",
+    "goodsGg": "G-31891",
+    "made": "德国",
+    "unit": "套",
+    "mfrsName": "德国歌德公司 Geuder AG",
+    "mfrsId": "mfrs-11229",
+    "purMode": "10",
+    "provGoodsJDECode": "",
+    "salePrice": 99.9999,
+    "purPrice": 99.9999,
+    "taxRate": 0.13,
+    "unitRate": 1,
+    "miCode": "",
+    "hisPrice": "0",
+    "sendPackage": 100,
+    "hitCode": "12",
+    "hitPrice": 99.9999,
+    "hosGoodsCode": "",
+    "xvmecCode": "123456789",
+    "xvmecPrice": 99.9999,
+    "hitId": "123456789",
+    "ygptPrimaryCode": "123456789",
+    "isDistrRel": "0",
+    "isOnline": "0",
+    "onlineKind": "dictOnlineKind:1",
+    "hosFactId": "",
+    "hosFcatKind": 0,
+    "remark": "无 ",
+    "storageConditions": "",
+    "hrpInfo": {
+        "store": "",
+        "trans": "",
+        "cla": ""
+    },
+    "ext1": "",
+    "ext2": "",
+    "cla": "",
+    "errorDesc": "",
+    "generalName": "一次性注射器",
+    "hosGoodsErpCode": "",
+    "provName": "%s",
+    "provId": "p1df18",
+    "subProvErpCode": "",
+    "hosLbsx": "",
+    "hosKindLevelCode": "",
+    "certificateCode": "",
+    "brand": "",
+    "hosUnit": "支",
+    "mfrsCode": "",
+    "masterCode": "",
+    "goodsDesc": "",
+    "hwDesc": "1",
+    "packeage": "1",
+    "icdCode": "",
+    "icd20Code": "",
+    "icdName": "",
+    "ext3": "{\"store\":\"\",\"trans\":\"\",\"cla\":\"\"}",
+    "ext4": "",
+    "ext5": "",
+    "ext6": "",
+    "tempPurchase": "0",
+    "charging": "1",
+    "isMetering": "1",
+    "isSubprov": "0",
+    "midPackageUnit": "",
+    "useUnit": "",
+    "useUnitCount": "1",
+    "hosUnitCount": "1",
+    "provUnitCount": "1",
+    "functional": "",
+    "material": "",
+    "keySupervision": "0",
+    "handleStatus": "0",
+    "dataSource": "2",
+    "errorFlag": "",
+    "userId": ""
+}
+
+"payload11": {"pageNum":1,"pageSize":50,"queryObject":{"subProvName":"","clientType":"","tbStatus":"","provId":"p1df18"},"orderBy":"sr.create_time desc"}
+"payload12": {"provId":"p1df18","subProvId":"","clientType":"","hosName":"","tbStatus":20,"activeFlag":1}
+"payload13": {"pageNum":1,"pageSize":50,"queryObject":{"subProvName":"","provId":"p1df18","clientType":"","hosName":"","hosCustomerQuery":1}}
+
+checkDict: {"code": 0,'msg': None,'data':1}
+checkDict1: {"code": 400,'msg': '供销关系已存在！请勿重复添加','data':None}
+checkDict2: {"code": 400,'msg': None,'data':None}
+checkDict3: {'code': 400, 'msg': '数据更新不成功，可能数据的版本不一致！请刷新页面重试', 'data': None}
+checkDict4: {'code': 0, 'msg': None, 'data': []}
+checkDict5: {'code': 0, 'msg': None, 'tag': None, 'data': 1}
\ No newline at end of file

data/a4_mdm3_cm2/message

+供货关系申请:
+  e_corpId: p1e0e8
+  h_corpId: h287b
+  e_username: 国药集团公司7C1o8
+  h_name: 湖南省人民医院v7(@o

data/a5_mdm3_pdm/data

@@ -47,7 +47,7 @@ json_headers2: {
     "ygptPrimaryCode": "123456789",
     "isDistrRel": "0",
     "isOnline": "0",
-    "onlineKind": "dictOnlineKind:1",
+    "onlineKind": "20",
     "hosFactId": "",
     "hosFcatKind": 0,
     "remark": "无 ",
@@ -130,7 +130,7 @@ json_headers2: {
     "ygptPrimaryCode": "123456789",
     "isDistrRel": "0",
     "isOnline": "0",
-    "onlineKind": "dictOnlineKind:1",
+    "onlineKind": "20",
     "hosFactId": "",
     "hosFcatKind": 0,
     "remark": "无 ",
@@ -213,7 +213,7 @@ json_headers2: {
     "ygptPrimaryCode": "123456789",
     "isDistrRel": "0",
     "isOnline": "0",
-    "onlineKind": "dictOnlineKind:1",
+    "onlineKind": "20",
     "hosFactId": "",
     "hosFcatKind": 0,
     "remark": "无 ",

report/summary.html

@@ -56,7 +56,7 @@
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分2秒</td>
+            <td class='details-col-elapsed'>0分5秒</td>
             <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
@@ -72,9 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a_c7_期初录入_低值_已生成单据_查看详情/log.html' target='_blank'>a_c7_期初录入_低值_已生成单据_查看详情</a></td>
+            <td class="details-col-elapsed"><a href='../log/a1_1产品新增导入_高值/log.html' target='_blank'>a1_1产品新增导入_高值</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">2.076</td>
+            <td class="details-col-elapsed">5.02</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>