修改脚本适合融合环境

air_case/a5_mdm3_pdm/a1产品新增导入.air/a1产品新增导入.py

@@ -35,8 +35,8 @@ def add_goods():
     from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
     h_token, h_projectCode, h_uxid, h_corpId, h_name = h_login()
     """
-     场景:b18供货目录申请_客户类型_医院_提交供货申请单_添加产品
-     用例名称：b18供货目录申请_客户类型_医院_提交供货申请单_添加产品
+     场景:a1产品新增导入
+     用例名称：a1产品新增导入
      输入：医院id
      输出："rtn_msg": 0
     """
@@ -59,7 +59,8 @@ def add_goods():
     code=commonFuc().analysis_json('code',result)
     data=commonFuc().analysis_json('data',result)
     if code==0:
-        commonFuc().check_text_exist(corpId,result)
-
+        commonFuc().check_text_exist(code,result)
+    else:
+        commonFuc().check_text_exist(-1, result)
 add_goods()
 

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

@@ -6,53 +6,63 @@ import sys
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,产品信息审核查询,id2251,id2251-3,sit,on,2023091201
-主数据平台:产品信息审核查询
+case_tag:api,mdm-web,a5产品信息审核查询_无数据,id2251,id2251-5,sit,on,2023091201
+主数据平台:a3产品信息审核查询
 """
-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\\a1分页查询供应商产品数据.air')
-# using(pro_path+r'\\air_case\\mdm3_pim\\a1分页查询供应商产品数据.air')
-# from a1分页查询供应商产品数据 import *
-sys.path.append(pro_path+r'\\air_case\\mdm3_pim\\a2产品信息申报.air')
-using(pro_path+r'\\air_case\\mdm3_pim\\a2产品信息申报.air')
-from a2产品信息申报 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()
+    """
+     场景:产品信息审核查询
+     用例名称：产品信息审核查询
+     输入：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)
 
-"""
- 场景:产品信息审核查询
- 用例名称：产品信息审核查询
- 输入：CRid
- 输出："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, "listAuditBillByPage_url")
-# 获取请求头信息
-headers = commonFuc().get_business_data(module, "json_headers2",
-                                        commonFuc().get_business_data(module, "json_contentType"), token,
-                                        projectCode)
-p_name = global_var_p_name
-request_body = commonFuc().get_business_data(module, "payload7",p_name)
+    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)
-GRBid = commonFuc().analysis_json('id', data)
-global_var_GRBid=GRBid
-if total==1:
-    commonFuc().check_text_exist(p_name, result)
+    # print('产品信息审核查询请求体', request_body)
+    # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print("产品信息审核查询返回结果", result)
     data = commonFuc().analysis_json('data', result)
-else:
-    commonFuc().check_text_exist(p_name+'error', result)
+    total=commonFuc().analysis_json('total', data)
+    if total>=1:
+        id1 = commonFuc().analysis_json('id', data)
+        auditOrgId=commonFuc().analysis_json('hosId', data)
+        hosGoodsId=commonFuc().analysis_json('hosGoodsid', data)
+        provGoodsid=commonFuc().analysis_json('provGoodsid', data)
+        goodsAuditBillId=commonFuc().analysis_json('billId', data)
+        targetId=commonFuc().analysis_json('id', data)
+        print(id1, auditOrgId, hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+        info = (id1, auditOrgId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+        titlename = ('total',"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/a3产品信息申报.air/a3产品信息申报.py

-# -*- encoding=utf8 -*-
-from common.timeUtils import timeUtils
-from common.fileUtls import FileUtils
-import sys
-
-__author__ = "xiaohesheng"
-
-"""
-case_tag:api,mdm-web,产品信息申报,id2251,id2251-x,sit,on,2023091201
-主数据平台:产品信息申报
-"""
-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\\a1分页查询供应商产品数据.air')
-using(pro_path+r'\\air_case\\mdm3_pim\\a1分页查询供应商产品数据.air')
-from a1分页查询供应商产品数据 import *
-
-"""
- 场景:产品信息申报
- 用例名称：产品信息申报
- 输入：CRid
- 输出："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, "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)  # 检查返回结果中是否存在新增的产品名称
-global_var_p_name=p_name
\ No newline at end of file

