diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py index 78a0c05a..08021b5f 100644 --- a/sf_mrs_connect/controllers/controllers.py +++ b/sf_mrs_connect/controllers/controllers.py @@ -47,28 +47,31 @@ class Sf_Mrs_Connect(http.Controller): # if ret['glb_file']: # cnc_production.glb_file = base64.b64encode(ret['glb_file']) # 拉取所有加工面的程序文件 - if is_delete_file is True: - program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', 'R') - files_r = os.listdir(program_path_tmp_r) - if files_r: - for file_name in files_r: - file_path = os.path.join(program_path_tmp_r, file_name) - os.remove(file_path) - for r in ret['processing_panel']: - download_state = request.env['sf.cnc.processing'].with_user( - request.env.ref("base.user_admin")).download_file_tmp( - ret['folder_name'], r) - if download_state == 0: - res['status'] = -2 - res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name) - return json.JSONEncoder().encode(res) + # for r in ret['processing_panel'].split(','): + # if is_delete_file is True: + # program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r) + # files_r = os.listdir(program_path_tmp_r) + # if files_r: + # for file_name in files_r: + # file_path = os.path.join(program_path_tmp_r, file_name) + # os.remove(file_path) + # download_state = request.env['sf.cnc.processing'].with_user( + # request.env.ref("base.user_admin")).download_file_tmp( + # ret['folder_name'], r) + # if download_state == 0: + # res['status'] = -2 + # res['message'] = '制造订单号为%s的CNC程序文件从FTP拉取失败' % (cnc_production.name) + # return json.JSONEncoder().encode(res) logging.info('创建cnc工单') - program_path_tmp = os.path.join('/tmp', ret['folder_name'], 'return', r) - # program_path_tmp = "C://Users//43484//Desktop//机企猫工作文档//其他//model_analysis" - files = os.listdir(program_path_tmp) cnc_processing_arr = [] - for f in files: - program_path = os.path.join(program_path_tmp, f) + cmm_program_arr = [] + for panel in ret['processing_panel'].split(','): + program_path_tmp = os.path.join('/tmp', ret['folder_name'], 'return', panel) + # program_path_tmp = "C://Users//43484//Desktop//机企猫工作文档//其他//model_analysis" + files = os.listdir(program_path_tmp) + cnc_processing_arr = [] + for f in files: + program_path = os.path.join(program_path_tmp, f) logging.info('cnc程序路径 :%s' % program_path) if f.endswith(".doc"): # 插入cmm程序数据