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

@@ -135,10 +135,12 @@ def check_mcms_dept_buy():
     last_modified_user = 'last_modified_user'
     last_auditor = 'last_auditor'
     last_audit_time = 'last_audit_time'
+    target_stock_name='自动化测试12345'
+    rec_addr=deptname2
     expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                              '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, bill_expdt_date, rec_user, create_user, create_time,
+                                             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)
     print('expected', expected)
 

data/b6_spd3_core_business_flow_database_check/data

 "check_mcms_dept_buy_car_low_value": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": %s, "pkg_def_id": "%s", "pkg_def_name": "%s", "pkg_def_qty": Decimal("100.00"), "buy_pkg_qty": Decimal("1.00"), "buy_qty": Decimal("100.00"), "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "coding_type": 0}'
 "check_mcms_dept_buy_car_high_value": '{"id": "%s", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "pur_mode": %s, "pkg_def_id": null, "pkg_def_name": null, "pkg_def_qty": Decimal("1.00"), "buy_pkg_qty": Decimal("1.00"), "buy_qty": Decimal("1.00"), "tb_status": 0, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "coding_type": 0}'
 
-"mcms_dept_buy": '{'id': '%s', 'order_no': '%s', 'bill_mode': '16', 'hos_id': '%s', 'branch_id': '%s', 'dept_id': '%s', 'dept_name': '%s', 'area_code': '%s', 'area_name': '%s', 'source_id': None, 'buy_way': '2', 'create_type': 'SG', 'buy_kind': 'KS', 'target_dept_id': '%s', 'target_dept_name': '%s', 'target_stock_id': '%s', 'target_stock_name': '%s', 'bill_expdt_date': %s, 'bill_expect_date': None, 'priority': 0, 'buy_priority': 0, 'barcode_flag': 1, 'pkg_flag': 1, 'remark': '', 'dept_audit_remark': None, 'audit_remark': None, 'close_remark': None, 'srv_id': None, 'srv_name': None, 'gen_status': 0, 'close_status': 0, 'tb_status': 10, 'rec_user': '%s', 'rec_phone': 'None', 'rec_addr': '%s', 'create_user': '%s', 'create_time': %s, 'last_modified': %s, 'last_modified_user': '%s', 'version': 0, 'del_flag': 0, 'last_auditor': None, 'last_audit_time': None, 'close_time': None, 'old_order_no': None}'
+"mcms_dept_buy": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "hos_id": "%s", "branch_id": "%s", "dept_id": "%s", "dept_name": "%s", "area_code": "%s", "area_name": "%s", "source_id": None, "buy_way": "2", "create_type": "SG", "buy_kind": "KS", "target_dept_id": "%s", "target_dept_name": "%s", "target_stock_id": "%s", "target_stock_name": "%s", "bill_expdt_date": %s, "bill_expect_date": None, "priority": 0, "buy_priority": 0, "barcode_flag": 1, "pkg_flag": 1, "remark": "", "dept_audit_remark": None, "audit_remark": None, "close_remark": None, "srv_id": None, "srv_name": None, "gen_status": 0, "close_status": 0, "tb_status": 10, "rec_user": "%s", "rec_phone": "None", "rec_addr": "%s", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "del_flag": 0, "last_auditor": None, "last_audit_time": None, "close_time": None, "old_order_no": None}'
\ No newline at end of file