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

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

parents 26d34d50 1a3e968a
Expand all Hide whitespace changes
Inline Side-by-side
air_case/b6_spd3_core_business_flow_database_check/a_c0流程十七退货业务 中心库退供应商_数据库验证.air/a_c0流程十七退货业务 中心库退供应商_数据库验证.py
View file @ d5b1e889
......@@ -118,7 +118,7 @@ def check_mcms_psi_out(type=1):
, create_time, last_modified, last_modified_user)
else:
check_mcms_psi_batch_out(id, type, order_no, source_id)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out_1_3', id,
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out_1_3',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,
......@@ -198,8 +198,8 @@ def check_mcms_psi_batch_out(DR_ID, type, order_no, source_id1):
last_modified_user = create_user
if type == 1:
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_psi_batch_out1_1', batch_main_key, pid, order_no, source_detail_id
, hos_goods_id, mdm_goods_code, goods_code, source_batch_id,pick_detail_id,
'mcms_psi_batch_out1_1', batch_main_key, pid, order_no, source_detail_id
, pick_detail_id,hos_goods_id, mdm_goods_code, goods_code, source_batch_id,
target_batch_id, barcode_id, shelf_code, create_user, create_time,
last_modified, last_modified_user
......@@ -214,8 +214,8 @@ def check_mcms_psi_batch_out(DR_ID, type, order_no, source_id1):
)
else:
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_psi_batch_out1_3', batch_main_key, pid, order_no, source_detail_id
, hos_goods_id, mdm_goods_code, goods_code, source_batch_id,pick_detail_id,
'mcms_psi_batch_out1_3', batch_main_key, pid, order_no, source_detail_id
, pick_detail_id,hos_goods_id, mdm_goods_code, goods_code, source_batch_id,
target_batch_id, barcode_id, shelf_code, create_user, create_time,
last_modified, last_modified_user
......@@ -284,33 +284,33 @@ def check_mcms_pick(type=16):
#检查拣货单子表
check_mcms_pick_detail(id,type,order_no)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_pick1', id, get_hosid(), get_branch_id(), order_no, source_id,
'mcms_pick1_1', id, get_hosid(), get_branch_id(), order_no,
dept_id,
dept_name, stock_id, area_code, target_dept_id, target_dept_name,
target_stock_id, target_area_code, reviewer,
review_date, buyBillId, pickOrderNo, buyOrderNo, pickBillId,
review_date, pickOrderNo, pickBillId,
create_user, create_time, last_modified, last_modified_user,picker, picker_name
)
elif type == 20:
# 检查拣货单子表
check_mcms_pick_detail(id,type,order_no)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_pick2', id, get_hosid(), get_branch_id(), order_no, source_id,
'mcms_pick2_1', id, get_hosid(), get_branch_id(), order_no,
dept_id,
dept_name, stock_id, area_code, target_dept_id, target_dept_name,
target_stock_id, target_area_code, reviewer,
review_date, buyBillId, pickOrderNo, buyOrderNo, pickBillId,
review_date, pickOrderNo, pickBillId,
create_user, create_time, last_modified, last_modified_user,picker, picker_name
)
else:
# 检查拣货单子表
check_mcms_pick_detail(id, type, order_no)
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_pick3', id, get_hosid(), get_branch_id(), order_no, source_id,
'mcms_pick3_1', id, get_hosid(), get_branch_id(), order_no,
dept_id,
dept_name, stock_id, area_code, target_dept_id, target_dept_name,
target_stock_id, target_area_code, reviewer,
review_date, buyBillId, pickOrderNo, buyOrderNo, pickBillId,
review_date, pickOrderNo, pickBillId,
create_user, create_time, last_modified, last_modified_user,picker, picker_name
)
......@@ -359,7 +359,7 @@ def check_mcms_pick_detail(pid,type,order_no):
if type == 16:
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_pick_detail1', id,pid,order_no,source_id,hos_goods_id
'mcms_pick_detail_out_1', id,pid,order_no,hos_goods_id
,mdm_goods_code,goods_code,pkg_def_id,picker,picker_name,
create_user,create_time,last_modified,last_modified_user
......@@ -367,14 +367,14 @@ def check_mcms_pick_detail(pid,type,order_no):
elif type == 20:
pkg_def_id=None
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_pick_detail2', id,pid,order_no,source_id,hos_goods_id
'mcms_pick_detail_out_2', id,pid,order_no,hos_goods_id
,mdm_goods_code,goods_code,pkg_def_id,picker,picker_name,
create_user,create_time,last_modified,last_modified_user
)
else:
expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
'mcms_pick_detail3', id,pid,order_no,source_id,hos_goods_id
'mcms_pick_detail_out_3', id,pid,order_no,hos_goods_id
,mdm_goods_code,goods_code,pkg_def_id,picker,picker_name,
create_user,create_time,last_modified,last_modified_user
......@@ -405,17 +405,19 @@ using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_c0流程十七退货
from a_c0流程十七退货业务_中心库退供应商 import center_Stock_return_Out
try:
# updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) #设置登录账号默认权限是1级库
# center_Stock_return_Out(2) #高值耗材退货出库
# time.sleep(6)
updateUserLoginDefaultRange(get_listUserMgrRangePage1(1)) #设置登录账号默认权限是1级库
center_Stock_return_Out(2) #高值耗材退货出库
time.sleep(6)
check_mcms_psi_out(2)#检查出库单主表和子表
check_mcms_pick(20) #检查拣货单主表和子表
center_Stock_return_Out(1) #低值耗材退货出库
time.sleep(6)
check_mcms_psi_out(1)
check_mcms_psi_out(1)#检查出库单主表和子表
check_mcms_pick(16) # 检查拣货单主表和子表
center_Stock_return_Out(3) #试剂耗材退货出库
time.sleep(6)
check_mcms_psi_out(3)
check_mcms_pick(66) # 检查拣货单主表和子表
commonFuc().check_text_exist_result_text('succees', 'succees')
except Exception as e:
# 打印错误信息
......
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