air_case/a5_mdm3_pdm/a4产品信息审核驳回.air/a4产品信息审核驳回.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,a3产品信息审核驳回,id2251,id2251-4,sit,on,2023091201
+主数据平台:a3产品信息审核驳回
+"""
+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()
+    """
+     场景:a3产品信息审核驳回
+     用例名称：a3产品信息审核驳回
+     输入：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, "singleAudit_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)
+    total= info['total']
+    if total=='0':
+        print('无数据可以审核')
+    else:
+        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",MSPid,hosId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+
+        print('产品信息审核查询请求体', request_body)
+        # 发送请求
+        result = commonFuc().http_post(url, request_body, headers)
+        print("产品信息审核查询返回结果", result)
+        checkDict=commonFuc().get_business_data(module,'checkDict')
+        commonFuc().check_result(checkDict,result)
+test1()
\ No newline at end of file

air_case/a5_mdm3_pdm/a5产品信息审核查询_无数据.air/a5产品信息审核查询_无数据.py

+# -*- encoding=utf8 -*-
+from common.timeUtils import timeUtils
+from common.fileUtls import FileUtils
+import sys
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,mdm-web,a5产品信息审核查询_无数据,id2251,id2251-5,sit,on,2023091201
+主数据平台:a5产品信息审核查询_无数据
+"""
+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()
+    """
+     场景:产品信息审核查询
+     用例名称：产品信息审核查询
+     输入：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)
+    if total>=1:
+        id1 = commonFuc().analysis_json('id', data)
+        auditOrgId=commonFuc().analysis_json('hosId', data)
+        hosGoodsId=commonFuc().analysis_json('hosGoodsid', data)
+        provGoodsid=commonFuc().analysis_json('provGoodsid', data)
+        goodsAuditBillId=commonFuc().analysis_json('billId', data)
+        targetId=commonFuc().analysis_json('id', data)
+        print(id1, auditOrgId, hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+        info = (id1, auditOrgId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+        titlename = ('total',"MSPid", 'hosId','hosGoodsId','provGoodsid','goodsAuditBillId','targetId')
+        # 将产品审核信息写入到文件中
+        FileUtils().w_info6(info, module, '产品审核信息', titlename,'message2')
+    else:
+        commonFuc().check_text_exist('error', result)
+select1()
\ No newline at end of file

air_case/a5_mdm3_pdm/a4产品信息审核_锁定.air/a4产品信息审核_锁定.py → air_case/a5_mdm3_pdm/a99产品信息审核_锁定.air/a99产品信息审核_锁定.py

@@ -6,7 +6,7 @@ import sys
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,产品信息审核锁定,id2251,id2251-4,sit,on
+case_tag:api,mdm-web,产品信息审核锁定,id2251,id2251-x,sit,on
 主数据平台:产品信息审核锁定
 """
 module = "mdm3_pim"

air_case/a5_mdm3_pdm/a5产品信息审核_锁定后查询.air/a5产品信息审核_锁定后查询.py → air_case/a5_mdm3_pdm/a99产品信息审核_锁定后查询.air/a99产品信息审核_锁定后查询.py

@@ -6,7 +6,7 @@ import sys
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,产品信息审核_锁定后查询,id2251,id2251-5,sit,on
+case_tag:api,mdm-web,产品信息审核_锁定后查询,id2251,id2251-x,sit,on
 主数据平台:产品信息审核_锁定后查询
 """
 module = "mdm3_pim"

common/fileUtls.py

@@ -168,11 +168,48 @@ class FileUtils(object):
             # 写入到yaml文件
             with open(yamlpath, "w", encoding="utf-8") as f:
                 yaml.dump(dict, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)
+
         else:
             # 写入到yaml文件
             with open(yamlpath, "a", encoding="utf-8") as f:
                 yaml.dump(dict, f, Dumper=yaml.RoundTripDumper, allow_unicode=True)
+    #写入产品审核信息
+    def w_info6(self, info,module,keyname,titlename,message_no):
+        module=module
+        dict = {}
+        value = {}
+        for i in range(len(titlename)):
+            value[titlename[i]] = info[i]
+        # value[titlename[0]] = info[0]
+        # value[titlename[1]] = info[1]
+        key=keyname
+        dict[key] = value
+        w_path=rootPath+os.sep+'data'+os.sep+module
+        # print(w_path)
+        yamlpath = os.path.join(w_path, message_no)
+        if (self.r_info(module,keyname)!=None):
+            print('已有相同信息，覆盖写入')
+            # 写入到yaml文件
+            with open(yamlpath, "w", encoding="utf-8") as f:
+                yaml.dump(dict, f, Dumper=yaml.RoundTripDumper,allow_unicode=True)
 
+        else:
+            # 写入到yaml文件
+            with open(yamlpath, "a", encoding="utf-8") as f:
+                yaml.dump(dict, f, Dumper=yaml.RoundTripDumper, allow_unicode=True)
+    def r_info6(self, module,keyname,message_no):
+        w_path = rootPath + os.sep + 'data' + os.sep + module
+        yamlpath = os.path.join(w_path, message_no)
+        file_value = open(yamlpath, 'r',encoding='utf-8')
+        result = yaml.load(file_value.read(), Loader=yaml.Loader)
+        if result is not None:
+            key = keyname
+            if key in result:
+                return result[key]
+            else:
+                return None
+        else:
+            return None
 if __name__ == '__main__':
     # info=("aaaa","bbbbbb","mdm3-pim")
     # FileUtils().w_info(info,"产品新增")

data/a5_mdm3_pdm/data

 "addGoodsHandleInfos_url": "/test2api/hdiFusion/import/goods/addGoodsHandleInfos?flag=true"
 "queryImportTasksLst_url": "/test2api/hdiFusion/import/goods/queryImportTasksLst"
-
-
+"singleAudit_url": "/test2api/hdiFusion/goodsAuditBill/singleAudit"
+"getAuditGoodsListByPage_url": "/test2api/hdiFusion/goodsAuditBill/getAuditGoodsListByPage?hosVersion=3"
+"username": "test001"
+"password": "a123456!"
 json_contentType: "application/json"
 json_headers: {
   "Content-Type": "%s"
@@ -98,9 +100,13 @@ json_headers2: {
 "payload1": {
 "queryObject":{"id":"","taskBillId":"","startDate":"","endDate":"","hosVersion":2},"pageNum":1,"pageSize":50
 }
-"name1": "一次性注射器"
-checkDict: {"code": 0, "msg":None,"data": {"pageNum": 1, "pageSize": 20, "total": 0, "data": [], "totalInfo": None}}
-checkDict1: {"code": -2,"msg": "医院已被注册，请耐心等待审核通知!", "data": None}
-checkDict2: {'code': 0, 'msg': None, 'data': 'success'}
-checkDict3: {'code': 0, 'msg': None, 'data': 1}
+"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}
+
+
+
+
+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}
 

report/summary.html

@@ -54,10 +54,10 @@
         </tr>
 
         <tr width="600">
+            <td class='details-col-elapsed'>2</td>
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0分4秒</td>
-            <td class="details-col-elapsed">100.0%</td>
+            <td class='details-col-elapsed'>0分6秒</td>
+            <td class="details-col-elapsed">50.0%</td>
         </tr>
     </table>
 
@@ -72,9 +72,16 @@
         </tr>
         
         <tr width="600">
-            <td class="details-col-elapsed"><a href='../log/a2产品导入查询/log.html' target='_blank'>a2产品导入查询</a></td>
+            <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">4.737</td>
+            <td class="details-col-elapsed">4.523</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="fail">失败</td>
+            <td class="details-col-elapsed">2.099</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>