增加根据结算类型查询产品信息_不结算，根据结算类型查询产品信息_入定向仓结算，根据结算类型查询产品信息_入中心库结算 脚本

air_case/a6_mdm3_dp/a3订单配送提交_3_0医院.air/a3订单配送提交_3_0医院.py

@@ -30,7 +30,7 @@ def select1():
      输出："rtn_msg": 0
     """
     module = "a6_mdm3_dp"
-    #a1订单配送列表数据查询_全部
+    #a3订单配送提交_3_0医院
     url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "submit_url")
       # 获取请求头信息
     headers = commonFuc().get_business_data(module, "json_headers2",

air_case/b2_herp3_bs/g7_批量导入_查询产品信息.air/g7_批量导入_查询产品信息.py

+# -*- encoding=utf8 -*-
+import sys
+
+from airtest.core.helper import using
+
+from common.db.sql.sql_del_branch_info import delByBranchId
+from common.db.sql.sql_del_kind_goodsinfo import delKindGoodsinfo
+from common.db.sql.sql_del_notices_info import delByNoticeName
+from common.fileUtls import FileUtils
+from common.timeUtils import timeUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,herp-web,g7_批量导入_查询产品信息,id2263,id2263-68,sit,on
+内网:g7_批量导入_查询产品信息 
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+module = "b2_herp3_bs"
+def select1():
+    """
+     场景:g7_批量导入_查询产品信息
+     用例名称：g7_批量导入_查询产品信息
+     输入：无
+     输出："rtn_msg": {"code": 0, "msg": null,    "data": 1}
+    """
+    #内网登录
+    username = commonFuc().get_business_data(module, "username")
+    #     # print('医院名称',username)
+    password = commonFuc().get_business_data(module, "password")
+    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # 获取token和projectCode
+    token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
+    # print( token,projectCode,uxid,corpId,info)
+    #g7_批量导入_查询产品信息
+    url=commonFuc().get_api_url()+commonFuc().get_business_data(module, "supplyProvHosGoods_url")
+
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                         commonFuc().get_business_data(module, "X-APP-CODE"))
+    # # 获取单元包信息
+    # branchGoodsId = FileUtils().r_info(module, '单元包信息')["branchGoodsId"]
+    # hosGoodsId = FileUtils().r_info(module, '单元包信息')["hosGoodsId"]
+    # # 获取院区id
+    # branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
+    # #请求体
+    request_body = commonFuc().get_business_data(module, "payload49_6")
+    print(request_body)
+    # # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('resultaaaaaaaaaaaaaaaaaaaaaaaaaaa', result)
+    #断言
+    # checkDict=commonFuc().get_business_data(module,'checkDict10')
+    # commonFuc().check_result(checkDict,result)
+    total=commonFuc().analysis_json('total',commonFuc().analysis_json('data',result))
+    if total>=0:
+        print(total)
+        data1=commonFuc().analysis_json('data',commonFuc().analysis_json('data',result))
+        id1=commonFuc().analysis_json('id',data1[0])
+        print(id1)
+        commonFuc().check_text_exist(0, result)
+        return id1
+    else:
+        commonFuc().check_text_exist('error', result)
+select1()

air_case/b2_herp3_bs/g8_批量导入_导入一个产品_中心库结算.air/g8_批量导入_导入一个产品_中心库结算.py

+# -*- encoding=utf8 -*-
+import sys
+
+from airtest.core.helper import using
+
+from common.db.sql.sql_del_branch_info import delByBranchId
+from common.db.sql.sql_del_kind_goodsinfo import delKindGoodsinfo
+from common.db.sql.sql_del_notices_info import delByNoticeName
+from common.fileUtls import FileUtils
+from common.timeUtils import timeUtils
+
+__author__ = "xiaohesheng"
+
+"""
+case_tag:api,herp-web,g8_批量导入_导入一个产品_中心库结算,id2263,id2263-69,sit,on
+内网:g8_批量导入_导入一个产品_中心库结算 
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+module = "b2_herp3_bs"
+def test1():
+    """
+     场景:g8_批量导入_导入一个产品_中心库结算
+     用例名称：g8_批量导入_导入一个产品_中心库结算
+     输入：无
+     输出："rtn_msg": {"code": 0, "msg": null,    "data": 1}
+    """
+    #内网登录
+    username = commonFuc().get_business_data(module, "username")
+    #     # print('医院名称',username)
+    password = commonFuc().get_business_data(module, "password")
+    # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+    # 获取token和projectCode
+    token,projectCode,uxid,corpId,info= login_system(username, password).get_token()
+    # print( token,projectCode,uxid,corpId,info)
+    #g8_批量导入_导入一个产品_中心库结算
+    url=commonFuc().get_api_url()+commonFuc().get_business_data(module, "updateSettleType_url1")
+
+    # 获取请求头信息
+    headers = commonFuc().get_business_data(module, "json_headers2",
+                                            commonFuc().get_business_data(module, "json_contentType"), token,
+                                         commonFuc().get_business_data(module, "X-APP-CODE"))
+    # # 获取结算id
+    pro_path = commonFuc().get_pro_path()
+    sys.path.append(pro_path + r'\\air_case\\b2_herp3_bs\\g7_批量导入_查询产品信息.air')
+    using(pro_path + r'\\air_case\\b2_herp3_bs\\g7_批量导入_查询产品信息.air')
+    from g7_批量导入_查询产品信息 import select1
+    id1 = select1()
+    # #请求体
+    request_body = commonFuc().get_business_data(module, "payload49_7",id1)
+    print(request_body)
+    # # # 发送请求
+    result = commonFuc().http_post(url, request_body, headers)
+    print('resultaaaaaaaaaaaaaaaaaaaaaaaaaaa', result)
+    #断言
+    # checkDict=commonFuc().get_business_data(module,'checkDict10')
+    # commonFuc().check_result(checkDict,result)
+    code=commonFuc().analysis_json('code',result)
+    if code>=0:
+        print(code)
+        commonFuc().check_text_exist(0, result)
+    else:
+        commonFuc().check_text_exist('error', result)
+test1()

