From 586216fa014de62928df5536e1b27eb32269dbfd Mon Sep 17 00:00:00 2001 From: mgw <1392924357@qq.com> Date: Tue, 27 Feb 2024 17:33:08 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workorder.py | 4 ++-- sf_mrs_connect/models/ftp_operate.py | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 2cb292e1..11c0c2d8 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -693,7 +693,7 @@ class CNCprocessing(models.Model): workorder = self.env['mrp.workorder'].search([('production_id.name', '=', ret['production_order_no']), ('processing_panel', '=', obj['processing_panel']), ('routing_type', '=', 'CNC加工')]) - logging.info('workorder:%s' % workorder.name) + logging.info('workorder:%s' % workorder.id) logging.info('obj:%s' % obj) if obj['program_name'] in program_path: logging.info('obj:%s' % obj['program_name']) @@ -711,7 +711,7 @@ class CNCprocessing(models.Model): 'cutting_tool_handle_type': obj['cutting_tool_handle_type'], 'estimated_processing_time': obj['estimated_processing_time'], 'remark': obj['remark'], - 'program_path': program_path + 'program_path': program_path.replace('/tmp', '') }) cnc_processing.get_cnc_processing_file(program_path_tmp, cnc_processing, program_path) # cnc_workorder.state = 'done' diff --git a/sf_mrs_connect/models/ftp_operate.py b/sf_mrs_connect/models/ftp_operate.py index 1d97e56f..b5150ada 100644 --- a/sf_mrs_connect/models/ftp_operate.py +++ b/sf_mrs_connect/models/ftp_operate.py @@ -29,7 +29,6 @@ class FtpController(): logging.info("进入FTP目录 ") self.ftp.cwd(target_dir) # 切换工作路径 logging.info('FTP目录:%s' % target_dir) - self.ftp.mkd('detection') remotenames = self.ftp.nlst() logging.info('FTP目录文件:%s' % remotenames) for file in remotenames: