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

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

@@ -646,8 +646,8 @@ def check_mcms_psi_dept_batch_in(DR_ID,type,order_no):
     batch_main_key = get_id("select id from mcms_psi_dept_batch where pid='%s';" % 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 = get_pick_detail_id(branch_id,type)
-    pick_detail_id=source_detail_id
+    source_detail_id = batch_main_key
+    pick_detail_id=None
     if type == 16:
         hos_goods_id = FileUtils().r_info8('b5_spd3_core_business_flow', '产品审核信息', 'message2')["hosGoodsId"]
     elif type == 20:
@@ -672,7 +672,7 @@ def check_mcms_psi_dept_batch_in(DR_ID,type,order_no):
         commonFuc().check_text_exist_result_text('succees', 'succees')
     else:
         commonFuc().check_text_exist_result_text('error', 'succees')
-    dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    dept_name=FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
     shelf_code= get_stockAreaId_new_fromDb(dept_name, 2)
     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_psi_dept_batch where pid='%s';" % DR_ID)
@@ -680,7 +680,7 @@ def check_mcms_psi_dept_batch_in(DR_ID,type,order_no):
     last_modified_user = create_user
     if type == 16:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept_batch1', batch_main_key, pid, order_no,source_detail_id
+                                                 'mcms_psi_dept_batch_in1', 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
@@ -688,7 +688,7 @@ def check_mcms_psi_dept_batch_in(DR_ID,type,order_no):
                                                  )
     elif type == 20:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept_batch2', batch_main_key, pid, order_no,source_detail_id
+                                                 'mcms_psi_dept_batch_in2', 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
@@ -696,7 +696,7 @@ def check_mcms_psi_dept_batch_in(DR_ID,type,order_no):
                                                  )
     else:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
-                                                 'mcms_psi_dept_batch3',batch_main_key, pid, order_no,source_detail_id
+                                                 'mcms_psi_dept_batch_in3',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
@@ -738,7 +738,7 @@ def check_mcms_psi_dept_in(type=16):
         source_id = info['DR_NO1']
     source_id = ''.join(source_id)
     source_no=get_id("select order_no from  mcms_psi_dept where id='%s';"%source_id)
-    #获取出库单主键DR_ID
+    #获取入库单主键DR_ID
     sql = " select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_SL' order by   CREATE_TIME desc LIMIT 1;" % (
         branch_id, type)
     DR_ID = get_id(sql)
@@ -764,8 +764,8 @@ def check_mcms_psi_dept_in(type=16):
     pickOrderNo = get_PICK_order_no(branch_id, type)
     buyOrderNo = get_buyOrderNo(branch_id, type)
     pickBillId = get_PICK_id(branch_id, type)
-    psiDeptOutBillId = DR_ID
-    psiDeptOutOrderNo = order_no
+    psiDeptOutBillId = source_id
+    psiDeptOutOrderNo = source_no
     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_psi_dept where id='%s';" % DR_ID)
     last_modified = get_create_time("select last_modified from  mcms_psi_dept where id='%s';" % DR_ID)
@@ -777,7 +777,7 @@ def check_mcms_psi_dept_in(type=16):
     psiDeptInOrderNo=order_no
     if type == 16:
         # 子表检查
-        check_mcms_psi_dept_batch(DR_ID,type,order_no)
+        check_mcms_psi_dept_batch_in(DR_ID,type,order_no)
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_in_1', DR_ID, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
@@ -790,7 +790,7 @@ def check_mcms_psi_dept_in(type=16):
                                                  )
     elif type == 20:
         # 子表检查
-        check_mcms_psi_dept_batch(DR_ID, type, order_no)
+        check_mcms_psi_dept_batch_in(DR_ID, type, order_no)
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_in_2', DR_ID, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id
@@ -803,7 +803,7 @@ def check_mcms_psi_dept_in(type=16):
                                                  )
     else:
         # 子表检查
-        check_mcms_psi_dept_batch(DR_ID, type, order_no)
+        check_mcms_psi_dept_batch_in(DR_ID, type, order_no)
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check',
                                                  'mcms_psi_dept_in_3', DR_ID, order_no, target_corp_id, target_branch_id,
                                                  target_dept_id, target_dept_name, target_stock_id

data/b6_spd3_core_business_flow_database_check/data

@@ -97,4 +97,9 @@
 #入库单主表
 "mcms_psi_dept_in_1": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "YND", "psi_flag": 1, "psi_kind": "107", "stock_kind": "RK_SL", "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": None, "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","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%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_2": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "psi_flag": 1, "psi_kind": "107", "stock_kind": "RK_SL", "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": None, "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","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%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_3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": 1, "psi_kind": "107", "stock_kind": "RK_SL", "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": None, "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","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%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_3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": 1, "psi_kind": "107", "stock_kind": "RK_SL", "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": None, "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","pickOrderNo":"%s","buyOrderNo":"%s","pickBillId":"%s","psiDeptOutBillId":"%s","psiDeptOutOrderNo":"%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}'
\ No newline at end of file
+
+#入库单子表
+"mcms_psi_dept_batch_in1": '{"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": "%s", "version": 0}'
+"mcms_psi_dept_batch_in2": '{"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": "%s", "version": 0}'
+"mcms_psi_dept_batch_in3": '{"id": "%s", "pid": "%s", "order_no": "%s", "source_detail_id": "%s", "pick_detail_id": "%s", "pur_mode": 60, "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": "%s", "version": 0}'