diff --git "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py" "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py" index e64fb3b3240aa8b16431d01b1d87cd2c912327dd..4e4b485438cebbfc414d4bcf861902591310aa7b 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.air/a_b4\346\265\201\347\250\213\345\215\201\344\270\200\350\257\267\351\242\206\344\270\232\345\212\241\346\265\201_\344\272\214\347\272\247\345\272\223\345\220\221\347\233\264\351\200\201.py" @@ -752,20 +752,21 @@ def check_accept_order(type=1): break # ==============================查看订单详情================== # ========设置验收全部合格 - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_barcode_save_url") - print('check_barcode_save_url', url) + url2 = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "check_barcode_save_url") + print('check_barcode_save_url', url2) sourceBillId = sourceId - request_body = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId) + request_body2 = commonFuc().get_business_data(module, "payload2", sourceBillId, viewId) - print('设置验收全部合格request_body', request_body) + print('设置验收全部合格request_body2', request_body2) # 发送请求 time.sleep(6) while True: - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - data = commonFuc().analysis_json('data', result) - code = commonFuc().analysis_json('code', result) + result2 = commonFuc().http_post(url2, request_body2, headers) + print('result', result2) + data = commonFuc().analysis_json('data', result2) + code = commonFuc().analysis_json('code', result2) + msg= commonFuc().analysis_json('msg', result2) print(code) if code == 0 and len(data) >= 1: break @@ -800,8 +801,23 @@ def check_accept_order(type=1): print('result', result) CHECK_NO = commonFuc().analysis_json('data', result) code = commonFuc().analysis_json('code', result) + msg = commonFuc().analysis_json('msg', result) if code == 0: break + elif code == 14031083 and "不允许验收" in msg: + result2 = commonFuc().http_post(url2, request_body2, headers) + print('result', result2) + data = commonFuc().analysis_json('data', result2) + code = commonFuc().analysis_json('code', result2) + print(code) + if code == 0 and len(data) >= 1: + break + else: + print('设置产品合格出现问题') + time.sleep(6) + continue + + info = (CHECK_NO, CHECK_NO) titlename = ('CHECK_NO1', 'CHECK_NO2') @@ -839,11 +855,11 @@ def main(): check_accept_order(1) # 低值 check_accept_order(2) # 高值 check_accept_order(3) # 试剂 - second_dept_one_key_in() - second_dept_one_key_in() - second_dept_one_key_in() + second_dept_one_key_in(2) + second_dept_one_key_in(2) + second_dept_one_key_in(2) commonFuc().check_text_exist_result_text('succees', 'succees') print('==========================流程十一结束==============================') except: commonFuc().check_text_exist_result_text('error', '1') -# main() \ No newline at end of file +main() \ No newline at end of file diff --git a/air_case/public1/public1/public1.py b/air_case/public1/public1/public1.py index 3c48babe0b26860e9496f8e4285ef54dcdf9bbd2..e9250cc7056b89eb2035ce0aabfd18b458efe2e6 100644 --- a/air_case/public1/public1/public1.py +++ b/air_case/public1/public1/public1.py @@ -3058,6 +3058,14 @@ def second_dept_one_key_in(type=2): # # # # 发送请求 result = commonFuc().http_post(url, request_body, headers) print('result', result) + while True: + result = commonFuc().http_post(url, request_body, headers) + total = commonFuc().analysis_json('total', commonFuc().analysis_json('data', result)) + if total>=1: + break + else: + continue + deptid = commonFuc().analysis_json('deptId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) sourceId = commonFuc().analysis_json('sourceId', diff --git a/runner.py b/runner.py index b4f6a71715df825d64a35439418e2315b532752a..d43890ad5bc8bb26f4cd1a2744e8ae8faef64700 100644 --- a/runner.py +++ b/runner.py @@ -98,7 +98,7 @@ if __name__ == '__main__': delData().Delete_branch_by_id() delData().Delete_goods_change_info() delData().Delete_probeInfo_other() - # delData().Del_supply_relation() + delData().Del_supply_relation() delData().Delete_business_Data() delData().Del_reporter_data() delData().Delete_business_Data_All()