Commit 1f2bff8c authored by xiao-hesheng's avatar xiao-hesheng
Browse files

流程五脚本提交

parent 4b8594d0
......@@ -5,7 +5,7 @@ from air_case.public1.public1.public1 import updateUserLoginDefaultRange, get_li
get_branch_id, process_tuple, get_dept_buy_id, check_mcms_pur_plan_sql, get_hosid, get_id, \
get_stockAreaId_new_fromDb, get_login_user_uxid, get_expdt_date, get_create_time, get_process_list2, \
compare_text_index, check_mcms_pur_sql, check_source_id, get_mdm_goods_code1, get_goods_code1, get_supply_id, \
get_pkg_def_id, get_goods_gg, get_goods_name
get_pkg_def_id, get_goods_gg, get_goods_name, get_login_user_uxid_bydb
from common.fileUtls import FileUtils
from common.run_cmd_script import execute_command
......@@ -66,7 +66,7 @@ def check_mcms_mcms_pur_plan(type=16):
branch_id)
area_name = process_tuple(get_id(sql1))
source_id = None
rec_user = get_login_user_uxid()
rec_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
sql1 = "select rec_addr from mcms_pur_plan where branch_id='%s' order by create_time desc LIMIT 1;" % (
branch_id)
rec_addr = process_tuple(get_id(sql1))
......@@ -160,7 +160,7 @@ def check_mcms_mcms_pur_plan_detail(id, type, planOrderNo):
dept_name2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
rec_org_id = process_tuple(
get_id("select id from sys_org where branch_id='%s' and ename='%s';" % (branch_id, dept_name2)))
rec_user = get_login_user_uxid()
rec_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
create_user = rec_user
# last_modified = create_time
last_modified_user = create_user
......@@ -327,7 +327,7 @@ def check_mcms_purchase(type=16):
branch_id, id1)
area_name = process_tuple(get_id(sql1))
rec_user = FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1']
# rec_user = get_login_user_uxid()
# rec_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
sql1 = "select rec_addr from mcms_purchase where branch_id='%s' and id='%s' order by create_time desc LIMIT 1;" % (
branch_id, id1)
rec_addr = process_tuple(get_id(sql1))
......@@ -336,7 +336,7 @@ def check_mcms_purchase(type=16):
print(sql)
bill_expdt_date = get_expdt_date(sql)
create_user = get_login_user_uxid()
create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
create_time = get_create_time(
"select create_time from mcms_purchase where branch_id='%s' and id='%s' order by create_time desc LIMIT 1;" % (
branch_id, id1))
......@@ -415,9 +415,9 @@ def check_mcms_purchase(type=16):
'mcms_purchase2_0927', id1, order_no, hos_id,
get_branch_id(), dept_id1, dept_name1, rec_org_id, rec_org_name,
area_code, area_name, bill_expdt_date, source_id, rec_user,
rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name, buyBillId,
rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name,
planBillId, planOrderNo,
buyOrderNo, purOrderNo, purBillId, close_date, create_user,
purOrderNo, purBillId, close_date, create_user,
create_time, last_modified, last_auditor, last_audit_time
)
elif type == 66:
......@@ -450,9 +450,9 @@ def check_mcms_purchase(type=16):
'mcms_purchase3_0927', id1, order_no, hos_id,
get_branch_id(), dept_id1, dept_name1, rec_org_id, rec_org_name,
area_code, area_name, bill_expdt_date, source_id, rec_user,
rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name, buyBillId,
rec_addr, prov_id, prov_name, exe_prov_id, exe_prov_name,
planBillId, planOrderNo,
buyOrderNo, purOrderNo, purBillId, close_date, create_user,
purOrderNo, purBillId, close_date, create_user,
create_time, last_modified, last_auditor, last_audit_time
)
else:
......@@ -497,7 +497,7 @@ def check_mcms_purchase_detail(id, type, OrderNo):
dept_name2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
rec_org_id = process_tuple(
get_id("select id from sys_org where branch_id='%s' and ename='%s';" % (branch_id, dept_name2)))
rec_user = get_login_user_uxid()
rec_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
create_user = rec_user
# last_modified = create_time
last_modified_user = create_user
......@@ -535,7 +535,7 @@ def check_mcms_purchase_detail(id, type, OrderNo):
goodsGg = get_goods_gg(hos_goods_id)
goodsCode = get_goods_code1(hos_goods_id)
goodsName = get_goods_name(hos_goods_id)
create_user = get_login_user_uxid()
create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
create_time = get_create_time("select create_time from mcms_purchase_detail where id='%s';" % detail_main_key)
last_modified = create_time
last_modified_user = create_user
......@@ -620,7 +620,7 @@ def main():
check_mcms_mcms_pur_plan(66) #试剂采购计划数据检查
approval_center(token)
time.sleep(6)
check_mcms_purchase(20) # 检查试剂采购订单数据
check_mcms_purchase(66) # 检查试剂采购订单数据
commonFuc().check_text_exist_result_text('succees', 'succees')
except Exception as e:
print('出现错误,请检查脚本或者数据')
......
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