From 39cd07983089adc023dac8e1e80ddde4b143c81e Mon Sep 17 00:00:00 2001 From: xiao-hesheng Date: Fri, 7 Jun 2024 15:36:04 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=8D=81=E4=BA=8C=E8=84=9A?= =?UTF-8?q?=E6=9C=AC=E7=BC=96=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...10\350\200\227\351\200\200\345\272\223.py" | 75 +++++++++++++------ 1 file changed, 54 insertions(+), 21 deletions(-) diff --git "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" index c22e9a62..d2aae319 100644 --- "a/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" +++ "b/air_case/b5_spd3_core_business_flow/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.air/a_b7\346\265\201\347\250\213\345\215\201\345\233\233\351\200\200\345\272\223\344\270\232\345\212\241_\346\266\210\350\200\227\351\200\200\345\272\223.py" @@ -434,7 +434,7 @@ def second_dept_consume_in_Stock(type=1): commonFuc().get_business_data(module, "json_contentType"), token, commonFuc().get_business_data(module, "X-APP-CODE")) - if type==2: + if type == 2: url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_stock_scan_url") print('消耗扫条码,url', url) @@ -501,7 +501,13 @@ def second_dept_consume_in_Stock(type=1): print('消耗退回', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) print('消耗退回,result', result) - elif type==1: + data = commonFuc().analysis_json('data', result) + code = commonFuc().analysis_json('code', result) + if data != None and code == 0: + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + elif type == 1: print('低值耗材消耗退回入库') url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_dept_availablePage_list_url") @@ -509,19 +515,26 @@ def second_dept_consume_in_Stock(type=1): list_a = info['list_a'] pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', list_a) stockId = commonFuc().analysis_json('stockId', list_a) - stockName= commonFuc().analysis_json('stockName', list_a) - areaCode= commonFuc().analysis_json('areaCode', list_a) - areaName= commonFuc().analysis_json('areaName', list_a) + stockName = commonFuc().analysis_json('stockName', list_a) + areaCode = commonFuc().analysis_json('areaCode', list_a) + areaName = commonFuc().analysis_json('areaName', list_a) request_body = commonFuc().get_business_data(module, "payload63", stockId, stockName, - areaCode, areaName,get_hosid()) + areaCode, areaName, get_hosid()) print('低值消耗产品查询', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) print('低值消耗产品查询,result', result) - viewId2 = commonFuc().analysis_json('viewId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - DRh_id = commonFuc().analysis_json('billId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - barcodeId = commonFuc().analysis_json('bottleId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) + viewId2 = commonFuc().analysis_json('viewId', commonFuc().analysis_json('data', + commonFuc().analysis_json('data', + result))) + DRh_id = commonFuc().analysis_json('billId', + commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) + barcodeId = commonFuc().analysis_json('bottleId', commonFuc().analysis_json('data', + commonFuc().analysis_json('data', + result))) + hosGoodsId = commonFuc().analysis_json('hosGoodsId', commonFuc().analysis_json('data', + commonFuc().analysis_json('data', + result))) # 消耗退回 == == == == == == == == == == == == == == == == url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_stock_rtn_submit_url") @@ -533,7 +546,13 @@ def second_dept_consume_in_Stock(type=1): print('低值消耗消耗退回', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) print('低值消耗消耗退回,result', result) - elif type==3: + data = commonFuc().analysis_json('data', result) + code = commonFuc().analysis_json('code', result) + if data != None and code == 0: + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + elif type == 3: print('试剂耗材消耗退回入库') url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "herpService_dept_availablePage_list_url") @@ -541,21 +560,28 @@ def second_dept_consume_in_Stock(type=1): list_a = info['list_a'] pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', list_a) stockId = commonFuc().analysis_json('stockId', list_a) - stockName= commonFuc().analysis_json('stockName', list_a) - areaCode= commonFuc().analysis_json('areaCode', list_a) - areaName= commonFuc().analysis_json('areaName', list_a) + stockName = commonFuc().analysis_json('stockName', list_a) + areaCode = commonFuc().analysis_json('areaCode', list_a) + areaName = commonFuc().analysis_json('areaName', list_a) request_body = commonFuc().get_business_data(module, "payload64", stockId, stockName, - areaCode, areaName,get_hosid()) + areaCode, areaName, get_hosid()) print('试剂耗材消耗退回入库产品查询', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) print('试剂耗材消耗退回入库产品查询,result', result) # import pdb # pdb.set_trace() - viewId2 = commonFuc().analysis_json('viewId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - DRh_id = commonFuc().analysis_json('billId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - barcodeId = commonFuc().analysis_json('bottleId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) + viewId2 = commonFuc().analysis_json('viewId', commonFuc().analysis_json('data', + commonFuc().analysis_json('data', + result))) + DRh_id = commonFuc().analysis_json('billId', + commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) + barcodeId = commonFuc().analysis_json('bottleId', commonFuc().analysis_json('data', + commonFuc().analysis_json('data', + result))) + hosGoodsId = commonFuc().analysis_json('hosGoodsId', commonFuc().analysis_json('data', + commonFuc().analysis_json('data', + result))) # 消耗退回 == == == == == == == == == == == == == == == == url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, "dept_stock_rtn_submit_url") @@ -567,6 +593,13 @@ def second_dept_consume_in_Stock(type=1): print('试剂耗材消耗退回', 'request_body', request_body) result = commonFuc().http_post(url, request_body, headers) print('试剂耗材消耗退回,result', result) + data=commonFuc().analysis_json('data',result) + code=commonFuc().analysis_json('code',result) + if data!=None and code==0: + commonFuc().check_text_exist_result_text('succees', 'succees') + else: + commonFuc().check_text_exist_result_text('error', 'succees') + try: updateUserLoginDefaultRange(get_listUserMgrRangePage1(2)) # 设置登录账号默认权限是二级库 @@ -575,9 +608,9 @@ try: second_dept_consume_Out_Stock(2) # 高值消耗出库 second_dept_consume_in_Stock(2) # 高值消耗退货入库 second_dept_consume_Out_Stock(1) # 低值消耗出库 - second_dept_consume_in_Stock(1) # 低值消耗退回入库 + second_dept_consume_in_Stock(1) # 低值消耗退回入库 second_dept_consume_Out_Stock(3) # 试剂消耗出库 - second_dept_consume_in_Stock(3) #试剂消耗退回入库 + second_dept_consume_in_Stock(3) # 试剂消耗退回入库 commonFuc().check_text_exist_result_text('succees', 'succees') except: commonFuc().check_text_exist_result_text('error', '1') -- GitLab