data/b2_herp3_bs/data

@@ -28,6 +28,9 @@
 "branchGoodsPkgDef_insert_url": "/hospitaltest2api/herpService/branchGoodsPkgDef/insert"
 "branchGoodsPkgDef_update_url": "/hospitaltest2api/herpService/branchGoodsPkgDef/updateById"
 "updateSettleType_url": "/hospitaltest2api/herpService/basic/mcmsBranchGoodsInfo/updateSettleType"
+"updateSettleType_url1": "/hospitaltest2api/herpService/supplyProvHosGoods/updateSettleType"
+
+
 "username": "xhs1009"
 "password": "1qaz!QAZ"
 "X-APP-CODE": "herp.pc"
@@ -222,6 +225,9 @@ json_headers2: {
 "payload49_3": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 5,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}
 "payload49_4": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 6,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}
 "payload49_5": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 7,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}
+"payload49_6": {"queryObject":{"goodsName":"","provName":"","purModes":[],"goodsSpec":"","hosId":"h0347","settleType":0},"pageNum":1,"pageSize":50}
+"payload49_7": {"ids":["%s"],"settleType":1,"opMenu":"/platform/settle/rules"}
+
 
 checkDict: {"code": 0,'msg': None,'data': True}
 checkDict1: {

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分0秒</td>
+            <td class='details-col-elapsed'>0分2秒</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/g2_6_根据结算类型查询产品信息_科室整件出库结算/log.html' target='_blank'>g2_6_根据结算类型查询产品信息_科室整件出库结算</a></td>
+            <td class="details-col-elapsed"><a href='../log/g8_批量导入_导入一个产品_中心库结算/log.html' target='_blank'>g8_批量导入_导入一个产品_中心库结算</a></td>
             <td class="success">成功</td>
-            <td class="details-col-elapsed">0.884</td>
+            <td class="details-col-elapsed">2.116</td>
             <td class="details-col-elapsed">xiaohesheng</td>
         </tr>