diff --git "a/air_case/b2_herp3_bs/g2_4_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\344\270\255\345\277\203\345\272\223\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_4_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\344\270\255\345\277\203\345\272\223\345\207\272\345\272\223\347\273\223\347\256\227.py" "b/air_case/b2_herp3_bs/g2_4_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\344\270\255\345\277\203\345\272\223\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_4_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\344\270\255\345\277\203\345\272\223\345\207\272\345\272\223\347\273\223\347\256\227.py"
new file mode 100644
index 0000000000000000000000000000000000000000..572dc6181ca8f1dd89da753245389f785f0b477e
--- /dev/null
+++ "b/air_case/b2_herp3_bs/g2_4_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\344\270\255\345\277\203\345\272\223\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_4_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\344\270\255\345\277\203\345\272\223\345\207\272\345\272\223\347\273\223\347\256\227.py"
@@ -0,0 +1,64 @@
+# -*- 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,g2_4_根据结算类型查询产品信息_中心库出库结算,id2263,id2263-65,sit,on
+内网:g2_4_根据结算类型查询产品信息_中心库出库结算
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+module = "b2_herp3_bs"
+def test1():
+ """
+ 场景:g2_4_根据结算类型查询产品信息_中心库出库结算
+ 用例名称：g2_4_根据结算类型查询产品信息_中心库出库结算
+ 输入：无
+ 输出："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)
+ #g2_4_根据结算类型查询产品信息_中心库出库结算
+ 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_3")
+ 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)
+ commonFuc().check_text_exist(0, result)
+ else:
+ commonFuc().check_text_exist('error', result)
+test1()
diff --git "a/air_case/b2_herp3_bs/g2_5_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_5_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\345\207\272\345\272\223\347\273\223\347\256\227.py" "b/air_case/b2_herp3_bs/g2_5_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_5_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\345\207\272\345\272\223\347\273\223\347\256\227.py"
new file mode 100644
index 0000000000000000000000000000000000000000..0b28eb0897b511fc71ad3f75cc0042d7d752c628
--- /dev/null
+++ "b/air_case/b2_herp3_bs/g2_5_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_5_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\345\207\272\345\272\223\347\273\223\347\256\227.py"
@@ -0,0 +1,64 @@
+# -*- 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,g2_5_根据结算类型查询产品信息_科室出库结算,id2263,id2263-66,sit,on
+内网:g2_5_根据结算类型查询产品信息_科室出库结算
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+module = "b2_herp3_bs"
+def test1():
+ """
+ 场景:g2_5_根据结算类型查询产品信息_科室出库结算
+ 用例名称：g2_5_根据结算类型查询产品信息_科室出库结算
+ 输入：无
+ 输出："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)
+ #g2_5_根据结算类型查询产品信息_科室出库结算
+ 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_4")
+ 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)
+ commonFuc().check_text_exist(0, result)
+ else:
+ commonFuc().check_text_exist('error', result)
+test1()
diff --git "a/air_case/b2_herp3_bs/g2_6_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\346\225\264\344\273\266\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_6_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\346\225\264\344\273\266\345\207\272\345\272\223\347\273\223\347\256\227.py" "b/air_case/b2_herp3_bs/g2_6_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\346\225\264\344\273\266\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_6_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\346\225\264\344\273\266\345\207\272\345\272\223\347\273\223\347\256\227.py"
new file mode 100644
index 0000000000000000000000000000000000000000..c4f379343d7ee70ede3118f9617f4e0597a5b9a3
--- /dev/null
+++ "b/air_case/b2_herp3_bs/g2_6_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\346\225\264\344\273\266\345\207\272\345\272\223\347\273\223\347\256\227.air/g2_6_\346\240\271\346\215\256\347\273\223\347\256\227\347\261\273\345\236\213\346\237\245\350\257\242\344\272\247\345\223\201\344\277\241\346\201\257_\347\247\221\345\256\244\346\225\264\344\273\266\345\207\272\345\272\223\347\273\223\347\256\227.py"
@@ -0,0 +1,64 @@
+# -*- 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,g2_6_根据结算类型查询产品信息_科室整件出库结算,id2263,id2263-67,sit,on
+内网:g2_6_根据结算类型查询产品信息_科室整件出库结算
+"""
+
+from common.common_func import commonFuc
+from air_case.b1_herp3_login.登录内网系统.登录内网系统 import login_system
+module = "b2_herp3_bs"
+def test1():
+ """
+ 场景:g2_6_根据结算类型查询产品信息_科室整件出库结算
+ 用例名称：g2_6_根据结算类型查询产品信息_科室整件出库结算
+ 输入：无
+ 输出："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)
+ #g2_6_根据结算类型查询产品信息_科室整件出库结算
+ 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_5")
+ 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)
+ commonFuc().check_text_exist(0, result)
+ else:
+ commonFuc().check_text_exist('error', result)
+test1()
diff --git a/data/b2_herp3_bs/data b/data/b2_herp3_bs/data
index ebfa79daaacc4ab547313094790e40dc1c8673e9..5e3809a18e3d6f2f20c55edbe5418d1e53cc81b2 100644
--- a/data/b2_herp3_bs/data
+++ b/data/b2_herp3_bs/data
@@ -219,7 +219,9 @@ json_headers2: {
"payload49": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 1,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}
"payload49_1": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 2,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}
"payload49_2": {"queryObject": {"goodsName": "","provName": "","purModes": [],"hosId": "h0347","settleType": 3,"goodsSpec": "" },"pageNum": 1,"pageSize": 100}
-
+"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}
checkDict: {"code": 0,'msg': None,'data': True}
checkDict1: {
diff --git a/report/summary.html b/report/summary.html
index 6216f118299f74c17350c59e842d72ade5438507..5a86b4ea64161ade5db66947c9a2fdb9f425dad7 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -56,7 +56,7 @@
| 1 |
1 |
- 0分1秒 |
+ 0分0秒 |
100.0% |
@@ -72,9 +72,9 @@
- | g2_3_根据结算类型查询产品信息_消耗结算 |
+ g2_6_根据结算类型查询产品信息_科室整件出库结算 |
成功 |
- 0.896 |
+ 0.884 |
xiaohesheng |