Merge remote-tracking branch 'remotes/origin/core_folw'

# Conflicts:
#	data/b5_spd3_core_business_flow/message10
#	data/b5_spd3_core_business_flow/message11
#	data/b5_spd3_core_business_flow/message12
#	data/b5_spd3_core_business_flow/message13
#	data/b5_spd3_core_business_flow/message14
#	data/b5_spd3_core_business_flow/message15
#	data/b5_spd3_core_business_flow/message8
#	data/b5_spd3_core_business_flow/message9

air_case/b6_spd3_core_business_flow_database_check/a_b3流程十请领业务流_二级库向边仓_数据库验证.air/a_b3流程十请领业务流_二级库向边仓_数据库验证.py

@@ -111,6 +111,8 @@ def check_mcms_dept_buy():
     sql1 = "select order_no from  mcms_dept_buy where branch_id='%s' and bill_mode='16' order by create_time desc LIMIT 1;" % branch_id
     order_no1 = get_dept_buy_id(sql1)
     print(process_tuple(id1), process_tuple(order_no1))
+    id1=process_tuple(id1)
+    order_no1=process_tuple(order_no1)
     deptid2 = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
     deptname2 = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
     # target_dept_id=FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
@@ -141,9 +143,9 @@ def check_mcms_dept_buy():
                                              'mcms_dept_buy', id1, order_no1, get_hosid(), branch_id, deptid2,
                                              deptname2, area_code, area_name, target_dept_id, target_dept_name,
                                              target_stock_id,target_stock_name, bill_expdt_date, rec_user, rec_addr,create_user, create_time,
-                                             last_modified, last_modified_user, last_auditor, last_audit_time)
+                                             last_modified, last_modified_user)
     print('expected', expected)
-
+    print('aaaaaaaaaaaaaaaaa')
 
 try:
     # ==============暂时注释==================