From 62ec721c6919457b9bef9f6978ede811b9a4176c Mon Sep 17 00:00:00 2001 From: yuxianghui <3437689193@qq.com> Date: Tue, 14 May 2024 14:19:44 +0800 Subject: [PATCH] 1 --- sf_manufacturing/models/mrp_workorder.py | 1 + sf_mrs_connect/controllers/controllers.py | 7 +++++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sf_manufacturing/models/mrp_workorder.py b/sf_manufacturing/models/mrp_workorder.py index 87a5a87f..2214696c 100644 --- a/sf_manufacturing/models/mrp_workorder.py +++ b/sf_manufacturing/models/mrp_workorder.py @@ -1040,6 +1040,7 @@ class CNCprocessing(models.Model): # 将FTP的nc文件下载到临时目录 def download_file_tmp(self, production_no, processing_panel): remotepath = os.path.join('/NC', production_no, 'return', processing_panel) + serverdir = os.path.join('/tmp', production_no, 'return', processing_panel) ftp_resconfig = self.env['res.config.settings'].get_values() ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'], ftp_resconfig['ftp_password']) diff --git a/sf_mrs_connect/controllers/controllers.py b/sf_mrs_connect/controllers/controllers.py index 4b45014a..9b1405bb 100644 --- a/sf_mrs_connect/controllers/controllers.py +++ b/sf_mrs_connect/controllers/controllers.py @@ -65,8 +65,11 @@ class Sf_Mrs_Connect(http.Controller): if cnc_program and cnc_processing_arr: logging.info('cnc_processing_arr:%s' % cnc_processing_arr) cnc_program.write({'programming_state': '已编程', 'work_state': '已编程'}) - cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write( - {'cnc_ids': cnc_processing_arr}) + # cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工').write( + # {'cnc_ids': cnc_processing_arr}) + for cnc_item in cnc_program.workorder_ids.filtered(lambda b: b.routing_type == 'CNC加工'): + logging.info('cnc_item:%s' % cnc_item.production_id.name) + cnc_item.write({'cnc_ids': cnc_processing_arr}) cnc_program_ids = [item.id for item in cnc_program] workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search( [('production_id', 'in', cnc_program_ids)])