From 306d6f13a9763841cdd8ab14d6fa134f2738731e Mon Sep 17 00:00:00 2001 From: xiao-hesheng <xhs89@sina.com> Date: Fri, 6 Sep 2024 09:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=85=AB=E8=84=9A=E6=9C=AC?= =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...56\345\272\223\351\252\214\350\257\201.py" | 312 +----------------- 1 file changed, 10 insertions(+), 302 deletions(-) diff --git "a/air_case/b6_spd3_core_business_flow_database_check/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" "b/air_case/b6_spd3_core_business_flow_database_check/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" index b4402c39..90c2683a 100644 --- "a/air_case/b6_spd3_core_business_flow_database_check/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" +++ "b/air_case/b6_spd3_core_business_flow_database_check/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.air/a_b1\346\265\201\347\250\213\345\205\253_\351\253\230\345\200\274\350\267\237\345\217\260\344\270\232\345\212\241\346\265\201\347\250\213_\346\225\260\346\215\256\345\272\223\351\252\214\350\257\201.py" @@ -19,309 +19,14 @@ python runner_test.py tag id2303-11 debug mdm3 """ -def operationApply(): # 楂樺€艰窡鍙扮敵璇� - module = "b5_spd3_core_business_flow" - # # 鐧诲綍鑾峰彇鐢ㄦ埛id绛変俊鎭紝浣跨敤鍒涘缓鐨勭敤鎴风櫥褰�===========寮€濮� - info = FileUtils().r_info8('b2_herp3_bs', "鐢ㄦ埛鍚嶄俊鎭�", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 鑾峰彇token鍜宲rojectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 鐧诲綍鑾峰彇鐢ㄦ埛id绛変俊鎭紝浣跨敤鍒涘缓鐨勭敤鎴风櫥褰�============缁撴潫 - # 璺熷彴鎵嬫湳鐢宠,鍒楄〃鏌ヨ========= - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_operationApply_listPage_url") - print('璺熷彴鎵嬫湳鐢宠,鍒楄〃鏌ヨurl', url) - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) - request_body = commonFuc().get_business_data(module, "payload22", corpId, corpId) - print('request_body', '璺熷彴鎵嬫湳鐢宠', request_body) - # # # # 鍙戦€佽姹� - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - # 璺熷彴鎵嬫湳鐢宠,鍒楄〃鏌ヨ============= - # 璺熷彴鎵嬫湳鐢宠鎻愪氦=========================================== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_operationApply_submit_url") - print('url', url) - stockAreaId = get_stockAreaId_new(FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹d", 'message6')['deptid2'], - FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹ame", 'message6')['deptid2'], 2) - expireDate = timeUtils().get_time_add(1, 2) - operDate = timeUtils().get_time_add(1, 2) - # 浠庢枃浠朵腑鑾峰彇蹇呰淇℃伅 - info = FileUtils().r_info8(module, "浜у搧淇℃伅", 'message19') - # print('info', info) - list_a = info['list_a'] - print('list_a', type(list_a), len(list_a)) - provId = commonFuc().analysis_json('provId', list_a) - provCode = provId - provName = commonFuc().analysis_json('provName', list_a) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', list_a) - hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', list_a) - subProvId = commonFuc().analysis_json('subProvId', list_a) - subProvName = commonFuc().analysis_json('subProvName', list_a) - goodsName = commonFuc().analysis_json('goodsName', list_a) - goodsSpec = commonFuc().analysis_json('goodsSpec', list_a) - goodsMfrsId = commonFuc().analysis_json('goodsMfrsId', list_a) - goodsMfrsName = commonFuc().analysis_json('goodsMfrsName', list_a) - unit = commonFuc().analysis_json('unit', list_a) - price = commonFuc().analysis_json('price', list_a) - request_body = commonFuc().get_business_data(module, "payload24", stockAreaId, expireDate, operDate, provId, - provCode, provName, hosGoodsId, hosGoodsCode, provId, subProvId, - subProvName, goodsName, goodsSpec, goodsMfrsId, goodsMfrsName, unit, - price) - result = commonFuc().http_post(url, request_body, headers) - print('璺熷彴鎵嬫湳鐢宠鎻愪氦result', result) - # 璺熷彴鎵嬫湳鐢宠鎻愪氦================================================= - - -def second_dept_in_warehouse(): - # updateUserLoginDefaultRange(get_listUserMgrRangePage(2)) # 璁剧疆鐧诲綍璐﹀彿榛樿鏉冮檺鏄簩绾у簱 - module = "b5_spd3_core_business_flow" - # # 鐧诲綍鑾峰彇鐢ㄦ埛id绛変俊鎭紝浣跨敤鍒涘缓鐨勭敤鎴风櫥褰�===========寮€濮� - info = FileUtils().r_info8('b2_herp3_bs', "鐢ㄦ埛鍚嶄俊鎭�", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 鑾峰彇token鍜宲rojectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 鐧诲綍鑾峰彇鐢ㄦ埛id绛変俊鎭紝浣跨敤鍒涘缓鐨勭敤鎴风櫥褰�============缁撴潫 - # 绉戝鍏ュ簱,鍒楄〃鏌ヨ========= - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_in_page_url") - print('绉戝鍏ュ簱,鍒楄〃鏌ヨurl', url) - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) - request_body = commonFuc().get_business_data(module, "payload28", get_branch_id(), get_hosid()) - print('request_body', '璺熷彴鎵嬫湳鐢宠', request_body) - - # # # # 鍙戦€佽姹� - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - deptid = commonFuc().analysis_json('deptId', - commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - sourceId = commonFuc().analysis_json('sourceId', - commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - sourceType = commonFuc().analysis_json('sourceType', - commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - billMode = commonFuc().analysis_json('billMode', - commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - deptName = commonFuc().analysis_json('deptName', - commonFuc().analysis_json('data', commonFuc().analysis_json('data', result))) - - # 绉戝鍏ュ簱,鍒楄〃鏌ヨ========================================================== - # 绉戝鍏ュ簱椤甸潰鑾峰彇搴撳尯淇℃伅================================================= - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stockUser_queryStockShelfList_url") - print('绉戝鍏ュ簱椤甸潰鑾峰彇搴撳尯淇℃伅,url', url) - request_body = commonFuc().get_business_data(module, "payload29", deptid, uxid) - print('request_body', '绉戝鍏ュ簱椤甸潰鑾峰彇搴撳尯淇℃伅', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('绉戝鍏ュ簱椤甸潰鑾峰彇搴撳尯淇℃伅result', result) - data = commonFuc().analysis_json('data', result) - areaCode = commonFuc().analysis_json('areaCode', data) - areaName = commonFuc().analysis_json('areaName', data) - # 绉戝鍏ュ簱椤甸潰鑾峰彇搴撳尯淇℃伅================================================= - - # 绉戝鍏ュ簱椤甸潰鑾峰彇鍗曟嵁璇︾粏淇℃伅================================================= - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_in_detail_url") - print('绉戝鍏ュ簱椤甸潰鑾峰彇鍗曟嵁璇︾粏淇℃伅,url', url) - targetAreaCode = areaCode - request_body = commonFuc().get_business_data(module, "payload30", deptid, targetAreaCode, get_hosid(), sourceId, - sourceType, billMode) - print('request_body', '绉戝鍏ュ簱椤甸潰鑾峰彇鍗曟嵁璇︾粏淇℃伅', request_body) - - # # # # 鍙戦€佽姹� - result = commonFuc().http_post(url, request_body, headers) - print('result', result) - data = commonFuc().analysis_json('data', result) - viewId = commonFuc().analysis_json('viewId', data) - shelfCode = commonFuc().analysis_json('shelfCode', data) - # 绉戝鍏ュ簱椤甸潰鑾峰彇鍗曟嵁璇︾粏淇℃伅==================================================== - # 涓€閿叆搴�==================================================== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_in_submit_url") - print('涓€閿叆搴�,url', url) - targetAreaCode = areaCode - targetAreaName = areaName - request_body = commonFuc().get_business_data(module, "payload31", viewId, shelfCode, sourceId, - sourceType, deptid, deptName, targetAreaCode, targetAreaName) - print('request_body', '涓€閿叆搴�', request_body) - - # # # # 鍙戦€佽姹� - result = commonFuc().http_post(url, request_body, headers) - print('涓€閿叆搴搑esult', result) - # 涓€閿叆搴�==================================================== - # 鏉$爜搴撳瓨鏌ヨ================================================= - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_barcode_page_url") - print('鏉$爜搴撳瓨鏌ヨ,url', url) - - request_body = commonFuc().get_business_data(module, "payload32", get_branch_id(), deptid) - print('request_body', '鏉$爜搴撳瓨鏌ヨ', request_body) - - # # # # 鍙戦€佽姹� - result = commonFuc().http_post(url, request_body, headers) - print('鏉$爜搴撳瓨鏌ヨresult', result) - # 鏉$爜搴撳瓨鏌ヨ================================================= - # # 灏嗕簩绾у簱搴撳瓨鏉$爜淇℃伅鍐欏叆鏂囦欢 - data = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) - data1 = [] - for i in data: - lockStatus = commonFuc().analysis_json('lockStatus', i) - if lockStatus == 0: - data1 = i - break - list_a = [] - list_b = [] - list_c = [] - list_a.append(data1) - list_b.append(data1) - list_c.append(data1) - # print('list_a', len(list_a), list_a) - info = (list_a, list_b, list_c) - titlename = ('list_a', 'list_b', 'list_c') - # 灏嗘潯鐮佷俊鎭啓鍏ユ枃浠� - FileUtils().w_info8(info, module, '浜岀骇搴撴潯鐮佷俊鎭�', titlename, 'message20') - # # 灏嗕簩绾у簱搴撳瓨鏉$爜淇℃伅鍐欏叆鏂囦欢================================================= - # 璺熷彴娑堣€楁彁浜�================================ - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_out_submit_url") - print('璺熷彴娑堣€楁彁浜�,url', url) - chargeDeptId = deptid - operDate = timeUtils().get_time_add(3, 2) - info = FileUtils().r_info8('b5_spd3_core_business_flow', "浜岀骇搴撴潯鐮佷俊鎭�", 'message20') - list_a = info['list_a'] - stockId = commonFuc().analysis_json('stockId', list_a) - sourceType = 'CK_XH' - pickType = 'KS_XH' - barCodeList_id = commonFuc().analysis_json('id', list_a) - hosGoodsId = commonFuc().analysis_json('hosGoodsId', list_a) - info = FileUtils().r_info8('b5_spd3_core_business_flow', "閰嶉€佽鍗曡缁嗕俊鎭�2", 'message9') - list22 = info['list_a'] - mdmGoodsCode = commonFuc().analysis_json('spdGoodsCode', list22) - goodsCode = commonFuc().analysis_json('goodsCode', list_a) - batchCode = commonFuc().analysis_json('batchCode', list_a) - productDate = commonFuc().analysis_json('productDate', list_a) - expdtDate = commonFuc().analysis_json('expdtDate', list_a) - purMode = commonFuc().analysis_json('purMode', list_a) - pkgCodeSee = commonFuc().analysis_json('pkgCodeSee', list_a) - recDeptName = commonFuc().analysis_json('recDeptName', list_a) - request_body = commonFuc().get_business_data(module, "payload33", areaCode, areaName, deptid, stockId, get_hosid(), - sourceType, pickType, chargeDeptId, operDate, pickType, areaCode, - areaName, deptid, stockId, get_hosid(), get_branch_id(), - barCodeList_id, hosGoodsId, mdmGoodsCode, goodsCode, batchCode, - productDate, expdtDate, purMode, shelfCode) - print('request_body', '璺熷彴娑堣€楁彁浜�', request_body) - - # # # # 鍙戦€佽姹� - result = commonFuc().http_post(url, request_body, headers) - print('璺熷彴娑堣€楁彁浜�,result', result) - DRh_id = ' '.join(commonFuc().analysis_json('data', result)) - # 璺熷彴娑堣€楁彁浜�================================ - # 璺熷彴娑堣€楁壂鏉$爜== == == == == == == == == == == == == == == == - - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_scan_url") - print('璺熷彴娑堣€楁壂鏉$爜,url', url) - stockName = recDeptName - request_body = commonFuc().get_business_data(module, "payload34", pkgCodeSee, stockId, stockName, - areaCode, areaName) - print('璺熷彴娑堣€楁壂鏉$爜', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('璺熷彴娑堣€楁壂鏉$爜,result', result) - viewId2 = commonFuc().analysis_json('id', commonFuc().analysis_json('data', result)) - # 璺熷彴娑堣€楁壂鏉$爜 == == == == == == == == == == == == == == == == - # 璺熷彴娑堣€楅€€鍥� == == == == == == == == == == == == == == == == - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_stock_rtn_submit_url") - print('璺熷彴娑堣€楅€€鍥�,url', url) - billMode = '20' - request_body = commonFuc().get_business_data(module, "payload35", viewId2, hosGoodsId, DRh_id, - barCodeList_id, billMode, deptid, targetAreaCode, targetAreaName) - print('璺熷彴娑堣€楅€€鍥�', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('璺熷彴娑堣€楅€€鍥�,result', result) - # 璺熷彴娑堣€楅€€鍥� == == == == == == == == == == == == == == == == - # 璺熷彴浣跨敤纭鈥斺€旇窡鍙伴€€璐�== == == == == == == == == == == == == == == == - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "dept_herpService_operationConfirm_submit_url") - print('鍙颁娇鐢ㄧ‘璁も€斺€旇窡鍙伴€€璐�,url', url) - info = FileUtils().r_info8('b5_spd3_core_business_flow', "浜岀骇搴撴潯鐮佷俊鎭�", 'message20') - list_a = info['list_a'] - extInfo = commonFuc().analysis_json('extInfo', list_a) - distrOrderNo = reGetString(extInfo, r'distrBillId": "', r'", ') - print('distrOrderNo', distrOrderNo) - provId = commonFuc().analysis_json('provId', list_a) - provName = commonFuc().analysis_json('provName', list_a) - hosGoodsCode = commonFuc().analysis_json('hosGoodsCode', list_a) - goodsName = commonFuc().analysis_json('goodsName', list_a) - goodsSpec = commonFuc().analysis_json('goodsSpec', list_a) - unit = commonFuc().analysis_json('unit', list_a) - qty = commonFuc().analysis_json('qty', list_a) - request_body = commonFuc().get_business_data(module, "payload36", areaCode, areaName, viewId2, distrOrderNo, provId, - provName, pkgCodeSee, hosGoodsId, hosGoodsCode, goodsName, goodsSpec, - unit, batchCode, productDate, expdtDate, qty, stockId, shelfCode) - print('鍙颁娇鐢ㄧ‘璁も€斺€旇窡鍙伴€€璐�', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('鍙颁娇鐢ㄧ‘璁も€斺€旇窡鍙伴€€璐�,result', result) - - # 璺熷彴浣跨敤纭鈥斺€旇窡鍙伴€€璐�== == == == == == == == == == == == == == == == - - -def out_return_gt(): - module = "b5_spd3_core_business_flow" - # # 鐧诲綍鑾峰彇鐢ㄦ埛id绛変俊鎭紝浣跨敤鍒涘缓鐨勭敤鎴风櫥褰�===========寮€濮� - info = FileUtils().r_info8('b2_herp3_bs', "鐢ㄦ埛鍚嶄俊鎭�", 'message3') - username = info['username1'] - password = commonFuc().get_business_data("b2_herp3_bs", "password") - print('username,password', username, password) - # # 鑾峰彇token鍜宲rojectCode - token, projectCode, uxid, corpId, info = login(username, password, 2) - # 鐧诲綍鑾峰彇鐢ㄦ埛id绛変俊鎭紝浣跨敤鍒涘缓鐨勭敤鎴风櫥褰�============缁撴潫 - # 璺熷彴閫€璐у嚭搴撳垪琛ㄦ煡璇⑩€斺€斾腑蹇冨簱================= - headers = commonFuc().get_business_data(module, "json_headers2", - commonFuc().get_business_data(module, "json_contentType"), token, - commonFuc().get_business_data(module, "X-APP-CODE")) - - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_out_return_gt_url") - print('璺熷彴閫€璐у嚭搴撳垪琛ㄦ煡璇⑩€斺€斾腑蹇冨簱=================', url) - request_body = commonFuc().get_business_data(module, "payload37", get_branch_id()) - print('璺熷彴閫€璐у嚭搴撳垪琛ㄦ煡璇⑩€斺€斾腑蹇冨簱', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('璺熷彴閫€璐у嚭搴撳垪琛ㄦ煡璇⑩€斺€斾腑蹇冨簱,result', result) - data1 = commonFuc().analysis_json('data', commonFuc().analysis_json('data', result)) - DR_Id = 'DR_Id' - for i in data1: - status = commonFuc().analysis_json('status', i) - if status == '寰呭鐞�': - DR_Id = commonFuc().analysis_json('id', i) - break - try: - print('DR_Id', DR_Id) - except: - print('鏃犲緟澶勭悊鏁版嵁') - # 璺熷彴閫€璐у嚭搴撳垪琛ㄦ煡璇⑩€斺€斾腑蹇冨簱================== - # 璺熷彴閫€璐у嚭搴撶‘璁�======================== - url = commonFuc().get_api_add_port_url() + commonFuc().get_business_data(module, - "herpService_out_return_confirm_url") - print('#璺熷彴閫€璐у嚭搴撶‘璁も€斺€斾腑蹇冨簱=================', url) - deptid1 = FileUtils().r_info8("b2_herp3_bs", "鎵€鏈夌瀹d", 'message6')['deptid1'] - request_body = commonFuc().get_business_data(module, "payload38", DR_Id, deptid1) - print('璺熷彴閫€璐у嚭搴撶‘璁も€斺€斾腑蹇冨簱', 'request_body', request_body) - result = commonFuc().http_post(url, request_body, headers) - print('璺熷彴閫€璐у嚭搴撶‘璁も€斺€斾腑蹇冨簱==,result', result) - - -# 璺熷彴閫€璐у嚭搴撶‘璁�======================== +pro_path = commonFuc().get_pro_path2() +print('pro_path', pro_path) +sys.path.append(pro_path + r'/air_case/b5_spd3_core_business_flow/a_b1娴佺▼鍏玙楂樺€艰窡鍙颁笟鍔℃祦绋�.air') +using(pro_path + r'//air_case/b5_spd3_core_business_flow/a_b1娴佺▼鍏玙楂樺€艰窡鍙颁笟鍔℃祦绋�.air') +from a_b1娴佺▼鍏玙楂樺€艰窡鍙颁笟鍔℃祦绋� import operationApply,second_dept_in_warehouse,out_return_gt try: set_dept_lead() # 璁剧疆浜岀骇绉戝璐熻矗浜� # # # # 璁剧疆榛樿绉戝,鍒囨崲鍒颁簩绾х瀹�,浣跨敤绉戝绠$悊鍔熻兘 @@ -342,5 +47,8 @@ try: updateUserLoginDefaultRange(get_listUserMgrRangePage(1)) # 璁剧疆鐧诲綍璐﹀彿榛樿鏉冮檺鏄腑蹇冨簱 out_return_gt() # 璺熷彴閫€璐у嚭搴揰涓績搴撳鐞� commonFuc().check_text_exist_result_text('succees', 'succees') -except: - commonFuc().check_text_exist_result_text('error', '1') +except Exception as e: + # 鎵撳嵃閿欒淇℃伅 + print(f"鍙戠敓閿欒: {e}") + commonFuc().check_text_exist_result_text('error', 'succees') + -- GitLab