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

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

@@ -1739,7 +1739,7 @@ def check_mcms_psi(type=1):
     source_corp_id = get_hosid()
     source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid1']
     source_dept_name =FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid1']
-    source_stock_id = source_corp_id
+    source_stock_id = get_stockId_fromdb(get_branch_name()+'中心库房')
     accounter = get_login_user_uxid_bydb(FileUtils().r_info8('b2_herp3_bs', "用户名信息", 'message3')['username1'])
     account_date = get_create_time("select account_date from  mcms_psi where id='%s';" % id_out)
 
@@ -1771,7 +1771,7 @@ def check_mcms_psi(type=1):
     last_modified = get_create_time("select last_modified from  mcms_psi where id='%s';" % id_out)
     last_modified_user = create_user
     source_branch_id = get_branch_id()
-    source_area_code=get_stockAreaId2_new_fromDb(source_dept_name)
+    source_area_code=get_stockAreaId_new_fromDb(source_dept_name)
     if type == 1:
         expected = commonFuc().get_business_data('b6_spd3_core_business_flow_database_check', 'check_mcms_psi_out1',
                                                  id_out,
@@ -1826,7 +1826,111 @@ def check_mcms_psi(type=1):
     else:
         print('error')
         commonFuc().check_text_exist_result_text('error', 'succees')
+def check_mcms_psi_dept_in(bill_mode=16):
+    branch_id = get_branch_id()
+    sql = " select * from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
+    branch_id, bill_mode)
+    actual = check_mcms_dept_buy_sql(sql)
+    print(actual)
+    #获取主键
+    id=get_id(" select id from  mcms_psi_dept where target_branch_id='%s' and bill_mode='%s' and stock_kind='RK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
+    branch_id, bill_mode))
+    #获取source_id
+    sql = "select id from  mcms_psi  where target_branch_id='%s' and bill_mode='%s' and stock_kind='CK_QL' order by   CREATE_TIME desc LIMIT 1;" % (
+        branch_id, bill_mode)
+    source_id = get_id(sql)
+    source_no=get_id("select order_no from  mcms_psi where id='%s';"%source_id)
+    #获取order_no
+    sql = " select order_no 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)
+    order_no = get_id(sql)
+    target_corp_id = get_hosid()
+    target_branch_id = get_branch_id()
+    target_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid5']
+    target_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid5']
+    target_stock_id = get_stockId_fromdb(target_dept_name + '库房')
+    target_area_code = get_stockAreaId_new_fromDb(target_dept_name, 2)
+    PICK_id = get_PICK_id(branch_id, type)
 
+    source_corp_id = get_hosid()
+    source_branch_id = get_branch_id()
+    source_dept_id = FileUtils().r_info8("b2_herp3_bs", "所有科室id", 'message6')['deptid2']
+    source_dept_name = FileUtils().r_info8("b2_herp3_bs", "所有科室name", 'message6')['deptid2']
+    source_stock_id = get_stockId_fromdb(source_dept_name + '库房')
+    source_area_code = get_stockAreaId_new_fromDb(source_dept_name, 2)
+    buyBillId = get_buyBillId(branch_id, type)
+    pickOrderNo = get_PICK_order_no(branch_id, type)
+    buyOrderNo = get_buyOrderNo(branch_id, type)
+    pickBillId = get_PICK_id(branch_id, type)
+    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)
+    last_modified_user = create_user
+    accounter=create_user
+    sql="select account_date from  mcms_psi_dept where id='%s';"%DR_ID
+    account_date=get_account_date(sql)
+    psiDeptInBillId=DR_ID
+    psiDeptInOrderNo=order_no
+    if type == 16:
+        # 子表检查
+        check_mcms_psi_dept_batch_in(DR_ID,type,order_no,source_id)
+        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
+                                                 , target_area_code, source_id,source_no, 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
+
+                                                 )
+    elif type == 20:
+        # 子表检查
+        check_mcms_psi_dept_batch_in(DR_ID, type, order_no,source_id)
+        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
+                                                 , target_area_code, source_id,source_no, 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
+
+                                                 )
+    else:
+        # 子表检查
+        check_mcms_psi_dept_batch_in(DR_ID, type, order_no,source_id)
+        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
+                                                 , target_area_code, source_id,source_no, 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
+
+                                                 )
+
+    print('expected', expected)
+    print('aaaaaaaaaaaaaaaaa')
+    actual_value1 = get_process_list2(actual)
+    expected_value1 = get_process_list2(expected)
+    actual_value2 = actual_value1.replace(" ", "")
+    expected_value2 = expected_value1.replace(" ", "")
+    # print('actual_value2',actual_value2)
+    print('expected_value2')
+    print(expected_value2)
+    print('actual_value2')
+    print(actual_value2)
+    print(compare_text_index(actual_value2, expected_value2))
+    if actual_value2 == expected_value2:
+        print('ok')
+        commonFuc().check_text_exist_result_text('succees', 'succees')
+    else:
+        print('error')
+        commonFuc().check_text_exist_result_text('error', 'succees')
 
 try:
     pro_path = commonFuc().get_pro_path2()
@@ -1902,25 +2006,29 @@ try:
         #     check_hdi_distr(int(i))
         #
         # time.sleep(20)
-        # check_accept_order(1)  # 低值
+        #到这里就是验收和中心库自动入库以及中心库出库
+        # check_accept_order(1)  # 低值 验收和自动入库和出库
         # time.sleep(6)
-        # # 上面暂时注释========================================
         # check_mcms_check(1)  # 调用函数检查验收单数据库写值
