Skip to content
GitLab
Commit 5bb8c670 authored by xiao-hesheng's avatar xiao-hesheng
Browse files

流程五脚本提交

parent 7221ea16
Hide whitespace changes
Inline Side-by-side
air_case/b6_spd3_core_business_flow_database_check/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算_数据库验证.air/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算_数据库验证.py
View file @ 5bb8c670
......@@ -44,8 +44,8 @@ def check_mcms_check(type=1):
source_no = source_id
prov_id = get_prov_id()
prov_name = get_prov_name()
rec_org_id = get_rec_org_id(2)
rec_org_name = get_rec_org_name(2)
rec_org_id = get_rec_org_id(1)
rec_org_name = get_rec_org_name(1)
dept_id = rec_org_id
dept_name = rec_org_name
branch_id = get_branch_id()
......@@ -67,7 +67,7 @@ def check_mcms_check(type=1):
distrOrderNo = get_distrOrderNo(branch_id, bill_mode)
checkBillId = check_no
checkOrderNo = order_no
create_user = get_login_user_uxid()
create_user = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
sql = "select create_time from mcms_check where id='%s';" % check_no
create_time = get_create_time(sql)
sql = "select last_modified from mcms_check where id='%s';" % check_no
......@@ -75,30 +75,30 @@ def check_mcms_check(type=1):
last_modified_user = create_user
if type == 1:
check_mcms_check_batch(type, check_no, order_no, hos_goods_id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check', check_no,
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check_1008', check_no,
order_no, get_hosid(), get_branch_id(), source_id, source_no, prov_id,
prov_name, rec_org_id, rec_org_name, dept_id, dept_name, buyBillId,
planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId,
prov_name, rec_org_id, rec_org_name, dept_id, dept_name,
planBillId, planOrderNo, purOrderNo, purBillId,
purBillDate,
distrBillId, distrOrderNo, checkBillId, checkOrderNo, create_user,
create_time, last_modified,
last_modified_user)
elif type == 2:
check_mcms_check_batch(type, check_no, order_no, hos_goods_id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check1', check_no,
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check1_1008', check_no,
order_no, get_hosid(), get_branch_id(), source_id, source_no, prov_id,
prov_name, rec_org_id, rec_org_name, dept_id, dept_name, buyBillId,
planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId,
prov_name, rec_org_id, rec_org_name, dept_id, dept_name,
planBillId, planOrderNo, purOrderNo, purBillId,
purBillDate,
distrBillId, distrOrderNo, checkBillId, checkOrderNo, create_user,
create_time, last_modified,
last_modified_user)
else:
check_mcms_check_batch(type, check_no, order_no, hos_goods_id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check2', check_no,
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'mcms_check2_1008', check_no,
order_no, get_hosid(), get_branch_id(), source_id, source_no, prov_id,
prov_name, rec_org_id, rec_org_name, dept_id, dept_name, buyBillId,
planBillId, planOrderNo, buyOrderNo, purOrderNo, purBillId,
prov_name, rec_org_id, rec_org_name, dept_id, dept_name,
planBillId, planOrderNo, purOrderNo, purBillId,
purBillDate,
distrBillId, distrOrderNo, checkBillId, checkOrderNo, create_user,
create_time, last_modified,
......@@ -132,21 +132,27 @@ def check_mcms_check_batch(type, check_no, order_no, hos_goods_id):
bill_mode = 20
else:
bill_mode = 66
sql = "select * from mcms_check_batch where pid='%s'" % check_no
sql = "select * from mcms_check_batch where pid='%s' order by create_time desc LIMIT 1;" % check_no
# 获取实际值
actual = check_mcms_pur_plan_sql(sql)
print('actual', actual)
id = get_id("select id from mcms_check_batch where pid='%s'" % check_no)
id = get_id("select id from mcms_check_batch where pid='%s' order by create_time desc LIMIT 1;" % check_no)
pid = check_no
branch_id = get_branch_id()
distr_detail_id = get_distr_detail_id(branch_id, bill_mode)
source_detail_id = distr_detail_id
mdm_goods_code = get_mdm_goods_code1(hos_goods_id)
goods_code = get_goods_code1(hos_goods_id)
sql = "select id from hdi_barcode where code_type='%s' and branch_id='%s' order by create_time desc LIMIT 1;" % (
bill_mode, branch_id)
sql = "select barcode_id from mcms_check_batch where pid='%s' order by create_time desc LIMIT 1;" % (
check_no)
barcode_id = get_id(sql)
create_user = get_login_user_uxid()
if check_barcode_id(barcode_id)==True:
commonFuc().check_text_exist_result_text('succees', 'succees')
else:
commonFuc().check_text_exist_result_text('error', 'succees')
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_check_batch where pid='%s'" % check_no)
last_modified = get_create_time("select last_modified from mcms_check_batch where pid='%s'" % check_no)
last_modified_user = create_user
......@@ -195,7 +201,7 @@ def check_mcms_check_batch(type, check_no, order_no, hos_goods_id):
def check_mcms_psi(type=1):
print('检查中心库入库单和出库单')
print('检查中心库入库单')
if type == 1:
bill_mode = 16
elif type == 2:
......@@ -259,7 +265,7 @@ def check_mcms_psi(type=1):
if type == 1:
# 检查子表
check_mcms_psi_batch_in(id, type, order_no, source_id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi1', id,
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi1_1008', id,
order_no, target_corp_id, target_branch_id, target_dept_id,
target_dept_name, target_stock_id
, target_area_code, source_id, source_no, source_repl_id,
......@@ -271,7 +277,7 @@ def check_mcms_psi(type=1):
, create_time, last_modified, last_modified_user)
elif type == 2:
check_mcms_psi_batch_in(id, type, order_no, source_id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi2', id,
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi2_1008', id,
order_no, target_corp_id, target_branch_id, target_dept_id,
target_dept_name, target_stock_id
, target_area_code, source_id, source_no, source_repl_id,
......@@ -283,7 +289,7 @@ def check_mcms_psi(type=1):
, create_time, last_modified, last_modified_user)
else:
check_mcms_psi_batch_in(id, type, order_no, source_id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi3', id,
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi3_1008', id,
order_no, target_corp_id, target_branch_id, target_dept_id,
target_dept_name, target_stock_id
, target_area_code, source_id, source_no, source_repl_id,
......@@ -440,11 +446,11 @@ def check_mcms_psi_batch_in(DR_ID, type, order_no, source_id1):
else:
bill_mode = 66
branch_id = get_branch_id()
sql = " select * from mcms_psi_batch where pid='%s';" % (
sql = " select * from mcms_psi_batch where pid='%s' order by create_time desc LIMIT 1;" % (
DR_ID)
actual = check_mcms_dept_buy_sql(sql)
print('actual', actual)
batch_main_key = get_id("select id from mcms_psi_batch where pid='%s';" % DR_ID)
batch_main_key = get_id("select id from mcms_psi_batch where pid='%s' order by create_time desc LIMIT 1;" % DR_ID)
pid = DR_ID
# order_no = get_id("select order_no from mcms_psi_dept_batch where pid='%s';" % DR_ID)
source_detail_id = source_id1 + '0001'
......@@ -532,22 +538,30 @@ sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_a7流程五_
using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_a7流程五_中心库入库结算_正结算3_内网验收入库结算.air')
from a_a7流程五_中心库入库结算_正结算3_内网验收入库结算 import check_accept_order,putaway
try:
# 验收
check_accept_order(1) # 低值
time.sleep(6)
check_mcms_check(1)
time.sleep(3)
check_accept_order(2) # 高值
time.sleep(6)
check_mcms_check(2)
time.sleep(3)
check_accept_order(3) # 试剂
time.sleep(6)
check_mcms_check(3)
# # 验收
# check_accept_order(1) # 低值
# time.sleep(6)
# check_mcms_check(1)
# time.sleep(3)
# check_accept_order(2) # 高值
# time.sleep(6)
# check_mcms_check(2)
# time.sleep(3)
# check_accept_order(3) # 试剂
# time.sleep(6)
# check_mcms_check(3)
# 入库上架
# putaway()
# time.sleep(6)
check_mcms_psi(3)
putaway()
putaway()
putaway()
time.sleep(3)
check_mcms_psi(2)
time.sleep(3)
check_mcms_psi(1)
OBD_ID = settle()# 生成结算单
# 调用审批结算单
approval_center(OBD_ID)
......
data/b6_spd3_core_business_flow_database_check/data
View file @ 5bb8c670
......@@ -430,4 +430,19 @@
#手工采购计划_配送单
"hdi_distr_0929": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "YND", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "xhs", "rec_addr": "设备科001", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"purMode":10,"confirmTime":"%s","confirmUser":"%s","epidemicFlag":0,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}'
"hdi_distr1_0929": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "xhs", "rec_addr": "自动化测试", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"purMode":20,"confirmTime":"%s","confirmUser":"%s","epidemicFlag":0,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 0, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}'
"hdi_distr2_0929": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "xhs", "rec_addr": "自动化测试", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"purMode":60,"confirmTime":"%s","confirmUser":"%s","epidemicFlag":0,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}'
\ No newline at end of file
"hdi_distr2_0929": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "hos_id": "%s", "hos_name": "%s", "branch_id": "%s", "source_id": "%s", "source_type": "CGD", "pur_bill_id": "%s", "prov_id": "%s", "prov_name": "%s", "sub_send_flag": 10, "exe_prov_id": "%s", "exe_prov_name": "%s", "settlement": None, "pur_dept_id": "%s", "pur_dept_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "rec_user": "%s", "rec_phone": "xhs", "rec_addr": "自动化测试", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s"}", "ext_info": "{"purMode":60,"confirmTime":"%s","confirmUser":"%s","epidemicFlag":0,"distrUser":"%s"}", "barcode_flag": 1, "pkg_flag": 1, "remark": "", "task_id": None, "convert_flag": 1, "convert_time": None, "convert_user_name": None, "reject_status": 0, "tb_status": 20, "create_user": "%s", "create_user_name": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "initial_order": None}'
#手工采购计划_验收单主表
"mcms_check_1008": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "hos_id": "%s", "branch_id": "%s", "source_id": "%s", "source_no": "%s", "source_type": "PSD", "tb_status": 10, "prov_id": "%s", "prov_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "dept_id": "%s", "dept_name": "%s", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "initial_order": None, "remark": ""}'
"mcms_check1_1008": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "hos_id": "%s", "branch_id": "%s", "source_id": "%s", "source_no": "%s", "source_type": "PSD", "tb_status": 10, "prov_id": "%s", "prov_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "dept_id": "%s", "dept_name": "%s", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "initial_order": None, "remark": ""}'
"mcms_check2_1008": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "hos_id": "%s", "branch_id": "%s", "source_id": "%s", "source_no": "%s", "source_type": "PSD", "tb_status": 10, "prov_id": "%s", "prov_name": "%s", "rec_org_id": "%s", "rec_org_name": "%s", "dept_id": "%s", "dept_name": "%s", "bill_relation_json": "{"planBillId":"%s","planOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "initial_order": None, "remark": ""}'
#手工采购计划_验收单子表
"mcms_check_batch_1008": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "distr_detail_id": "%s", "pur_mode": 10, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "barcode_id": "%s", "sub_barcode_id": None, "qty": Decimal("100.00"), "reject_qty": Decimal("0.00"), "reject_reason": None, "settlement": 1, "tb_status": 1, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
"mcms_check_batch1_1008": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "distr_detail_id": "%s", "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "barcode_id": "%s", "sub_barcode_id": None, "qty": Decimal("1.00"), "reject_qty": Decimal("0.00"), "reject_reason": None, "settlement": 1, "tb_status": 1, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
"mcms_check_batch2_1008": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "distr_detail_id": "%s", "pur_mode": 60, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "barcode_id": "%s", "sub_barcode_id": None, "qty": Decimal("100.00"), "reject_qty": Decimal("0.00"), "reject_reason": None, "settlement": 1, "tb_status": 1, "pur_task_id": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
#手工采购计划_中心库入库单
"check_mcms_psi1_1008": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "HDI", "psi_flag": 1, "psi_kind": "101", "stock_kind": "RK_YS", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "自动化测试", "source_id": "%s", "source_no": "%s", "source_repl_id": "%s", "source_corp_id": "%s", "source_branch_id": None, "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": None, "source_area_name": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": %s, "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s"}", "reject_time": None, "reject_remark": None, "create_user": "%s","create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_user": None, "initial_order": None, "source_type": "BD", "reject_reason": None, "receipt_status": 0}'
"check_mcms_psi2_1008": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "HDI", "psi_flag": 1, "psi_kind": "101", "stock_kind": "RK_YS", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "自动化测试", "source_id": "%s", "source_no": "%s", "source_repl_id": "%s", "source_corp_id": "%s", "source_branch_id": None, "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": None, "source_area_name": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": %s, "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s"}", "reject_time": None, "reject_remark": None, "create_user": "%s","create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_user": None, "initial_order": None, "source_type": "BD", "reject_reason": None, "receipt_status": 0}'
"check_mcms_psi3_1008": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "HDI", "psi_flag": 1, "psi_kind": "101", "stock_kind": "RK_YS", "target_corp_id": "%s", "target_branch_id": "%s", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_area_code": "%s", "target_area_name": "自动化测试", "source_id": "%s", "source_no": "%s", "source_repl_id": "%s", "source_corp_id": "%s", "source_branch_id": None, "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": None, "source_area_name": None, "remark": None, "tb_status": 30, "accounter": "%s", "account_date": %s, "bill_relation_json": "{"buyBillId":"%s","planBillId":"%s","planOrderNo":"%s","buyOrderNo":"%s","purOrderNo":"%s","purBillId":"%s","purBillDate":"%s","distrBillId":"%s","distrOrderNo":"%s","checkBillId":"%s","checkOrderNo":"%s","psiInBillId":"%s","psiInOrderNo":"%s"}", "reject_time": None, "reject_remark": None, "create_user": "%s","create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_user": None, "initial_order": None, "source_type": "BD", "reject_reason": None, "receipt_status": 0}'
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