diff --git a/jikimo_work_reporting_api/controllers/main.py b/jikimo_work_reporting_api/controllers/main.py index 76b55dc9..04535be0 100644 --- a/jikimo_work_reporting_api/controllers/main.py +++ b/jikimo_work_reporting_api/controllers/main.py @@ -5,7 +5,7 @@ from odoo.addons.sf_machine_connect.models.ftp_operate import transfer_nc_files class MainController(http.Controller): - @http.route('/api/manual_download_program', type='json', methods=['POST'], auth='wechat_token', cors='*') + @http.route('/api/manual_download_program', type='json', methods=['POST'], auth='public', cors='*') def manual_download_program(self): """ 人工线下加工传输编程文件 @@ -18,6 +18,11 @@ class MainController(http.Controller): maintenance_equipment = request.env['maintenance.equipment'].sudo().search([('name', '=', maintenance_equipment_name)], limit=1) if not maintenance_equipment: return {'code': 400, 'message': '机床不存在'} + # 获取刀具组 + tool_groups_id = request.env['sf.tool.groups'].sudo().search([('equipment_ids', 'in', maintenance_equipment.id)], limit=1) + if not tool_groups_id: + return {'code': 400, 'message': '刀具组不存在'} + ftp_resconfig = request.env['res.config.settings'].sudo().get_values() source_ftp_info = { 'host': ftp_resconfig['ftp_host'], @@ -36,7 +41,8 @@ class MainController(http.Controller): source_ftp_info, target_ftp_info, '/' + str(model_id), - '/home/jikimo/testdir'): + '/home/jikimo/testdir', + end_with=tool_groups_id.name + '-all.nc'): return {'code': 200, 'message': 'success'} else: return {'code': 500, 'message': '传输失败'} diff --git a/sf_machine_connect/models/ftp_operate.py b/sf_machine_connect/models/ftp_operate.py index 6cc29c74..89e4006d 100644 --- a/sf_machine_connect/models/ftp_operate.py +++ b/sf_machine_connect/models/ftp_operate.py @@ -132,9 +132,9 @@ class FtpController: -def transfer_nc_files(source_ftp_info, target_ftp_info, source_dir, target_dir, keep_dir=False): +def transfer_nc_files(source_ftp_info, target_ftp_info, source_dir, target_dir, end_with='.nc', keep_dir=False): """ - 从源FTP服务器下载所有.nc文件并上传到目标FTP服务器,保持目录结构 + 从源FTP服务器下载所有{end_with}结尾的文件并上传到目标FTP服务器,保持目录结构 Args: source_ftp_info: dict, 源FTP连接信息 {host, port, username, password} @@ -184,7 +184,7 @@ def transfer_nc_files(source_ftp_info, target_ftp_info, source_dir, target_dir, source_ftp.ftp.cwd('..') except: # 如果是.nc文件则传输 - if item.lower().endswith('.nc'): + if item.lower().endswith(end_with): # 下载到临时文件 temp_path = f"/tmp/{item}" with open(temp_path, 'wb') as f: diff --git a/sf_manufacturing/models/workorder_printer.py b/sf_manufacturing/models/workorder_printer.py index 46eb3b8b..902f0394 100644 --- a/sf_manufacturing/models/workorder_printer.py +++ b/sf_manufacturing/models/workorder_printer.py @@ -14,95 +14,7 @@ _logger = logging.getLogger(__name__) class MrpWorkorder(models.Model): _name = 'mrp.workorder' - _inherit = ['mrp.workorder', 'printing.utils'] - - def print_pdf(self, printer_config, pdf_data): - """跨平台打印函数，支持网络打印机(IP:端口)""" - # 将PDF数据保存到临时文件 - with tempfile.NamedTemporaryFile(delete=False, suffix='.pdf') as temp_file: - pdf_binary = base64.b64decode(pdf_data) - temp_file.write(pdf_binary) - temp_file_path = temp_file.name - - _logger.info(f"开始打印PDF文件: {temp_file_path}") - - try: - # 获取打印机名称或IP地址 - printer_name = printer_config.printer_id.name - if not printer_name: - raise UserError('打印机名称未配置') - - # 使用打印机配置中的IP地址和端口 - printer_ip = printer_config.printer_id.ip_address - printer_port = printer_config.printer_id.port - _logger.info(f"使用网络打印机: IP={printer_ip}, 端口={printer_port}") - - if platform.system() == 'Windows': - _logger.info(f"Windows环境不支持网络打印机") - else: # Linux环境 - # try: - # import cups - - # # 处理网络打印机情况 - # _logger.info(f"Linux环境下连接网络打印机: {printer_ip}:{printer_port}") - - # # 创建连接 - # conn = cups.Connection() - - # # 检查打印机是否已经添加到系统 - # printers = conn.getPrinters() - # _logger.info(f"可用打印机列表: {list(printers.keys())}") - - # network_printer_name = f"IP_{printer_ip}_{printer_port}" - - # # 如果打印机不存在，尝试添加 - # if network_printer_name not in printers: - # _logger.info(f"添加网络打印机: {network_printer_name}") - # conn.addPrinter( - # network_printer_name, - # device=f"socket://{printer_ip}:{printer_port}", - # info=f"Network Printer {printer_ip}:{printer_port}", - # location="Network" - # ) - # # 设置打印机为启用状态 - # conn.enablePrinter(network_printer_name) - # _logger.info(f"网络打印机添加成功: {network_printer_name}") - - # # 打印文件 - # _logger.info(f"开始打印到网络打印机: {network_printer_name}") - # job_id = conn.printFile(network_printer_name, temp_file_path, "工单打印", {}) - # _logger.info(f"打印作业ID: {job_id}") - - - # except ImportError as ie: - # _logger.error(f"导入CUPS库失败: {str(ie)}") - - # 尝试使用lp命令打印 - try: - _logger.info("尝试使用lp命令打印...") - - # 使用socket设置打印 - cmd = f"lp -h {printer_ip}:{printer_port} -d {printer_name} {temp_file_path}" - - _logger.info(f"执行lp打印命令: {cmd}") - result = subprocess.run(cmd, shell=True, check=True, capture_output=True) - _logger.info(f"lp打印结果: {result.stdout.decode()}") - except Exception as e: - _logger.error(f"lp命令打印失败: {str(e)}") - raise UserError(f'打印失败，请安装cups打印库: pip install pycups 或确保lp命令可用') - - return True - except Exception as e: - _logger.error(f"打印失败详细信息: {str(e)}") - raise UserError(f'打印失败: {str(e)}') - finally: - # 清理临时文件 - if os.path.exists(temp_file_path): - try: - os.unlink(temp_file_path) - _logger.info(f"临时文件已清理: {temp_file_path}") - except Exception as e: - _logger.error(f"清理临时文件失败: {str(e)}") + _inherit = ['mrp.workorder'] def _compute_state(self): super(MrpWorkorder, self)._compute_state() @@ -111,21 +23,18 @@ class MrpWorkorder(models.Model): for wo in work_ids: if wo.state == 'ready' and not wo.production_id.product_id.is_print_program: # 触发打印程序 - pdf_data = self.processing_drawing - try: - if pdf_data: - # 获取默认打印机配置 - printer_config = self.env['printer.configuration'].sudo().search([('model', '=', self._name), ('printer_id.type', '=', 'normal')], limit=1) - if not printer_config: - raise UserError('请先配置打印机') - + pdf_data = workorder.processing_drawing + if pdf_data: + try: # 执行打印 - if self.print_pdf(printer_config, pdf_data): - wo.production_id.product_id.is_print_program = True - _logger.info(f"工单 {wo.name} 的PDF已成功打印") - - except Exception as e: - _logger.error(f'打印配置错误: {str(e)}') + printer = self.env['printing.printer'].get_default() + printer.print_document(report=None, content = pdf_data, doc_format='pdf') + + wo.production_id.product_id.is_print_program = True + _logger.info(f"工单 {wo.name} 的PDF已成功打印") + + except Exception as e: + _logger.error(f"工单 {wo.name} 的PDF打印失败: {str(e)}") class ProductTemplate(models.Model): _inherit = 'product.template'