-
-        check_mcms_psi(1)  # 调用函数检查中心库入库单和出库单数据库写值
-        check_accept_order(2)  # 高值
-        time.sleep(6)
-        # 这里验收后会自动生成出入库单，批次信息，需要同步验证入库单和批次信息
-        check_mcms_check(2)  # 调用函数检查验收单数据库写值
-        check_mcms_psi(2)  # 调用函数检查中心库入库单数据库写值
-        check_accept_order(3)  # 试剂
-        time.sleep(6)
-        check_mcms_check(3)  # 调用函数检查验收单数据库写值
-        check_mcms_psi(3)  # 调用函数检查中心库入库单数据库写值
-
+        # check_mcms_psi(1)  # 调用函数检查中心库入库单和出库单数据库写值
+        # check_accept_order(2)  # 高值 验收和自动入库和出库
+        # time.sleep(6)
+        # # 这里验收后会自动生成出入库单，批次信息，需要同步验证入库单和批次信息
+        # check_mcms_check(2)  # 调用函数检查验收单数据库写值
+        # check_mcms_psi(2)  # 调用函数检查中心库入库单数据库写值
+        # check_accept_order(3)  # 试剂 验收和自动入库和出库
+        # time.sleep(6)
+        # check_mcms_check(3)  # 调用函数检查验收单数据库写值
+        # check_mcms_psi(3)  # 调用函数检查中心库入库单数据库写值
+        # time.sleep(6)
+        # # 上面暂时注释========================================
         # second_dept_one_key_in()
         # second_dept_one_key_in()
         # second_dept_one_key_in()
+        # 检查二级库入库单
+        check_mcms_psi_dept_in(16)
+        check_mcms_psi_dept_in(20)
+        check_mcms_psi_dept_in(66)
     commonFuc().check_text_exist_result_text('succees', 'succees')
 except  Exception as e:
     # 打印错误信息

data/b5_spd3_core_business_flow/message15

 验收单号:
-  CHECK_NO1: CHECKh03472024072500026
-  CHECK_NO2: CHECKh03472024072500026
+  CHECK_NO1: CHECKh03472024072600068
+  CHECK_NO2: CHECKh03472024072600068

data/b6_spd3_core_business_flow_database_check/data

@@ -99,7 +99,7 @@
 "mcms_psi_dept_batch3": '{"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": 1, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0}'
 
 
-#入库单主表
+#科室入库单主表
 "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}'
@@ -117,4 +117,9 @@
 #中心库出库单
 "check_mcms_psi_out1": '{"id": "%s", "order_no": "%s", "bill_mode": "16", "rec_type": "YND", "psi_flag": -1, "psi_kind": "202", "stock_kind": "CK_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": "默认库区", "remark": None, "tb_status": 20, "accounter": None, "account_date": None, "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"}", "reject_time": None, "reject_remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "reject_user": None, "initial_order": None, "source_type": "BD", "reject_reason": None, "receipt_status": 0}'
 "check_mcms_psi_out2": '{"id": "%s", "order_no": "%s", "bill_mode": "20", "rec_type": "YND", "psi_flag": -1, "psi_kind": "202", "stock_kind": "CK_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": "默认库区", "remark": None, "tb_status": 20, "accounter": None, "account_date": None, "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"}", "reject_time": None, "reject_remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "reject_user": None, "initial_order": None, "source_type": "BD", "reject_reason": None, "receipt_status": 0}'
-"check_mcms_psi_out3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": -1, "psi_kind": "202", "stock_kind": "CK_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": "默认库区", "remark": None, "tb_status": 20, "accounter": None, "account_date": None, "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"}", "reject_time": None, "reject_remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "reject_user": None, "initial_order": None, "source_type": "BD", "reject_reason": None, "receipt_status": 0}'
+"check_mcms_psi_out3": '{"id": "%s", "order_no": "%s", "bill_mode": "66", "rec_type": "YND", "psi_flag": -1, "psi_kind": "202", "stock_kind": "CK_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": "默认库区", "remark": None, "tb_status": 20, "accounter": None, "account_date": None, "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"}", "reject_time": None, "reject_remark": None, "create_user": "%s", "create_time": %s, "last_modified": %s, "last_modified_user": "%s", "version": 0, "last_auditor": None, "last_audit_time": None, "reject_user": None, "initial_order": None, "source_type": "BD", "reject_reason": None, "receipt_status": 0}'
\ No newline at end of file
+
+#直送二级库入库单
+"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}'
\ No newline at end of file

main1/main_text.py

@@ -189,31 +189,28 @@ def main_text():
     def flow5_flow18():
         #脚本运行前清空所有待审批数据
         approval_center_all()
-        i=1
-        while True:
-            try:
-                flow5()
-                flow6()
-                flow7()
-                flow8()
-                flow9()
-                flow10()
-                flow11()
-                flow12()
-                flow13()
-                flow14()
-                flow15()
-                flow16()
-                flow17()
-                flow18()
-            except Exception as e:
-                print('第'+str(i)+'次脚本出现异常，请检查脚本或者数据')
-                # print("发生异常：", str(e))
-                # traceback.print_exc()
-                print('第'+str(i)+'次重新运行')
-                continue
-            else:
-                break
+        try:
+            flow5()
+            flow6()
+            flow7()
+            flow8()
+            flow9()
+            flow10()
+            flow11()
+            flow12()
+            flow13()
+            flow14()
+            flow15()
+            flow16()
+            flow17()
+            flow18()
+        except Exception as e:
+            print('脚本出现异常，请检查脚本或者数据')
+            print("发生异常：", str(e))
+            traceback.print_exc()
+
+
+
     def flow11_flow18():
         flow11()
         flow12()