优化文件内容

sf_manufacturing/models/mrp_workorder.py

@@ -4,6 +4,7 @@ import math
 import requests
 import logging
 import base64
+# import subprocess
 from datetime import datetime
 from dateutil.relativedelta import relativedelta
 from odoo import api, fields, models, SUPERUSER_ID, _
@@ -13,7 +14,6 @@ from odoo.exceptions import UserError
 from odoo.addons.sf_mrs_connect.models.ftp_operate import FtpController
 
 
-
 class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
     _order = 'sequence'
@@ -29,6 +29,8 @@ class ResMrpWorkOrder(models.Model):
         ('后置三元质量检测', '后置三元质量检测'),
         ('解除装夹', '解除装夹'),
     ], string="工序类型")
+    cnc_worksheet = fields.Binary(
+        '工作指令', readonly=True)
     material_center_point = fields.Char(string='配料中心点')
     X1_axis = fields.Float(default=0)
     Y1_axis = fields.Float(default=0)
@@ -337,12 +339,12 @@ class CNCprocessing(models.Model):
     depth_of_processing_z = fields.Char('加工深度(Z)')
     cutting_tool_extension_length = fields.Char('刀具伸出长度')
     cutting_tool_handle_type = fields.Char('刀柄型号')
-    estimated_processing_time = fields.Char('预计加工时间')
+    estimated_processing_time = fields.Datetime('预计加工时间')
     remark = fields.Text('备注')
     workorder_id = fields.Many2one('mrp.workorder', string="工单")
 
     # mrs下发编程单创建CNC加工
-    def CNCprocessing_create(self, obj):
+    def cnc_processing_create(self, obj):
         workorder = self.env['mrp.workorder'].search([('production_id.name', '=', obj['manufacturing_order_no']),
                                                       ('processing_panel', '=', obj['processing_panel']),
                                                       ('routing_type', '=', 'CNC加工')])
@@ -363,6 +365,7 @@ class CNCprocessing(models.Model):
         }
         return self.env['sf.cnc.processing'].create(vals)
 
+    # 创建附件(nc文件)
     def attachment_create(self, name, data):
         attachment = self.env['ir.attachment'].create({
             'datas': base64.b64encode(data),
@@ -372,6 +375,7 @@ class CNCprocessing(models.Model):
         })
         return attachment
 
+    # 将FTP的nc文件下载到临时目录
     def download_file_tmp(self, model_code, processing_panel):
         remotepath = os.path.join('/', model_code, 'return', processing_panel)
         serverdir = os.path.join('/tmp', model_code, 'return', processing_panel)
@@ -379,6 +383,7 @@ class CNCprocessing(models.Model):
         ftp.download_file_tree(remotepath, serverdir)
         return serverdir
 
+    # 将nc文件存到attach的datas里
     def write_file(self, nc_file_path, cnc):
         if os.path.exists(nc_file_path):
             with open(nc_file_path, 'rb') as file:
@@ -389,6 +394,20 @@ class CNCprocessing(models.Model):
         else:
             return False
 
+    # 将nc文件对应的excel清单转为pdf
+    # def to_pdf(self, excel_path, pdf_path):
+    #     """
+    #     需要在linux中下载好libreoffice
+    #     """
+    #     logging.info('pdf_path:%s' % pdf_path)
+    #     logging.info('pdf_path:%s' % excel_path)
+    #     # 注意cmd中的libreoffice要和linux中安装的一致
+    #     cmd = 'soffice --headless --convert-to pdf'.split() + [excel_path] + ['--outdir'] + [pdf_path]
+    #     p = subprocess.Popen(cmd, stderr=subprocess.PIPE, stdout=subprocess.PIPE, bufsize=1)
+    #     # p.wait(timeout=30)  # 停顿30秒等待转化
+    #     # stdout, stderr = p.communicate()
+    #     p.communicate()
+
 
 class SfWorkOrderBarcodes(models.Model):
     """
@@ -402,4 +421,3 @@ class SfWorkOrderBarcodes(models.Model):
         self.tray_code = tray_code.code
         workorder = self.env['mrp.workorder'].browse(self.ids)
         workorder.gettray_auto(barcode)
-