Skip to content
GitLab
Commit ee5ee471 authored by 肖 和生's avatar 肖 和生
Browse files

Merge remote-tracking branch 'remotes/origin/master' into core_flow

parents a3b81b1a 22d0d38d
Hide whitespace changes
Inline Side-by-side
air_case/b5_spd3_core_business_flow/a_a4_流程四_基础模块设置.air/a_a4_流程四_基础模块设置.py
View file @ ee5ee471
......@@ -237,6 +237,7 @@ def test2(): # 科室添加产品信息(产品是从外网同步过来的)
break
dept2_id = FileUtils().r_info(module, '科室信息')["dept2_id"]
j=1
for i in list2:
# 请求体
......@@ -268,8 +269,73 @@ def test2(): # 科室添加产品信息(产品是从外网同步过来的)
commonFuc().check_text_exist('error', result)
#增加设置产品为赋码管理
set_goods_coding_type(get_branch_id())
#
# url = commonFuc().get_api_add_port_url()+commonFuc().get_business_data(module, "basic_mcmsDeptGoodsInfo_page_url")
# hosGoodsId=list2[2]
# GoodsId=hosGoodsId.replace(get_hosid(),"")
# request_body = commonFuc().get_business_data(module, "payload58_13_2", GoodsId,dept2_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, "basic_mcmsDeptGoodsInfo_updateById")
hosGoodsId = list2[2]
GoodsId = hosGoodsId.replace(get_hosid(), "")
# request_body = commonFuc().get_business_data(module, "payload58_13_2", GoodsId, dept2_id, get_hosid())
# print('request_body', request_body)
# result = commonFuc().http_post(url, request_body, headers)
# print('result', result)
dept1_id = FileUtils().r_info8(module, '一级科室信息','message4')["dept1_id"]
targetDeptId=dept1_id
edit_goods_property(GoodsId,dept2_id,targetDeptId)
def edit_goods_property(GoodsId,currentDeptId, targetDeptId):
# 2024年11月19日，检测试剂产品增加了是否单瓶管理功能，默认为否，需要修改脚本
# 在科室产品分配中查询检测试剂
#修改试剂的属性值,单瓶管理为"是"
module = "b2_herp3_bs"
# # 登录获取用户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, "basic_mcmsDeptGoodsInfo_page_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, "payload58_13_2",GoodsId, currentDeptId, get_hosid())
result = commonFuc().http_post(url, request_body, headers)
print('科室产品列表查询', result)
data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))
for i in data1:
shelfCode = commonFuc().analysis_json('shelfCode', i)
id1 = commonFuc().analysis_json('id', i)
pkgDefId = commonFuc().analysis_json('pkgDefId', i)
purMode = commonFuc().analysis_json('purMode', i)
tbStatus = commonFuc().analysis_json('tbStatus', i)
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"herpService_basic_mcmsDeptGoodsInfo_url")
url = url + id1
result = commonFuc().http_get(url, headers)
print('获取产品详情信息', result)
data2 = commonFuc().analysis_json('data', result)
packetQty = commonFuc().analysis_json('packetQty', data2)
url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module,
"basic_mcmsDeptGoodsInfo_updateById")
if purMode == 60: # 低值和试剂
request_body = commonFuc().get_business_data(module, "payload58_10_3", id1, pkgDefId, targetDeptId,
shelfCode, packetQty,
tbStatus)
print('编辑试剂产品属性request_body', request_body)
result = commonFuc().http_post(url, request_body, headers)
print('编辑试剂产品属性result', result)
def grants_user(orgName='d69a68df361a4289b2262e4ef75b55a5', mgrRangeId='feb0cc16618c437fb4d033cd339a0377'):
module = "b2_herp3_bs"
# 登录获取用户id等信息，使用创建的用户登录===========开始
......
air_case/b6_spd3_core_business_flow_database_check/a_a1_流程一外网企业注册审批_数据库验证.air/a_a1_流程一外网企业注册审批_数据库验证.py
View file @ ee5ee471
......@@ -227,28 +227,21 @@ def check_sys_user():
def check_sys_user_role():
print('检查sys_user_role数据')
branch_id = get_branch_id()
sql1 = "select * from spd_ybtest_hdi.sys_user_role order by create_time desc limit 1;"
sql1 = "select * from spd3_platform_test2.sys_user_role order by create_time desc limit 1;"
actual = check_mcms_pur_sql(sql1)
print('actual', actual)
id = get_id("select id from spd_ybtest_hdi.sys_user_role order by create_time desc limit 1;")
hos_id = get_id("select hos_id from spd_ybtest_hdi.sys_user_role where id='%s';" % id)
prov_id = get_prov_id()
sub_prov_id = get_id("select sub_prov_id from spd_ybtest_hdi.sys_user_role where id='%s';" % id)
contact_way = get_id("select contact_way from spd_ybtest_hdi.sys_user_role where id='%s';" % id)
contact_user = get_id("select contact_user from spd_ybtest_hdi.sys_user_role where id='%s';" % id)
create_time = get_create_time("select create_time from spd_ybtest_hdi.sys_user_role where id='%s';" % id)
# last_modified = get_create_time("select last_modified from spd_ybtest_hdi.supply_relation where id='%s';" % id)
# username = commonFuc().get_business_data('b2_herp3_bs', "username")
auditor = get_id("select auditor from spd_ybtest_hdi.sys_user_role where id='%s';" % id)
create_user = get_login_user_uxid_bydb(
FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"])
last_modified_user = get_id("select id from spd_ybtest_hdi.sys_user_role where user_code='test_1';")
audit_time = get_create_time("select audit_time from spd_ybtest_hdi.sys_user_role where id='%s';" % id)
last_modified = get_create_time("select last_modified from spd_ybtest_hdi.company_regist_bill where id='%s';" % id)
id = get_id("select id from spd3_platform_test2.sys_user_role order by create_time desc limit 1;")
mgr_range_id = get_id("select mgr_range_id from spd3_platform_test2.sys_user_role where id='%s';" % id)
user_id = get_id("select user_id from spd3_platform_test2.sys_user_role where id='%s';" % id)
role_code= get_id("select role_code from spd3_platform_test2.sys_user_role where id='%s';" % id)
create_user= get_id("select create_user from spd3_platform_test2.sys_user_role where id='%s';" % id)
create_time=get_create_time("select create_time from spd3_platform_test2.sys_user_role where id='%s';" % id)
last_modified_user = get_id("select last_modified_user from spd3_platform_test2.sys_user_role where id='%s';" % id)
last_modified=get_create_time("select last_modified from spd3_platform_test2.sys_user_role where id='%s';" % id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'sys_user_role2', id, hos_id, prov_id, sub_prov_id, contact_way
, contact_user, auditor, audit_time, create_user, create_time,
last_modified_user, last_modified)
'check_sys_user_role', id, mgr_range_id, user_id, role_code, create_user
, create_time, last_modified_user, last_modified)
actual_value1 = get_process_list2(actual)
expected_value1 = get_process_list2(expected)
......@@ -270,28 +263,27 @@ def check_sys_user_role():
def check_sys_user_org():
print('检查sys_user_org数据')
branch_id = get_branch_id()
sql1 = "select * from spd_ybtest_hdi.sys_user_org order by create_time desc limit 1;"
sql1 = "select * from spd3_platform_test2.sys_user_org order by create_time desc limit 1;"
actual = check_mcms_pur_sql(sql1)
print('actual', actual)
id = get_id("select id from spd_ybtest_hdi.sys_user_org order by create_time desc limit 1;")
hos_id = get_id("select hos_id from spd_ybtest_hdi.sys_user_org where id='%s';" % id)
prov_id = get_prov_id()
sub_prov_id = get_id("select sub_prov_id from spd_ybtest_hdi.sys_user_org where id='%s';" % id)
contact_way = get_id("select contact_way from spd_ybtest_hdi.sys_user_org where id='%s';" % id)
contact_user = get_id("select contact_user from spd_ybtest_hdi.sys_user_org where id='%s';" % id)
create_time = get_create_time("select create_time from spd_ybtest_hdi.sys_user_org where id='%s';" % id)
# last_modified = get_create_time("select last_modified from spd_ybtest_hdi.supply_relation where id='%s';" % id)
# username = commonFuc().get_business_data('b2_herp3_bs', "username")
auditor = get_id("select auditor from spd_ybtest_hdi.sys_user_org where id='%s';" % id)
create_user = get_login_user_uxid_bydb(
FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"])
last_modified_user = get_id("select id from spd_ybtest_hdi.sys_user_org where user_code='test_1';")
audit_time = get_create_time("select audit_time from spd_ybtest_hdi.sys_user_org where id='%s';" % id)
last_modified = get_create_time("select last_modified from spd_ybtest_hdi.company_regist_bill where id='%s';" % id)
id = get_id("select id from spd3_platform_test2.sys_user_org order by create_time desc limit 1;")
user_id = get_id("select user_id from spd3_platform_test2.sys_user_org where id='%s';" % id)
org_id = get_id("select org_id from spd3_platform_test2.sys_user_org where id='%s';" % id)
org_code = get_id("select org_code from spd3_platform_test2.sys_user_org where id='%s';" % id)
ename = get_id("select ename from spd3_platform_test2.sys_user_org where id='%s';" % id)
cname = ename
email=cname
uxid= get_id("select uxid from spd3_platform_test2.sys_user_org where id='%s';" % id)
last_update_datetime= get_create_time("select last_update_datetime from spd3_platform_test2.sys_user_org where id='%s';" % id)
create_time = get_create_time("select create_time from spd3_platform_test2.sys_user_org where id='%s';" % id)
create_user=get_id("select create_user from spd3_platform_test2.sys_user_org where id='%s';" % id)
last_modified = get_create_time("select last_modified from spd3_platform_test2.sys_user_org where id='%s';" % id)
last_modified_user=create_user
corp_id=get_id("select corp_id from spd3_platform_test2.sys_user_org where id='%s';" % id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'sys_user_org2', id, hos_id, prov_id, sub_prov_id, contact_way
, contact_user, auditor, audit_time, create_user, create_time,
last_modified_user, last_modified)
'check_sys_user_org', id, user_id, org_id, org_code
, ename, cname, email, uxid, last_update_datetime,
create_time, create_user,last_modified,last_modified_user,corp_id)
actual_value1 = get_process_list2(actual)
expected_value1 = get_process_list2(expected)
......@@ -315,28 +307,22 @@ def check_sys_user_org():
def check_sys_user_login():
print('检查sys_user_login数据')
branch_id = get_branch_id()
sql1 = "select * from spd_ybtest_hdi.sys_user_login order by create_time desc limit 1;"
sql1 = "select * from spd3_platform_test2.sys_user_login order by create_time desc limit 1;"
actual = check_mcms_pur_sql(sql1)
print('actual', actual)
id = get_id("select id from spd_ybtest_hdi.sys_user_login order by create_time desc limit 1;")
hos_id = get_id("select hos_id from spd_ybtest_hdi.sys_user_login where id='%s';" % id)
prov_id = get_prov_id()
sub_prov_id = get_id("select sub_prov_id from spd_ybtest_hdi.sys_user_login where id='%s';" % id)
contact_way = get_id("select contact_way from spd_ybtest_hdi.sys_user_login where id='%s';" % id)
contact_user = get_id("select contact_user from spd_ybtest_hdi.sys_user_login where id='%s';" % id)
create_time = get_create_time("select create_time from spd_ybtest_hdi.sys_user_login where id='%s';" % id)
# last_modified = get_create_time("select last_modified from spd_ybtest_hdi.supply_relation where id='%s';" % id)
# username = commonFuc().get_business_data('b2_herp3_bs', "username")
auditor = get_id("select auditor from spd_ybtest_hdi.sys_user_login where id='%s';" % id)
create_user = get_login_user_uxid_bydb(
FileUtils().r_info8('b5_spd3_core_business_flow', '供货关系申请2', 'message')["e_username"])
last_modified_user = get_id("select id from spd_ybtest_hdi.sys_user_login where user_code='test_1';")
audit_time = get_create_time("select audit_time from spd_ybtest_hdi.sys_user_login where id='%s';" % id)
last_modified = get_create_time("select last_modified from spd_ybtest_hdi.company_regist_bill where id='%s';" % id)
id = get_id("select id from spd3_platform_test2.sys_user_login order by create_time desc limit 1;")
uxid = get_id("select uxid from spd3_platform_test2.sys_user_login where id='%s';" % id)
user_login_code = get_id("select user_login_code from spd3_platform_test2.sys_user_login where id='%s';" % id)
last_update_datetime=get_create_time("select last_update_datetime from spd3_platform_test2.sys_user_login where id='%s';" % id)
pwd_encryption= get_id("select pwd_encryption from spd3_platform_test2.sys_user_login where id='%s';" % id)
create_time=get_create_time("select create_time from spd3_platform_test2.sys_user_login where id='%s';" % id)
create_user= get_id("select create_user from spd3_platform_test2.sys_user_login where id='%s';" % id)
last_modified=get_create_time("select last_modified from spd3_platform_test2.sys_user_login where id='%s';" % id)
last_modified_user=create_user
corp_id=get_id("select corp_id from spd3_platform_test2.sys_user_login where id='%s';" % id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'sys_user_login2', id, hos_id, prov_id, sub_prov_id, contact_way
, contact_user, auditor, audit_time, create_user, create_time,
last_modified_user, last_modified)
'check_sys_user_login', id, uxid, user_login_code, last_update_datetime, pwd_encryption
, create_time, create_user, last_modified, last_modified_user, corp_id)
actual_value1 = get_process_list2(actual)
expected_value1 = get_process_list2(expected)
......@@ -370,8 +356,16 @@ def main():
time.sleep(6)
check_sys_org()
check_sys_user()
check_company_regist_bill(2)
check_sys_user_role()
check_sys_user_org()
check_sys_user_login()
test3()
time.sleep(6)
check_sys_org()
check_sys_user()
check_sys_user_role()
check_sys_user_org()
check_sys_user_login()
try:
main()
commonFuc().check_text_exist_result_text('succees','succees')
......
data/b2_herp3_bs/data
View file @ ee5ee471
......@@ -401,11 +401,14 @@ json_headers2: {
"payload58_10": {"consumeMode":null,"id":"2c127343e49947f5855021c790f4b08e","pkgDefId":"f8ad68aae4a5406ab04316e46bbf38bd","stockLower":100,"stockUpper":1000000,"targetDeptId":"d69a68df361a4289b2262e4ef75b55a5","shelfCode":"area0354-2-02-01","codingType":0,"grantWay":2,"packetQty":66,"tbStatus":1}
"payload58_10_1": {"consumeMode":null,"id":"%s","pkgDefId":"%s","stockLower":0,"stockUpper":0,"targetDeptId":"%s","shelfCode":"%s","codingType":0,"grantWay":null,"packetQty":"%s","tbStatus":"%s","autoUnpack":null}
"payload58_10_2": {"consumeMode":null,"id":"%s","pkgDefId":null,"stockLower":0,"stockUpper":0,"targetDeptId":"%s","shelfCode":"%s","codingType":0,"grantWay":null,"packetQty":null,"tbStatus":"%s","autoUnpack":null}
"payload58_10_3": {"consumeMode":null,"id":"%s","pkgDefId":"%s","stockLower":0,"stockUpper":0,"targetDeptId":"%s","shelfCode":"%s","codingType":0,"grantWay":null,"packetQty":"%s","tbStatus":"%s","autoUnpack":0,"limitFlag":0,"buyRound":0,"buyAllow":1,"bottleMgrFlag":1}
"payload58_11": {"consumeMode":null,"id":"2c127343e49947f5855021c790f4b08e","pkgDefId":"aaf8ad68aae4a5406ab04316e46bbf38bd","stockLower":100,"stockUpper":1000000,"targetDeptId":"d69a68df361a4289b2262e4ef75b55a5","shelfCode":"area0354-2-02-01","codingType":0,"grantWay":2,"packetQty":66,"tbStatus":1}
"payload58_12": {"consumeMode":null,"id":"2c127343e49947f5855021c790f4b08e","pkgDefId":"56b010aba2e04f978e3038c0f53d910c","stockLower":0,"stockUpper":0,"targetDeptId":"d69a68df361a4289b2262e4ef75b55a5","shelfCode":"area0354-2-02-01","codingType":1,"grantWay":1,"packetQty":33,"tbStatus":1}
"payload58_13": {"queryObject":{"goodsName":"","goodsSpec":"","purModes":[],"deptId":"96c4d23bff8541599eb1a7f5f813e421","hosId":"h0347"},"pageNum":1,"pageSize":50}
"payload58_13_1": {"queryObject":{"goodsName":"","goodsSpec":"","purModes":[],"deptId":"%s","hosId":"%s"},"pageNum":1,"pageSize":50}
"payload58_13_2": {"queryObject":{"goodsName":"%s","goodsSpec":"","purModes":[],"deptId":"%s","hosId":"%s"},"pageNum":1,"pageSize":50}
"payload58_14": {"queryObject":{"goodsName":"%s","goodsSpec":"SSY-001","purModes":["10"],"deptId":"96c4d23bff8541599eb1a7f5f813e421","hosId":"h0347"},"pageNum":1,"pageSize":50}
"payload58_15": {"queryObject":{"goodsName":"","goodsSpec":"%s","purModes":["10"],"deptId":"96c4d23bff8541599eb1a7f5f813e421","hosId":"h0347"},"pageNum":1,"pageSize":50}
......
data/b6_spd3_core_business_flow_database_check/data
View file @ ee5ee471
......@@ -538,4 +538,8 @@
"company_regist_bill": '{"id": "%s", "user_login_code": "%s", "user_login_psw": "%s", "user_name": "%s", "cname": "%s", "short_name": "", "up_company_id": "", "comp_kind": 0, "comp_function": "%s", "province": None, "city": None, "area": "", "area_code": None, "legal": "", "address": "", "is_abroad": 1, "nation": None, "regist_contact_user": "", "regist_contact_way": "", "email": "%s@sina.com", "hos_property": None, "hos_level": None, "erp_code": "%s", "reg_code": None, "jyxk_code": None, "jyxkba_code": None, "scxkz_code": None, "scbapz_code": None, "is_locked": 0, "audit_status": 10, "audit_start_time": None, "audit_end_time": %s, "auditor": None, "audit_comment": None, "regist_source_project": "%s", "data_entrance": "注册", "import_task_mfrs_id": None, "version": 0, "create_user_corp_id": None, "create_user": None, "create_time": %s, "last_modified_user": null, "last_modified": %s, "hos_spd_type": None, "organization_code": None, "spd_project_code": null, "admin_role": null, "client_type": null, "prov_id": None, "is_drug_prov": None, "is_drug_lic": None, "is_apparatus_prov": None, "is_apparatus_register": None, "user_role": null, "supply_relation_id": %s}'
"check_bas_company_info": '{"id": "%s", "code": "%s", "cname": "%s", "another_name": "", "short_pinyin": "%s", "reg_code": None, "jyxk_code": None, "nsrsb_code": None, "kind": "4", "legal": "", "address": "", "linkman": "", "contact_way": "", "contact_fax": None, "logo": None, "post_code": None, "email": "%s@sina.com", "remark": None, "erp_code": "%s", "is_supply": None, "is_three_in_one": None, "master_code": None, "flag": "1", "nation": None, "province": None, "city": None, "area": "", "area_code": None, "mfrs_kind": None, "uxid": None, "fill_date": %s, "last_update_datetime": %s, "version": 2, "ygcode": None, "agent_name": None, "record_card": None, "product_code": None, "business_scope": None, "new_business_scope": None, "two_business_scope": None, "new_two_business_scope": None, "three_business_scope": None, "new_three_business_scope": None, "audit_remark": None, "changed_remark": None, "status": None, "create_user": None, "create_time": None, "last_modified": %s, "last_modified_user": "%s"}'
"check_sys_org": '{"id":"%s","pid":"/","code":"%s:001","self_code":null,"corp_id":"%s","corp_kind":"4","ename":"配送机构","cname":"配送机构","ordinal":1,"short_pinyin":"psjg","address":null,"contact_way":null,"scm_code":null,"erp_code":null,"remark":null,"node_kind":null,"flag":"1","last_update_datetime":%s,"version":0,"branch_id":null,"dept_kind":null,"create_time":%s,"create_user":"%s","last_modified_user":"%s","last_modified":%s,"dept_cate":null,"user_leader_id":null,"dept_level":null,"dept_type":null,"ext1":null,"ext2":null,"ext3":null,"ext4":null,"ext5":null}'
"check_sys_user": '{"id":"%s","user_code":"%s","kind":"0","enable_flag":1,"create_datetime":null,"create_user_id":null,"last_update_datetime":%s,"version":0,"create_time":%s,"create_user":"%s","last_modified":%s,"last_modified_user":"%s","corp_id":"%s"}'
\ No newline at end of file
"check_sys_user": '{"id":"%s","user_code":"%s","kind":"0","enable_flag":1,"create_datetime":null,"create_user_id":null,"last_update_datetime":%s,"version":0,"create_time":%s,"create_user":"%s","last_modified":%s,"last_modified_user":"%s","corp_id":"%s"}'
"check_sys_user_role": '{"id": "%s", "mgr_range_id": "%s", "user_id": "%s", "role_id": None, "uxid": None, "mt": None, "role_code": "%s", "version": 0, "create_user": "%s", "create_time": %s, "last_modified_user": "%s", "last_modified": %s}'
"check_sys_user_org": '{"id": "%s", "user_id": "%s", "org_id": "%s", "org_code": "%s", "ename": "%s", "ordinal": None, "cname": "%s", "tel": None, "email": "%s@sina.com", "qq": None, "job": None, "erp_code": None, "scm_code": None, "others": None, "uxid": "%s", "signature": None, "status": "1", "last_update_datetime": %s, "version": 0, "create_time": %s, "create_user": "%s", "last_modified": %s, "last_modified_user": "%s", "corp_id": "%s"}'
"check_sys_user_login": '{"id": "%s", "uxid": "%s", "user_login_code": "%s", "login_count": 0, "error_count": 0, "last_login_datetime": None, "last_error_datetime": None, "flag": "0", "hash": None, "web_salt": None, "salt": None, "last_update_datetime": %s, "pwd_encryption": "%s", "version": 0, "create_time": %s, "create_user": "%s", "last_modified": %s, "last_modified_user": "%s", "ip": None, "corp_id": "%s"}'
\ No newline at end of file
main1/main_text.py
View file @ ee5ee471
......@@ -335,8 +335,8 @@ def main_text():
delData().Delete_business_Data_All()
delData().Delete_business_Data_All2()
delData().Delete_branch_by_id(3, branch_id)
print(branch_id, '删除完毕')
messagebox.showinfo("提示信息", branch_id+"数据删除完毕")
# print(branch_id, '删除完毕')
# messagebox.showinfo("提示信息", branch_id+"数据删除完毕")
def del_current_brachdata():
import tkinter as tk
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment