数据库验证流程十二脚本编写

air_case/b6_spd3_core_business_flow_database_check/a_b4流程十一请领业务流_二级库向直送_数据库验证.air/a_b4流程十一请领业务流_二级库向直送_数据库验证.py

@@ -1926,30 +1926,31 @@ def check_mcms_psi_dept_in(type=16):
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_in_5', 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_corp_id,
-                                                 source_branch_id,
+                                                 , target_area_code, source_id, source_no, source_repl_id,
+                                                 source_corp_id, source_branch_id,
                                                  source_dept_id, source_dept_name, source_stock_id, source_area_code,
-                                                 accounter, account_date, buyBillId, pickOrderNo, buyOrderNo,
-                                                 pickBillId, psiDeptOutBillId,
-                                                 psiDeptOutOrderNo, psiDeptInBillId, psiDeptInOrderNo
-                                                 , create_user, create_time, last_modified, last_modified_user
+                                                 accounter, account_date, buyBillId, planBillId, planOrderNo,
+                                                 buyOrderNo, purOrderNo, purBillId, purBillDate, distrBillId,
+                                                 distrOrderNo, checkBillId, checkOrderNo, psiInBillId, psiInOrderNo,
+                                                 psiDeptOutBillId, psiDeptOutOrderNo, psiDeptInBillId, psiDeptInOrderNo,
+                                                 create_user, create_time, last_modified, last_modified_user)
+
 
-                                                 )
     else:
         # 子表检查
         check_mcms_psi_dept_batch_in(id, type, order_no,source_id)
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_in_6', 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_corp_id,
-                                                 source_branch_id,
+                                                 , target_area_code, source_id, source_no, source_repl_id,
+                                                 source_corp_id, source_branch_id,
                                                  source_dept_id, source_dept_name, source_stock_id, source_area_code,
-                                                 accounter, account_date, buyBillId, pickOrderNo, buyOrderNo,
-                                                 pickBillId, psiDeptOutBillId,
-                                                 psiDeptOutOrderNo, psiDeptInBillId, psiDeptInOrderNo
-                                                 , create_user, create_time, last_modified, last_modified_user
+                                                 accounter, account_date, buyBillId, planBillId, planOrderNo,
+                                                 buyOrderNo, purOrderNo, purBillId, purBillDate, distrBillId,
+                                                 distrOrderNo, checkBillId, checkOrderNo, psiInBillId, psiInOrderNo,
+                                                 psiDeptOutBillId, psiDeptOutOrderNo, psiDeptInBillId, psiDeptInOrderNo,
+                                                 create_user, create_time, last_modified, last_modified_user)
 
-                                                 )
 
     print('expected', expected)
     print('aaaaaaaaaaaaaaaaa')
@@ -2015,24 +2016,24 @@ def check_mcms_psi_dept_batch_in(DR_ID,type,order_no,source_id1):
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_batch_in4', 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
+                                            target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified
+
 
                                                  )
     elif type == 20:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_batch_in5', 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
+                                            target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified
+
 
                                                  )
     else:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_batch_in6',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
+                                            target_batch_id,barcode_id,shelf_code,create_user,create_time,last_modified
+
 
                                                  )
 

data/b6_spd3_core_business_flow_database_check/data

@@ -123,6 +123,7 @@
 "mcms_psi_dept_in_4": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "YND", "psi_flag": 1, "psi_kind": "102", "stock_kind": "RK_QL", "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": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": 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","psiOutBillId":"%s","psiOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
 "mcms_psi_dept_in_5": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "psi_flag": 1, "psi_kind": "102", "stock_kind": "RK_QL", "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": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": 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","psiOutBillId":"%s","psiOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
 "mcms_psi_dept_in_6": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": 1, "psi_kind": "102", "stock_kind": "RK_QL", "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": "%s", "source_dept_id": "%s", "source_dept_name": "%s", "source_stock_id": "%s", "source_area_code": "%s", "source_area_name": "默认库区", "consume_type": 0, "patient_id": None, "patient_name": None, "machine_id": None, "machine_name": None, "his_charge_no": 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","psiOutBillId":"%s","psiOutOrderNo":"%s","psiDeptInBillId":"%s","psiDeptInOrderNo":"%s"}", "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 1, "last_auditor": None, "last_audit_time": None, "reject_reason": None, "reject_user": None, "reject_time": None, "initial_order": None, "source_type": "SG", "target_coding_type": None}'
+
 #科室入库单子表
 "mcms_psi_dept_batch_in4": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 10, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("100.00"), "unit_name": "100支/100", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": null, "version": 0}'
 "mcms_psi_dept_batch_in5": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": %s, "pur_mode": 20, "hos_goods_id": "%s", "mdm_goods_code": "%s", "goods_code": "%s", "source_batch_id": "%s", "target_batch_id": "%s", "settle_flag": 0, "psi_price": Decimal("99.9999"), "qty": Decimal("1.00"), "unit_name": "1支", "barcode_id": "%s", "sub_barcode_id": None, "shelf_code": "%s-A-01-01", "tb_status": 0, "charge_flag": null, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": null, "version": 0}'