修改脚本适合融合环境

air_case/a5_mdm3_pdm/a4产品信息审核驳回.air/a4产品信息审核驳回.py

@@ -50,7 +50,6 @@ def test1():
                                             projectCode)
     info = FileUtils().r_info6(module, "产品审核信息",'message2')
     print(info)
-    # total= info['total']
     MSPid = info['MSPid']
     hosId = info['hosId']
     hosGoodsId = info['hosGoodsId']
@@ -63,7 +62,9 @@ def test1():
     print('产品信息审核查询请求体', request_body)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    print("产品信息审核查询返回结果", result)
+    print("产品信息审核驳回返回结果", result)
     checkDict=commonFuc().get_business_data(module,'checkDict')
     commonFuc().check_result(checkDict,result)
+test1()
+print('分割线====================================')
 test1()
\ No newline at end of file

air_case/a5_mdm3_pdm/a6产品信息审核_获取产品详情信息.air/a6产品信息审核_获取产品详情信息.py

@@ -6,63 +6,61 @@ import sys
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,产品信息审核_获取产品详情信息,id2251,id2251-6,sit,on
-主数据平台:产品信息审核_获取产品详情信息
+case_tag:api,mdm-web,a6产品信息审核_获取产品详情信息,id2251,id2251-6,sit,on,2023091201
+主数据平台:a6产品信息审核_获取产品详情信息
 """
-module = "mdm3_pim"
 from common.common_func import commonFuc, using
 from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
-pro_path=commonFuc().get_pro_path()
-# sys.path.append(pro_path+r'\\air_case\\mdm3_pim\\a3产品信息审核_查询.air')
-# using(pro_path+r'\\air_case\\mdm3_pim\\a3产品信息审核_查询.air')
-# from a3产品信息审核_查询 import *
-sys.path.append(pro_path+r'\\air_case\\mdm3_pim\\a5产品信息审核_锁定后查询.air')
-using(pro_path+r'\\air_case\\mdm3_pim\\a5产品信息审核_锁定后查询.air')
-from a5产品信息审核_锁定后查询 import *
+module = "a5_mdm3_pdm"
+def select1():
+    module = "a5_mdm3_pdm"
+    pro_path=commonFuc().get_pro_path()
+    sys.path.append(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token,projectCode,uxid,corpId,username=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')
+    from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
+    h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
 
-"""
- 场景:产品信息审核_锁定后查询
- 用例名称：产品信息审核_锁定后查询
- 输入：无
- 输出："rtn_msg": "ok"
-"""
-# 登录
-username = global_var_cname
-password = commonFuc().get_business_data(module, "password")
-print(username, password)
-# 获取token和projectCode
-token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
-# 产品信息审核查询
-module = "mdm3_pim"
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "getGoodsRegistBillDetail_url")
-GRBid=global_var_GRBid
-url = url + GRBid + "/1"
-print('url', url)
-# 获取请求头信息
-headers = commonFuc().get_business_data(module, "json_headers2",
-                                        commonFuc().get_business_data(module, "json_contentType"), token,
-                                        projectCode)
+    sys.path.append(pro_path + r'\\air_case\\a5_mdm3_pdm\\a3产品信息审核_查询.air')
+    using(pro_path + r'\\air_case\\a5_mdm3_pdm\\a3产品信息审核_查询.air')
+    from a3产品信息审核_查询 import select1
+    """
+     场景:a6产品信息审核_获取产品详情信息
+     用例名称：a6产品信息审核_获取产品详情信息
+     输入：CRid
+     输出："rtn_msg": "ok"
+    """
+    # 登录
+    username = h_name
+    password = commonFuc().get_business_data(module, "password")
+    print(username, password)
+    # 获取token和projectCode
+    token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
+    # 产品信息审核查询
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "getAuditGoodsListByIds_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+    info = FileUtils().r_info6(module, "产品审核信息", 'message2')
+    print(info)
+    MSPid = info['goodsAuditBillId']
+    request_body = commonFuc().get_business_data(module, "payload4",MSPid)
+
+    # print('产品信息审核查询请求体', request_body)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print("获取产品详细信息接口返回结果", result)
+    data = commonFuc().analysis_json('data', result)
+    total=commonFuc().analysis_json('total', data)
+    if total >= 1:
+        commonFuc().check_text_exist('0',result)
+    else:
+        commonFuc().check_text_exist('error', result)
 
-# 发送请求
-result = commonFuc().http_get(url, headers)
-# print('产品锁定后查询获取必要信息', result)
-# print('data',data)
-goodsRegistVO_id = commonFuc().analysis_json('id', commonFuc().analysis_json('goodsRegistVO',
-                                                                             commonFuc().analysis_json('data', result)))
-print('goodsRegistVO_id', goodsRegistVO_id)
 
-goodsName = global_var_p_name
-goodsMfrsId = commonFuc().analysis_json('goodsMfrsId', commonFuc().analysis_json('goodsRegistVO',
-                                                                                 commonFuc().analysis_json('data',
-                                                                                                           result)))
-corpId = commonFuc().analysis_json('corpId', commonFuc().analysis_json('goodsRegistVO',
-                                                                       commonFuc().analysis_json('data', result)))
-registrationRegistVO_id = commonFuc().analysis_json('id', commonFuc().analysis_json('registrationRegistVO',
-                                                                                    commonFuc().analysis_json('data',
-                                                                                                              result)))
-goodsSpecsRegistVOList_id = commonFuc().analysis_json('id', commonFuc().analysis_json('goodsSpecsRegistVOList',
-                                                                                      commonFuc().analysis_json('data',
-                                                                                                                result)))
-print(goodsRegistVO_id, goodsMfrsId, corpId, registrationRegistVO_id, goodsSpecsRegistVOList_id)
-#断言
-commonFuc().check_text_exist(goodsName,result)
\ No newline at end of file
+select1()
\ No newline at end of file

air_case/a5_mdm3_pdm/a7产品信息审核_查询.air/a7产品信息审核_查询.py

+# -*- encoding=utf8 -*-
+from common.timeUtils import timeUtils
+from common.fileUtls import FileUtils
+import sys
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a7产品信息审核查询,id2251,id2251-7-1,sit,on,2023091201
+主数据平台:a7产品信息审核查询
+"""
+from common.common_func import commonFuc, using
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+module = "a5_mdm3_pdm"
+def select1():
+    module = "a5_mdm3_pdm"
+    pro_path=commonFuc().get_pro_path()
+    sys.path.append(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token,projectCode,uxid,corpId,username=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')
+    from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
+    h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
+
+    # 新增产品信息,保证查询有数据
+    sys.path.append(pro_path + r'\\air_case\\a5_mdm3_pdm\\a1产品新增导入.air')
+    using(pro_path + r'\\air_case\\a5_mdm3_pdm\\a1产品新增导入.air')
+    from a1产品新增导入 import add_goods
+    add_goods()
+    """
+     场景:a7产品信息审核查询
+     用例名称：a7产品信息审核查询
+     输入：CRid
+     输出："rtn_msg": "ok"
+    """
+    # 登录
+    username = h_name
+    password = commonFuc().get_business_data(module, "password")
+    print(username, password)
+    # 获取token和projectCode
+    token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
+    # 产品信息审核查询
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "getAuditGoodsListByPage_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+
+    request_body = commonFuc().get_business_data(module, "payload2",h_corpId)
+
+    # print('产品信息审核查询请求体', request_body)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print("产品信息审核查询返回结果", result)
+    data = commonFuc().analysis_json('data', result)
+    total=commonFuc().analysis_json('total', data)
+    data1=commonFuc().analysis_json('data', data)
+    if total>=1:
+        id1 = commonFuc().analysis_json('id', data1[0])
+        auditOrgId=commonFuc().analysis_json('hosId', data1[0])
+        hosGoodsId=commonFuc().analysis_json('hosGoodsid', data1[0])
+        provGoodsid=commonFuc().analysis_json('provGoodsid', data1[0])
+        goodsAuditBillId=commonFuc().analysis_json('billId', data1[0])
+        targetId=commonFuc().analysis_json('id', data1[0])
+        print(id1, auditOrgId, hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+        info = (id1, auditOrgId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+        titlename = ("MSPid", 'hosId','hosGoodsId','provGoodsid','goodsAuditBillId','targetId')
+        # 将产品审核信息写入到文件中
+        FileUtils().w_info6(info, module, '产品审核信息', titlename,'message2')
+    else:
+        commonFuc().check_text_exist(0, result)
+select1()
\ No newline at end of file

air_case/a5_mdm3_pdm/a7产品信息审核_通过.air/a7产品信息审核_通过.py

-# -*- encoding=utf8 -*-
-from common.timeUtils import timeUtils
-from common.fileUtls import FileUtils
-import sys
-
-__author__ = "xiaohesheng"
-
-"""
-case_tag:api,mdm-web,产品信息审核通过,id2251,id2251-7,sit,on
-主数据平台:产品信息审核通过
-"""
-module = "mdm3_pim"
-from common.common_func import commonFuc, using
-from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
-pro_path=commonFuc().get_pro_path()
-sys.path.append(pro_path+r'\\air_case\\mdm3_pim\\a6产品信息审核_获取产品详情信息.air')
-using(pro_path+r'\\air_case\\mdm3_pim\\a6产品信息审核_获取产品详情信息.air')
-from a6产品信息审核_获取产品详情信息 import *
-
-
-"""
- 场景:产品信息审核通过
- 用例名称：产品信息审核通过
- 输入：请求体
- 输出："rtn_msg": "ok"
-"""
-# 登录
-username = global_var_cname
-password = commonFuc().get_business_data(module, "password")
-print(username, password)
-# 获取token和projectCode
-token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
-# 产品信息审核查询
-module = "mdm3_pim"
-# =============================产品审核通过======================================
-url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "handleAuditGoodsRegist_url")
-# 获取请求头信息
-headers = commonFuc().get_business_data(module, "json_headers2",
-                                        commonFuc().get_business_data(module, "json_contentType"), token,
-                                        projectCode)
-now = timeUtils().get_time_hms()
-request_body = commonFuc().get_business_data(module, "payload9", GRBid, goodsRegistVO_id, now, now, uxid, uxid, GRBid,
-                                             goodsName, goodsMfrsId, goodsMfrsId, corpId, corpId,
-                                             goodsSpecsRegistVOList_id, now, now, uxid, uxid, GRBid, goodsRegistVO_id,
-                                             goodsMfrsId, goodsName, goodsName, goodsName, goodsName, goodsName,
-                                             goodsName, registrationRegistVO_id, now, now, uxid, uxid, GRBid,
-                                             goodsRegistVO_id, goodsName, now, goodsMfrsId, goodsMfrsId, goodsName)
-# 发送请求
-result = commonFuc().http_post(url, request_body, headers)
-# print('产品审核通过',result)
-code = commonFuc().analysis_json('code', result)
-# print('code',code)
-commonFuc().check_text_exist(code, result)
\ No newline at end of file

air_case/a5_mdm3_pdm/a7产品信息审核批量_通过.air/a7产品信息审核批量_通过.py

+# -*- encoding=utf8 -*-
+from common.common_func import commonFuc
+from common.timeUtils import timeUtils
+from common.fileUtls import FileUtils
+from common.common_func import commonFuc, using
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+import sys
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a7产品信息审核批量_通过,id2251,id2251-7-2,sit,on,2023091201
+主数据平台:a7产品信息审核批量_通过
+"""
+module = "a5_mdm3_pdm"
+def test1():
+    module = "a5_mdm3_pdm"
+    pro_path=commonFuc().get_pro_path()
+    sys.path.append(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token,projectCode,uxid,corpId,username=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')
+    from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
+    h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
+    """
+     场景:a7产品信息审核批量_通过
+     用例名称：a7产品信息审核批量_通过
+     输入：CRid
+     输出："rtn_msg": "ok"
+    """
+    # 登录
+    username = h_name
+    password = commonFuc().get_business_data(module, "password")
+    print(username, password)
+    # 获取token和projectCode
+    token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
+    # 审批产品驳回
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "batchAuditByGoodsCert_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+    info = FileUtils().r_info6(module, "产品审核信息",'message2')
+    print(info)
+    MSPid = info['MSPid']
+    hosId = info['hosId']
+    hosGoodsId = info['hosGoodsId']
+    provGoodsid = info['provGoodsid']
+    goodsAuditBillId= info['goodsAuditBillId']
+    targetId= info['targetId']
+
+    request_body = commonFuc().get_business_data(module, "payload5",hosId,goodsAuditBillId)
+
+    print('a7产品信息审核批量_通过', request_body)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print("a7产品信息审核批量_通过,结果", result)
+    checkDict=commonFuc().get_business_data(module,'checkDict3')
+    commonFuc().check_result(checkDict,result)
+test1()
\ No newline at end of file

air_case/a5_mdm3_pdm/a8产品信息审核批量_驳回.air/a8产品信息审核批量_驳回.py

+# -*- encoding=utf8 -*-
+import json
+
+from common.common_func import commonFuc
+from common.timeUtils import timeUtils
+from common.fileUtls import FileUtils
+from common.common_func import commonFuc, using
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+import sys
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a8产品信息审核批量_驳回,id2251,id2251-8,sit,on
+主数据平台:a8产品信息审核批量_驳回
+"""
+module = "a5_mdm3_pdm"
+def test1():
+    module = "a5_mdm3_pdm"
+    pro_path=commonFuc().get_pro_path()
+    sys.path.append(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token,projectCode,uxid,corpId,username=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')
+    from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
+    h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
+
+    # 新增产品信息,保证查询有数据
+    sys.path.append(pro_path + r'\\air_case\\a5_mdm3_pdm\\a1产品新增导入.air')
+    using(pro_path + r'\\air_case\\a5_mdm3_pdm\\a1产品新增导入.air')
+    from a1产品新增导入 import add_goods
+    add_goods()
+
+    sys.path.append(pro_path + r'\\air_case\\a5_mdm3_pdm\\a3产品信息审核_查询.air')
+    using(pro_path + r'\\air_case\\a5_mdm3_pdm\\a3产品信息审核_查询.air')
+    from a3产品信息审核_查询 import select1
+    # select1()
+    """
+     场景:a8产品信息审核批量_驳回
+     用例名称：a8产品信息审核批量_驳回
+     输入：CRid
+     输出："rtn_msg": "ok"
+    """
+    # 登录
+    username = h_name
+    password = commonFuc().get_business_data(module, "password")
+    print(username, password)
+    # 获取token和projectCode
+    token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
+    # 审批产品驳回
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "batchRejectAudit_url")
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                            projectCode)
+    info = FileUtils().r_info6(module, "产品审核信息",'message2')
+    print(info)
+    MSPid = info['MSPid']
+    hosId = info['hosId']
+    hosGoodsId = info['hosGoodsId']
+    provGoodsid = info['provGoodsid']
+    goodsAuditBillId= info['goodsAuditBillId']
+    targetId= info['targetId']
+
+    request_body = commonFuc().get_business_data(module, "payload3_2",MSPid,hosId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+    request_body="["+str(request_body)+"]"
+    # string = "这是一段包含'单引号'的文本"
+    new_request_body = request_body.replace("'", '"')
+
+    request_body_json=json.loads(new_request_body)
+    print('a8产品信息审核批量_驳回', request_body_json)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body_json, headers)
+    print("a8产品信息审核批量_驳回返回结果", result)
+    checkDict=commonFuc().get_business_data(module,'checkDict3')
+    commonFuc().check_result(checkDict,result)
+test1()

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

 # -*- encoding=utf8 -*-
+from common.common_func import commonFuc
 from common.timeUtils import timeUtils
 from common.fileUtls import FileUtils
+from common.common_func import commonFuc, using
+from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
+import sys
+
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,产品新增和审核,id2251,id2251-8,sit,on,2023091201
-主数据平台:产品新增和审核通过
+case_tag:api,mdm-web,a7产品信息审核批量_通过,id2251,id2251-x,sit,on,2023091201
+主数据平台:a7产品信息审核批量_通过
 """
-
-from common.common_func import commonFuc
-from air_case.mdm_login.登录外网系统.登录外网系统 import login_system
-
-
-def Enterprise_audit():
-    module = "mdm3_ea"
-    # 注册企业
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "CompanyRegist_url")
-    # #获取请求头信息
-    headers = commonFuc().get_business_data(module, "json_headers",
-                                            commonFuc().get_business_data(module, "json_contentType"))
-    print(headers)
-    name = commonFuc().get_business_data(module, "name1")  # 获取前缀name
-    cname = name + commonFuc().randomString(5)  # 随机数生成拼接企业名称
-    request_body = commonFuc().get_business_data(module, "payload", cname, cname, cname, cname, cname, cname)
-    print(request_body)
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    # 获取接口返回id
-    id1 = commonFuc().analysis_json('id', result)
-    # 企业注册提交接口_认领
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "updateById_url")
-    username = commonFuc().get_business_data(module, "username")
-    password = commonFuc().get_business_data(module, "password")
-    print(username, password)
-    # 获取token和projectCode
-    token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
-    # 获取请求头信息
-    headers = commonFuc().get_business_data(module, "json_headers2",
-                                            commonFuc().get_business_data(module, "json_contentType"), token,
-                                            projectCode, token)
-    request_body = commonFuc().get_business_data(module, "payload1", id1)
-
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    print(result)
-    # 获取预期结果
-    check_dict = commonFuc().get_business_data(module, "checkDict")
-    print(check_dict)
-    # 断言实际结果中是否包含预期结果的内容
-    commonFuc().check_result(check_dict, result)
-    # =============== 企业注册提交接口_认领结束
-    # 企业审核接口_查询数据_开始
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "queryListPage_url")
-    request_body = commonFuc().get_business_data(module, "payload2", cname)
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    # 获取接口返回数据
-    code = commonFuc().analysis_json('code', result)
-    # 断言实际结果中是否包含预期结果的内容
-    # commonFuc().check_result(code, result)
-    # 断言实际结果中是否包含预期的文本
-    commonFuc().check_text_exist(code, result)
-    # ===============企业注册提交接口_查询数据_结束
-
-    # 企业注册提交接口_锁定_开始
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "queryAlCompanyRegistInfo_url")
-    request_body = commonFuc().get_business_data(module, "payload3", id1)
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    # 获取接口返回数据
-    code = commonFuc().analysis_json('code', result)
-    # 断言实际结果中是否包含预期结果的内容
-    commonFuc().check_text_exist(code, result)
-    # ===============企业注册提交接口_锁定_结束
-
-    # 企业审核接口_再次查询数据_开始
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "upCompanyList_url")
-    request_body = commonFuc().get_business_data(module, "payload4", cname)
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    # 获取接口返回数据
-    code = commonFuc().analysis_json('code', result)
-    # 断言实际结果中是否包含预期结果的内容
-    commonFuc().check_text_exist(code, result)
-    # ===============企业注册提交接口_查询数据_结束
-
-    # 企业注册提交接口_审核通过_开始
-    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)
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    # print('企业审核通过aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',result)
-    # 获取接口返回数据
-    code = commonFuc().analysis_json('code', result)
-    check_dict1 = commonFuc().get_business_data(module, "checkDict1")
-
-    # 断言实际结果中是否包含预期结果的内容
-    # commonFuc().check_result(check_dict1, result)
-    return cname
-    # ===============企业注册提交接口_审核通过_结束
-
-def p_m_a():
-    module = "mdm3_pim"
+module = "a5_mdm3_pdm"
+def test1():
+    module = "a5_mdm3_pdm"
+    pro_path=commonFuc().get_pro_path()
+    sys.path.append(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    using(pro_path+r'\\air_case\\a4_mdm3_cm\\a2供货关系申请_客户类型_医院_登录_企业登录.air')
+    from a2供货关系申请_客户类型_医院_登录_企业登录 import e_login
+    token,projectCode,uxid,corpId,username=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')
+    from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
+    h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
+    """
+     场景:a7产品信息审核批量_通过
+     用例名称：a7产品信息审核批量_通过
+     输入：CRid
+     输出："rtn_msg": "ok"
+    """
     # 登录
-    username = Enterprise_audit()
-    print('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',username)
+    username = h_name
     password = commonFuc().get_business_data(module, "password")
     print(username, password)
     # 获取token和projectCode
-    print('aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
-    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")
-
-    # 获取请求头信息
-    headers = commonFuc().get_business_data(module, "json_headers2",
-                                            commonFuc().get_business_data(module, "json_contentType"), token,
-                                            projectCode)
-    request_body = commonFuc().get_business_data(module, "payload", corpId)
-
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    # print('实际值',result)
-    code = commonFuc().analysis_json('code', result)
-    data = commonFuc().analysis_json('data', result)
-    data = commonFuc().analysis_json('data', data)
-    # print('aaaaaaaaaaaaaaaaaaaaaaaaaaaa',data)
-    # 断言实际结果中是否包含预期结果的内容
-    # 新注册的企业首次查询产品信息，预期结果为空
-    check_dict = commonFuc().get_business_data(module, "checkDict")
-    # print('预期值',check_dict)
-    commonFuc().check_text_exist(code, result)  # 检查验证码
-    commonFuc().check_text_exist(data, result)  # 检查数据data为空[]
-    # 产品申报
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submitGoodsRegist_url")
-    # 获取请求头信息
-    headers = commonFuc().get_business_data(module, "json_headers2",
-                                            commonFuc().get_business_data(module, "json_contentType"), token,
-                                            projectCode)
-    p_name = commonFuc().get_business_data(module, "name1")  # 获取前缀name
-    p_name = p_name + commonFuc().randomString(5)  # 随机数生成拼接产品名称
-    request_body = commonFuc().get_business_data(module, "payload6", p_name, p_name, p_name, p_name, p_name, p_name, p_name,
-                                                 p_name, p_name, p_name, p_name, p_name, p_name, p_name)
-    print('新增产品请求体', request_body)
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    print("新增产品返回结果", result)
-    goodsRegistVO = commonFuc().analysis_json('goodsRegistVO', result)
-    goodsName = commonFuc().analysis_json('goodsName', goodsRegistVO)
-    commonFuc().check_text_exist(goodsName, result)  # 检查返回结果中是否存在新增的产品名称
-    # ===================产品查询==========================================
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "listAuditBillByPage_url")
-    # 获取请求头信息
-    headers = commonFuc().get_business_data(module, "json_headers2",
-                                            commonFuc().get_business_data(module, "json_contentType"), token,
-                                            projectCode)
-    request_body = commonFuc().get_business_data(module, "payload7", p_name)
-
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    print('查询产品信息',result)
-    data = commonFuc().analysis_json('data', result)
-    GRBid = commonFuc().analysis_json('id', data)
-    print('GRBid',GRBid)
-    # ===================产品查询后锁定==================================================
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "updateById_url2")
-    # 获取请求头信息
-    headers = commonFuc().get_business_data(module, "json_headers2",
-                                            commonFuc().get_business_data(module, "json_contentType"), token,
-                                            projectCode)
-    now = timeUtils().get_time_hms()
-    request_body = commonFuc().get_business_data(module, "payload8", GRBid, uxid, now)
-    # 发送请求
-    result = commonFuc().http_post(url, request_body, headers)
-    # print('锁定结果',result)
-    # ===================产品锁定后查询获取产品详情登等必要信息==========================================
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "getGoodsRegistBillDetail_url")
-    url = url + GRBid + "/1"
-    print('url', url)
+    token, projectCode, uxid, corpId,info = login_system(username, password).get_token()
+    # 审批产品驳回
+    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "batchAuditByGoodsCert_url")
     # 获取请求头信息
     headers = commonFuc().get_business_data(module, "json_headers2",
                                             commonFuc().get_business_data(module, "json_contentType"), token,
                                             projectCode)
+    info = FileUtils().r_info6(module, "产品审核信息",'message2')
+    print(info)
+    MSPid = info['MSPid']
+    hosId = info['hosId']
+    hosGoodsId = info['hosGoodsId']
+    provGoodsid = info['provGoodsid']
+    goodsAuditBillId= info['goodsAuditBillId']
+    targetId= info['targetId']
 
-    # 发送请求
-    result = commonFuc().http_get(url, headers)
-    print('产品锁定后查询获取必要信息', result)
-    # print('data',data)
-    goodsRegistVO_id = commonFuc().analysis_json('id', commonFuc().analysis_json('goodsRegistVO',
-                                                                                 commonFuc().analysis_json('data', result)))
-    print('goodsRegistVO_id', goodsRegistVO_id)
+    request_body = commonFuc().get_business_data(module, "payload5",hosId,goodsAuditBillId)
 
-    goodsName = p_name
-    goodsMfrsId = commonFuc().analysis_json('goodsMfrsId', commonFuc().analysis_json('goodsRegistVO',
-                                                                                     commonFuc().analysis_json('data',
-                                                                                                               result)))
-    corpId = commonFuc().analysis_json('corpId', commonFuc().analysis_json('goodsRegistVO',
-                                                                           commonFuc().analysis_json('data', result)))
-    registrationRegistVO_id = commonFuc().analysis_json('id', commonFuc().analysis_json('registrationRegistVO',
-                                                                                        commonFuc().analysis_json('data',
-                                                                                                                  result)))
-    goodsSpecsRegistVOList_id = commonFuc().analysis_json('id', commonFuc().analysis_json('goodsSpecsRegistVOList',
-                                                                                          commonFuc().analysis_json('data',
-                                                                                                                    result)))
-    print(goodsRegistVO_id, goodsMfrsId, corpId, registrationRegistVO_id, goodsSpecsRegistVOList_id)
-    # =============================产品审核通过======================================
-    url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "handleAuditGoodsRegist_url")
-    # 获取请求头信息
-    headers = commonFuc().get_business_data(module, "json_headers2",
-                                            commonFuc().get_business_data(module, "json_contentType"), token,
-                                            projectCode)
-    request_body = commonFuc().get_business_data(module, "payload9", GRBid, goodsRegistVO_id, now, now, uxid, uxid, GRBid,
-                                                 goodsName, goodsMfrsId, goodsMfrsId, corpId, corpId,
-                                                 goodsSpecsRegistVOList_id, now, now, uxid, uxid, GRBid, goodsRegistVO_id,
-                                                 goodsMfrsId, goodsName, goodsName, goodsName, goodsName, goodsName,
-                                                 goodsName, registrationRegistVO_id, now, now, uxid, uxid, GRBid,
-                                                 goodsRegistVO_id, goodsName, now, goodsMfrsId, goodsMfrsId, goodsName)
+    print('a7产品信息审核批量_通过', request_body)
     # 发送请求
     result = commonFuc().http_post(url, request_body, headers)
-    # print('产品审核通过',result)
-    code= commonFuc().analysis_json('code', result)
-    # print('code',code)
-    commonFuc().check_text_exist(code,result)
-    print('username',username)
-    return username,goodsName,module
-# p_m_a()
-if __name__ == '__main__':
-    FileUtils().w_info(p_m_a(),'产品新增')
+    print("a7产品信息审核批量_通过,结果", result)
+    checkDict=commonFuc().get_business_data(module,'checkDict3')
+    commonFuc().check_result(checkDict,result)
+test1()
\ No newline at end of file

data/a5_mdm3_pdm/data

@@ -2,6 +2,9 @@
 "queryImportTasksLst_url": "/test2api/hdiFusion/import/goods/queryImportTasksLst"
 "singleAudit_url": "/test2api/hdiFusion/goodsAuditBill/singleAudit"
 "getAuditGoodsListByPage_url": "/test2api/hdiFusion/goodsAuditBill/getAuditGoodsListByPage?hosVersion=3"
+"getAuditGoodsListByIds_url": "/test2api/hdiFusion/goodsAuditBill/getAuditGoodsListByIds"
+"batchAuditByGoodsCert_url": "/test2api/hdiFusion/goodsAuditBill/batchAuditByGoodsCert"
+"batchRejectAudit_url": "/test2api/hdiFusion/goodsAuditBill/batchRejectAudit?hosVersion=3"
 "username": "test001"
 "password": "a123456!"
 json_contentType: "application/json"
@@ -269,12 +272,13 @@ json_headers2: {
 "payload2": {"orderBy":"","queryObject":{"provName":"","goodsName":"","certificateCode":"","state":10,"mfrsName":"","branchId":"","tempPurchase":"","flag":"","datePickerData":[],"certCompleteFlag":0,"hosId":"%s","provId":null,"startDate":"","endDate":"","auditor":""},"pageNum":1,"pageSize":50}
 "payload3": {"id":"%s","auditOrgId":"%s","hosGoodsId":"%s","provGoodsid":"%s","goodsAuditBillId":"%s","targetId":"%s","eventType":"2","status":5,"rowRejectMemo":"审核驳回","hosVersion":3}
 "payload3_1": {"id":"%s","auditOrgId":"%s","hosGoodsId":"%s","provGoodsid":"%s","goodsAuditBillId":"%s","targetId":"%s","eventType":"2","status":30,"rowRejectMemo":"审核驳回","hosVersion":3}
-
-
+"payload4": {"orderBy":"","queryObject":{"idArrStr":"%s","hosVersion":3},"pageNum":1,"pageSize":50}
+"payload5": {"hosId":"%s","idArrStr":"%s","hosVersion":3}
+"payload3_2": {"id":"%s","auditOrgId":"%s","hosGoodsId":"%s","provGoodsid":"%s","goodsAuditBillId":"%s","targetId":"%s","eventType":"2","status":5,"rowRejectMemo":"审核驳回"}
 
 
 checkDict: {'code': 0, 'msg': None, 'tag': None, 'data': 0}
 checkDict1: {'code': 1100000, 'msg': '暂时没有定义异码,中文描述为:审核失败', 'tag': '/mdmService:gyqx.spd.mdm.access.service.impl.Supply
 ApplyBillMainServiceImpl:644', 'data': None}
 checkDict2: {'code': 0, 'msg': None, 'tag': None, 'data': {'pageNum': 1, 'pageSize': 50, 'total': 0, 'data': [], 'totalInfo': None}}
-
+checkDict3: {'code': 0, 'msg': None, 'tag': None, 'data': True}

report/summary.html

@@ -54,10 +54,10 @@
         </tr>
 
         <tr width="600">
-            <td class='details-col-elapsed'>14</td>
-            <td class='details-col-elapsed'>9</td>
-            <td class='details-col-elapsed'>0分23秒</td>
-            <td class="details-col-elapsed">64.29%</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>0分11秒</td>
+            <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
 
@@ -72,100 +72,9 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a1_1产品新增导入_高值/log.html' target='_blank'>a1_1产品新增导入_高值</a></td>
+            <td class="details-col-elapsed"><a href='../log/a8产品信息审核批量_驳回/log.html' target='_blank'>a8产品信息审核批量_驳回</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">5.543</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a1_2产品新增导入_试剂/log.html' target='_blank'>a1_2产品新增导入_试剂</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">2.473</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a1产品新增导入/log.html' target='_blank'>a1产品新增导入</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">2.125</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a2产品导入查询/log.html' target='_blank'>a2产品导入查询</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">1.697</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a3产品信息审核_查询/log.html' target='_blank'>a3产品信息审核_查询</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">2.398</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a4产品信息审核通过/log.html' target='_blank'>a4产品信息审核通过</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">2.431</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a4产品信息审核驳回/log.html' target='_blank'>a4产品信息审核驳回</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">4.52</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a5产品信息审核查询_无数据/log.html' target='_blank'>a5产品信息审核查询_无数据</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">2.15</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a6产品信息审核_获取产品详情信息/log.html' target='_blank'>a6产品信息审核_获取产品详情信息</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">0.005</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a7产品信息审核_通过/log.html' target='_blank'>a7产品信息审核_通过</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">0.006</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a8产品新增和审核通过/log.html' target='_blank'>a8产品新增和审核通过</a></td>
-            <td class="success">成功</td>
-            <td class="details-col-elapsed">0.002</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a8产品新增和审核驳回/log.html' target='_blank'>a8产品新增和审核驳回</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">0.004</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a99产品信息审核_锁定/log.html' target='_blank'>a99产品信息审核_锁定</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">0.003</td>
-            <td class="details-col-elapsed">xiaohesheng</td>
-        </tr>
-        
-        <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a99产品信息审核_锁定后查询/log.html' target='_blank'>a99产品信息审核_锁定后查询</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">0.003</td>
+            <td class="details-col-elapsed">11.686</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>