修改脚本适合融合环境

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

@@ -52,6 +52,7 @@ def select1():
     data = commonFuc().analysis_json('data', result)
     total=commonFuc().analysis_json('total', data)
     if total>=1:
+        data[0]=data
         id1 = commonFuc().analysis_json('id', data)
         auditOrgId=commonFuc().analysis_json('hosId', data)
         hosGoodsId=commonFuc().analysis_json('hosGoodsid', data)

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

@@ -9,7 +9,7 @@ import sys
 __author__ = "xiaohesheng"
 
 """
-case_tag:api,mdm-web,a3产品信息审核驳回,id2251,id2251-4-1,sit,on,2023091201
+case_tag:api,mdm-web,a4产品信息审核通过,id2251,id2251-4-1,sit,on,2023091201
 主数据平台:a3产品信息审核驳回
 """
 module = "a5_mdm3_pdm"
@@ -26,8 +26,8 @@ def test1():
     from a1供货关系申请_客户类型_医院_登录_医院登录获取医院id import h_login
     h_token,h_projectCode,h_uxid,h_corpId,h_name=h_login()
     """
-     场景:a3产品信息审核驳回
-     用例名称：a3产品信息审核驳回
+     场景:a4产品信息审核通过
+     用例名称：a4产品信息审核通过
      输入：CRid
      输出："rtn_msg": "ok"
     """
@@ -45,23 +45,21 @@ def test1():
                                             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']
+    # total= info['total']
 
-        request_body = commonFuc().get_business_data(module, "payload3_1",MSPid,hosId,hosGoodsId,provGoodsid,goodsAuditBillId,targetId)
+    MSPid = info['MSPid']
+    hosId = info['hosId']
+    hosGoodsId = info['hosGoodsId']
+    provGoodsid = info['provGoodsid']
+    goodsAuditBillId= info['goodsAuditBillId']
+    targetId= info['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)
+    request_body = commonFuc().get_business_data(module, "payload3_1",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/a4产品信息审核驳回.air/a4产品信息审核驳回.py

@@ -25,6 +25,11 @@ def test1():
     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\\a3产品信息审核_查询.air')
+    using(pro_path + r'\\air_case\\a5_mdm3_pdm\\a3产品信息审核_查询.air')
+    from a3产品信息审核_查询 import select1
+    select1()
     """
      场景:a3产品信息审核驳回
      用例名称：a3产品信息审核驳回
@@ -45,23 +50,20 @@ def test1():
                                             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']
+    # total= info['total']
+    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)
+    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)
+    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

report/summary.html

@@ -55,9 +55,9 @@
 
         <tr width="600">
             <td class='details-col-elapsed'>1</td>
-            <td class='details-col-elapsed'>0</td>
-            <td class='details-col-elapsed'>0分5秒</td>
-            <td class="details-col-elapsed">0.0%</td>
+            <td class='details-col-elapsed'>1</td>
+            <td class='details-col-elapsed'>0分9秒</td>
+            <td class="details-col-elapsed">100.0%</td>
         </tr>
     </table>
 
@@ -73,8 +73,8 @@
         
         <tr width="600">
             <td class="details-col-elapsed"><a href='../log/a4产品信息审核驳回/log.html' target='_blank'>a4产品信息审核驳回</a></td>
-            <td class="fail">失败</td>
-            <td class="details-col-elapsed">5.499</td>
+            <td class="success">成功</td>
+            <td class="details-col-elapsed">9.098</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>