diff --git "a/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py" "b/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py"
index db90d656230fd4fea243cf7c301391dd43218e05..b9e80254998dd05557b8ac88fbace70021d4956a 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.air/a_a1_\346\265\201\347\250\213\344\270\200\345\244\226\347\275\221\344\274\201\344\270\232\346\263\250\345\206\214\345\256\241\346\211\271.py"
@@ -9,6 +9,7 @@ __author__ = "xiaohesheng"
"""
case_tag:api,spd_core,a_a1_流程一外网企业注册审批,id2302,id2302-1,sit,on
内网:a_a1_流程一外网企业注册审批
+python runner_test.py tag id2302-1 debug mdm3
"""
from common.common_func import commonFuc
diff --git "a/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py" "b/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
index 52a6ebf3c6110bf7ef703744e2f591974bc07bda..815de2b21f50c479516ffcaf453716424868f1fd 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.air/a_a4_\346\265\201\347\250\213\345\233\233_\345\237\272\347\241\200\346\250\241\345\235\227\350\256\276\347\275\256.py"
@@ -1,4 +1,5 @@
# -*- encoding=utf8 -*-
+from air_case.public1.public1.public1 import get_hosid
from common.fileUtls import FileUtils
from common.run_cmd_script import execute_command
@@ -7,7 +8,7 @@ __author__ = "xiaohesheng"
"""
case_tag:api,spd_core,a_a4_流程四_基础模块设置,id2302,id2302-4,sit,on
主数据平台:a_a4_流程四_基础模块设置
-python runner_test.py tag spd_core debug mdm3
+python runner_test.py tag id2302-4 debug mdm3
"""
@@ -28,6 +29,8 @@ def test1():
"python runner_test.py tag id2263-19,id2263-20,id2263-21,id2263-22,id2263-23,id2263-24,id2263-25,id2263-26 debug sit")
# 一键导入所有产品
execute_command("python runner_test.py tag id2263-48 debug sit")
+ #导入同步过来的新产品，防止因同步时间差导致新建的产品没有导入过来
+ import_goods()
# r_b8库房管理_库区设置_同步库房信息
execute_command("python runner_test.py tag id2263-221 debug sit")
# 新增用户
@@ -47,6 +50,40 @@ def test1():
# 科室管理-科室人员查询 设置科室负责人
execute_command("python runner_test.py tag id2263-219 debug sit")
+def import_goods():
+ module = "b2_herp3_bs"
+ # 内网登录
+ 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()
+ # 院区产品设置_查询院区产品
+ url = commonFuc().get_api_url() + commonFuc().get_business_data(module, "mcmsDeptGoodsInfo_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"))
+ # 获取院区id
+ branch_id = FileUtils().r_info(module, '院区新增')["branch_id"]
+ hosGoodsId = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
+ goodsId=hosGoodsId.replace("h0347", "")
+ # #请求体
+ request_body = commonFuc().get_business_data(module, "payload32_1",get_hosid(), goodsId,branch_id)
+ print(request_body)
+ # # # 发送请求
+ while True:
+ result = commonFuc().http_post(url, request_body, headers)
+ total=commonFuc().analysis_json('total',commonFuc().analysis_json('data',result))
+ if total==0:
+ print('产品暂时没有同步到内网,等待6秒')
+ time.sleep(6)
+ else:
+ break
+ print('result', result)
+
def test2(): # 科室添加产品信息(产品是从外网同步过来的)
module = "b2_herp3_bs"
diff --git "a/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py" "b/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py"
index 5fb9918cf889e55d0e1bbc0d8fc498074e29af8d..1374018d76a4923b0d24d72d468783aa2ea31239 100644
--- "a/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.air/a_a5\346\265\201\347\250\213\344\272\224_\344\270\255\345\277\203\345\272\223\345\205\245\345\272\223\347\273\223\347\256\227_\346\255\243\347\273\223\347\256\2271_\346\217\220\344\272\244\351\207\207\350\264\255\350\256\241\345\210\222.py"
@@ -9,6 +9,7 @@ __author__ = "xiaohesheng"
"""
case_tag:api,spd_core,a_a5流程五_中心库入库结算_正结算,id2302,id2302-5,sit,on
主数据平台:a_a5流程五_中心库入库结算_正结算
+python runner_test.py tag id2302-5 debug mdm3
"""
from common.common_func import commonFuc
diff --git "a/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py" "b/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
index c1645b16b5f10581dbd2189347ee9cff4275d227..ec0258b40c152891b2bd274194d1f0ebf113c545 100644
--- "a/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
+++ "b/air_case/b5_spd3_core_business_flow/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213.py"
@@ -78,21 +78,68 @@ def operationApply(): # 高值跟台申请
# 跟台手术申请提交============
+def second_dept_in_warehouse():
+ updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 设置登录账号默认权限是二级库
+ module = "b5_spd3_core_business_flow"
+ # # 登录获取用户id等信息，使用创建的用户登录===========开始
+ info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+ username = info['username1']
+ password = commonFuc().get_business_data("b2_herp3_bs", "password")
+ print('username,password', username, password)
+ # # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login(username, password, 2)
+ # 登录获取用户id等信息，使用创建的用户登录============结束
+ # 科室入库,列表查询=========
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "dept_stock_in_page_url")
+ print('科室入库,列表查询url', 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"))
+ request_body = commonFuc().get_business_data(module, "payload28", get_branch_id(), get_hosid())
+ print('request_body', '跟台手术申请', request_body)
+
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+# 科室入库,列表查询==========================================================
+# 科室入库页面获取库区信息=================================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "dept_stockUser_queryStockShelfList_url")
+ print('科室入库页面获取单据详细信息,url', url)
+ request_body = commonFuc().get_business_data(module, "payload29", get_branch_id(), get_hosid())
+ print('request_body', '跟台手术申请', request_body)
+
+# 室入库页面获取库区信息=================================================
+
+ #科室入库页面获取单据详细信息=================================================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
+ "dept_stock_in_detail_url")
+ print('科室入库页面获取单据详细信息,url', url)
+ request_body = commonFuc().get_business_data(module, "payload29", get_branch_id(), get_hosid())
+ print('request_body', '跟台手术申请', request_body)
+
+ # # # # 发送请求
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+#科室入库页面获取单据详细信息=========
try:
- set_dept_lead()#设置科室负责人
- # # # # 设置默认科室,切换到二级科室,使用科室管理功能
- updateUserLoginDefaultRange(get_listUserMgrRangePage(2))
- herpService_mcmsDeptGoodsInfo_getByProvIdPage()
- operationApply()
- approval_center()
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1))
- approval_center1()
- # # #内网查询手术通知单号
- updateUserLoginDefaultRange(get_listUserMgrRangePage(1))
- orderno=Search_OrderNO()
- print(orderno)
- height_value_order_dp(orderno)
+ # set_dept_lead()#设置科室负责人
+ # # # # # 设置默认科室,切换到二级科室,使用科室管理功能
+ # updateUserLoginDefaultRange(get_listUserMgrRangePage(2))#设置登录账号默认权限是二级库
+ # herpService_mcmsDeptGoodsInfo_getByProvIdPage()
+ # operationApply()#手术跟台申请单提交
+ # approval_center()#审批手术跟台申请单
+ # updateUserLoginDefaultRange(get_listUserMgrRangePage(1))#设置登录账号默认权限是中心库
+ # approval_center1()#再次审批手术跟台申请单
+ # # # #内网查询手术通知单号
+ # updateUserLoginDefaultRange(get_listUserMgrRangePage(1))#设置登录账号默认权限是中心库
+ # orderno=Search_OrderNO()#手术通知单接口查询单号
+ # print(orderno)
+ # height_value_order_dp(orderno)#高值跟台外网配送
+ # check_accept_order()#内网验收
+ second_dept_in_warehouse()#二级科室入库
commonFuc().check_text_exist_result_text('succees', 'succees')
except:
commonFuc().check_text_exist_result_text('error', '1')
diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py
index f2bb63c2aaa72f43356f45f44c8f3b7662632998..f6369b96ce7c5e7b32fc2cdb7b6d7904836b06b4 100644
--- a/air_case/public1/public1/public1.py
+++ b/air_case/public1/public1/public1.py
@@ -1676,3 +1676,186 @@ def Search_OrderNO():
print('手术通知单result', result)
data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
return commonFuc().analysis_json('orderNo', data1)
+
+#高值跟台验收管理
+def check_accept_order():
+ # # 登录获取用户id等信息，使用创建的用户登录===========开始
+ info = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')
+ # print(info)
+ username = info['username1']
+
+ password = commonFuc().get_business_data("b2_herp3_bs", "password")
+ print('username,password', username, password)
+ # # print(username, password,'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa')
+ # # 获取token和projectCode
+ token, projectCode, uxid, corpId, info = login_system(username, password).get_token()
+ # 登录获取用户id等信息，使用创建的用户登录============结束
+
+ # =========================查询待验收订单======================
+ module = "b5_spd3_core_business_flow"
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_page_url")
+ print('url', url)
+ # 获取请求头信息
+ headers = commonFuc().get_business_data(module, "json_headers2",
+ commonFuc().get_business_data(module, "json_contentType"), token,
+ projectCode)
+ branch_id = FileUtils().r_info('b2_herp3_bs', '院区新增')["branch_id"]
+ hos_id = branch_id[0:5]
+
+ sourceOrderNo = FileUtils().r_info8(module, '高值跟台配送单号', 'message10')["distrBillId1"]
+
+ request_body = commonFuc().get_business_data(module, "payload", hos_id, branch_id, sourceOrderNo)
+ print('request_body', request_body)
+ # 发送请求
+ while True:
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ # 断言
+ code = commonFuc().analysis_json('code', result)
+ data = commonFuc().analysis_json('data', result)
+ total = commonFuc().analysis_json('total', data)
+ if total == 1:
+ break
+ else:
+ time.sleep(6)
+
+ data = commonFuc().analysis_json('data', result)
+ data1 = commonFuc().analysis_json('data', data)
+ list_a = []
+ list_b = []
+ list_c = []
+ list_a.append(data1)
+ list_b.append(data1)
+ list_c.append(data1)
+ # print('list_a', len(list_a), list_a)
+ info = (list_a, list_b, list_c)
+ titlename = ('list_a', 'list_b', 'list_c')
+ # 将验收单信息写入到文件中
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单信息', titlename, 'message13')
+ # 从message13文件中获取信息
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单信息", 'message13')
+ # print('info', info)
+ list_a = info['list_a']
+ print('list_a', list_a)
+ sourceType = "sourceType"
+ billMode = 'billMode'
+ recOrgId = 'recOrgId'
+ recOrgName = 'recOrgName'
+ sourceOrgId = 'sourceOrgId'
+ sourceOrgName = 'sourceOrgName'
+ sourceVersion = 'sourceVersion'
+ tbStatus = 'tbStatus'
+ for i in list_a:
+ print('i', i)
+ for j in i:
+ sourceType = j["sourceType"]
+ billMode = j["billMode"]
+ recOrgId = j['recOrgId']
+ recOrgName = j['recOrgName']
+ sourceOrgId = j['sourceOrgId']
+ sourceOrgName = j['sourceOrgName']
+ sourceVersion = j['sourceVersion']
+ tbStatus = j['tbStatus']
+ break
+
+ # =========================查询待验收订单======================
+ # ==============================查看订单详情==================
+
+ sourceId = sourceOrderNo
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_wait_detail_url")
+ print('url', url)
+ request_body = commonFuc().get_business_data(module, "payload1", sourceId, sourceType, billMode, branch_id)
+
+ # print('request_body',request_body)
+ # 发送请求
+ while True:
+ time.sleep(6)
+ result = commonFuc().http_post(url, request_body, headers)
+ code = commonFuc().analysis_json('code', result)
+ if code == 0:
+ break
+ else:
+ print('验收单数据未同步完成，等待6秒')
+ print('result', result)
+ # 断言
+ data = commonFuc().analysis_json('data', result)
+ list_a = []
+ list_b = []
+ list_c = []
+ list_a.append(data)
+ list_b.append(data)
+ list_c.append(data)
+ # print('list_a', len(list_a), list_a)
+ info = (list_a, list_b, list_c)
+ titlename = ('list_a', 'list_b', 'list_c')
+ # 将验收单详细信息写入到文件中
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单详情信息', titlename, 'message14')
+ # 读取viewId
+ info = FileUtils().r_info8('b5_spd3_core_business_flow', "验收单详情信息", 'message14')
+ # print('info', info)
+ list_a = info['list_a']
+ print('list_a', list_a)
+ viewId = "viewId"
+ settlement = 'settlement'
+ recTemperature = 'recTemperature'
+ recHumidity = 'recHumidity'
+ for i in list_a:
+ for j in i:
+ viewId = j["viewId"]
+ settlement = j["settlement"]
+ recTemperature = j['recTemperature']
+ recHumidity = j['recHumidity']
+ break
+ # ==============================查看订单详情==================
+ # ========设置验收全部合格
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_barcode_save_url")
+ print('check_barcode_save_url', url)
+ sourceBillId = sourceId
+ request_body = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId)
+
+ print('设置验收全部合格request_body',request_body)
+ # 发送请求
+ time.sleep(6)
+
+ while True:
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ data = commonFuc().analysis_json('data', result)
+ code= commonFuc().analysis_json('code', result)
+ print(code)
+ if code ==0 and data==1:
+ break
+ else:
+ print('设置产品合格出现问题')
+ time.sleep(6)
+ continue
+
+ # ========设置验收全部合格
+ # =============提交验收单========================
+ url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_submit_url")
+ deptId = recOrgId
+ deptName = recOrgName
+ provId = sourceOrgId
+ provName = sourceOrgName
+ createUser = uxid
+ sourceNo = sourceId
+ time.sleep(6)
+ request_body = commonFuc().get_business_data(module, "payload3", billMode, branch_id, deptId, deptName, hos_id,
+ provId, provName, recOrgId, recOrgName, sourceId, sourceVersion,
+ sourceType, tbStatus, createUser, sourceNo, viewId, viewId, settlement,
+ recTemperature, recHumidity)
+
+ print('request_body', 'c', request_body)
+ # 发送请求
+ while True:
+ time.sleep(3)
+ result = commonFuc().http_post(url, request_body, headers)
+ print('result', result)
+ CHECK_NO = commonFuc().analysis_json('data', result)
+ code = commonFuc().analysis_json('code', result)
+ if code == 0:
+ break
+
+ info = (CHECK_NO, CHECK_NO)
+ titlename = ('CHECK_NO1', 'CHECK_NO2')
+ FileUtils().w_info8(info, 'b5_spd3_core_business_flow', '验收单号', titlename, 'message15')
diff --git a/data/a2_mdm3_ea/message b/data/a2_mdm3_ea/message
index 9b0e096f12e2172c17442c14425076bef248d834..6c841aa721f6619a3fe1e33760ea7b3970709525 100644
--- a/data/a2_mdm3_ea/message
+++ b/data/a2_mdm3_ea/message
@@ -1,3 +1,3 @@
企业信息:
- e_id: CR202405070038
- cname: 国药集团公司1Q&h$
+ e_id: CR202405100087
+ cname: 国药集团公司jkgv^
diff --git a/data/a3_mdm3_hs/message b/data/a3_mdm3_hs/message
index 78db1167cd8a29c5f4450c3ac9a962ff2e0f0de0..f7d5c7c4facb9ecf1b6bb45a5b9f40bd5b2a1391 100644
--- a/data/a3_mdm3_hs/message
+++ b/data/a3_mdm3_hs/message
@@ -1,3 +1,3 @@
医院信息:
- h_id: 湖南省人民医院iNByZ
- h_name: 湖南省人民医院iNByZ
+ h_id: 湖南省人民医院hNH*C
+ h_name: 湖南省人民医院hNH*C
diff --git a/data/a5_mdm3_pdm/message2 b/data/a5_mdm3_pdm/message2
index 64b07d93b6139230b6e21087886344127c5a454e..540752ae55bb2116a9999fb374f333cfe10ec270 100644
--- a/data/a5_mdm3_pdm/message2
+++ b/data/a5_mdm3_pdm/message2
@@ -1,7 +1,7 @@
产品审核信息:
- MSPid: MSP2405070011_1
+ MSPid: MSP2405080011_1
hosId: h0347
- hosGoodsId: h034700003432
- provGoodsid: provGood-99220541
- goodsAuditBillId: MSP2405070011
- targetId: MSP2405070011_1
+ hosGoodsId: h034700003448
+ provGoodsid: provGood-99220557
+ goodsAuditBillId: MSP2405080011
+ targetId: MSP2405080011_1
diff --git a/data/b2_herp3_bs/data b/data/b2_herp3_bs/data
index 0dad9f5ee8d00e16d737d65473228c693434d78b..9bce3025788cc740af79a0817344c2b46486824f 100644
--- a/data/b2_herp3_bs/data
+++ b/data/b2_herp3_bs/data
@@ -262,6 +262,8 @@ json_headers2: {
"payload30": {"queryObject": {"goodsName": "xhs","provId": "p00001c0f","subProvId": null,"hosId": "h0347"},"pageNum": 1,"pageSize": 50}
"payload31": {"queryObject":{"goodsName":"00002017","provId":"p00002e79","subProvId":"p10d95","hosId":"h0347","purModes":[]},"pageNum":1,"pageSize":50}
"payload32": {"pageNum": 1,"pageSize": 50,"queryObject": {"hosId": "h0347","goodsName": "","tbStatus": "","goodsSpec": "","purModes": [],"branchId": "%s"}}
+"payload32_1": {"pageNum": 1,"pageSize": 50,"queryObject": {"hosId": "%s","goodsName": "%s","tbStatus": "","goodsSpec": "","purModes": [],"branchId": "%s"}}
+
"payload33": {"queryObject": {"hosId": "h0347","branchId": "%s","goodsName": "指引导管","goodsMfrsName": "","goodsSpec": ""},"pageNum": 1,"pageSize": 50}
"payload34": {"hosGoodsIds": ["%s"],"hosId": "h0347","branchId": "h0347-621"}
"payload35": {"hosGoodsIds": ["%s"],"hosId": "h0347","branchId": "%s"}
diff --git a/data/b2_herp3_bs/message b/data/b2_herp3_bs/message
index 174e891bd7f3c2088b3308debabea99a8546751b..7851eb7d5e7ccfefb6239c4ddd5388c0dc58ba87 100644
--- a/data/b2_herp3_bs/message
+++ b/data/b2_herp3_bs/message
@@ -1,6 +1,6 @@
院区新增:
- branch_id: h0347-3572
- branch_name: 东土城路院区q8fpn
+ branch_id: h0347-3582
+ branch_name: 东土城路院区1siZT
科室信息:
- dept2_id: 16d7c9d6925a4dacbceafa9746f58144
+ dept2_id: 1dfaf0a57dd54025a449ed5762066876
dept2_name: 二级检验科002
diff --git a/data/b5_spd3_core_business_flow/data b/data/b5_spd3_core_business_flow/data
index 4fbf8e837642b7f8c5f2e123227005a600f27de2..ac48ddf726a89e88dea37fc2177f045ec5d02924 100644
--- a/data/b5_spd3_core_business_flow/data
+++ b/data/b5_spd3_core_business_flow/data
@@ -28,6 +28,9 @@
"operation_one_url": "/api/hdiFusion/bill/operation/one/"
"submit_url": "/api/hdiFusion/bill/distr/operation/submit"
"operation_detail_url": "/api/hdiFusion/bill/operation/detail/"
+"dept_stock_in_page_url": "/api/herpService/dept/stock/in/page"
+"dept_stockUser_queryStockShelfList_url": "/api/herpService/basic/stockUser/queryStockShelfList"
+"dept_stock_in_detail_url": "/api/herpService/dept/stock/in/detail?distHosBatch=false"
"username": "xhs1009"
"password": "1qaz!QAZ"
@@ -71,3 +74,4 @@ json_headers2: {
"payload1_1_1": {"pageNum":1,"pageSize":50,"queryObject":{"dateValue":["%s 14:20:37","%s 14:20:37"],"orderNo":"%s","provId":"%s","pageType":2,"hosIdList":["%s"],"status":"10","startDate":"%s 00:00:00","endDate":"%s 23:59:59"}}
"payload26": {"id":"%s","version":0,"hosVersion":3,"userId":"%s"}
"payload27": {"id":"%s","orderNo":"%s","sourceOrderNo":"%s","hosId":"%s","hosName":"%s","branchName":"%s","recDeptName":"%s","operName":"%s","operDate":"%s","operDoctor":"%s","patientName":"%s","status":"%s","statusText":"%s","version":"%s","patientInHosId":"%s","surDeptName":"","remark":"%s","createUserName":"%s","distPriority":"%s","distPriorityText":"否","distId":null,"distNo":null,"hosVersion":"%s","createTime":"%s","sumQty":"%s","sumAmount":"%s","operationPkg":"%s","provId":"%s","provName":"%s","subProvId":"","subProvName":"","recDeptId":"%s","createUser":"%s","lastModifiedUser":"%s","detailList":[{"id":"%s","hosGoodsId":"%s","goodsNum":"%s","price":"%s","inSettlement":"%s","inSettlementText":"%s","goodsName":"%s","goodsSpec":"%s","goodsCode":"%s","goodsMfrsId":"%s","goodsMfrsName":"%s","unit":"%s","subProvId":"%s","subProvName":"%s","totalAmount":"%s","spdGoodsCode":"%s","barCodeMng":"%s","erpCode":null,"quantityQty":0,"numTotal":"1","priceTotal":"%s","statusSpanType":"orange","statusSpanText":"配送情况：1/1","rightTableList":null,"batchList":[{"sourceDetailId":"%s","hosGoodsId":"%s","goodsCode":"%s","settlement":"%s","batchCode":"2222","productDate":"%s","expdtDate":"%s","distrPkgQty":"1","disabledFlag":0,"distrQty":0,"ext":{"ygptCode":"","transCond":"","storageCond":"","erpCode":""},"edit":true,"barcodeList":[],"viewId":"%sROW0"}]}],"operUserName":"ttt","operUserPhone":"ttt"}
+"payload28": {"pageNum":1,"pageSize":50,"queryObject":{"taskType":0,"stockKind":"","sourceOrderNo":"","areaName":"","goodsName":"","goodsSpec":"","goodsGg":"","branchId":"%s","distrOrderNo":"","stockName":"","areaCodeInfo":"","areaNameInfo":"","hosId":"%s"}}
diff --git a/report/summary.html b/report/summary.html
index af3ecfcac1c39d4c0b55fdfece142194cc2321b6..1560f86451769a9f04823c8cf237749f87e7661e 100644
--- a/report/summary.html
+++ b/report/summary.html
@@ -56,7 +56,7 @@
| 1 |
1 |
- 0分37秒 |
+ 0分17秒 |
100.0% |
@@ -72,9 +72,9 @@
- | a_b1流程八_高值跟台业务流程 |
+ a_a5流程五_中心库入库结算_正结算1_提交采购计划 |
成功 |
- 37.082 |
+ 17.164 |
xiaohesheng |