优化制造

sf_manufacturing/models/mrp_production.py

@@ -265,6 +265,7 @@ class MrpProduction(models.Model):
     def _create_workorder3(self):
         programming_no = None
         product_id_new = None
+        production_ids = []
         for production in self:
             if not production.bom_id or not production.product_id:
                 continue
@@ -295,6 +296,8 @@ class MrpProduction(models.Model):
                         'state': 'pending',
                     }]
             if production.product_id.categ_id.type == '成品':
+                if production_ids is None:
+                    production_ids.append({production.name})
                 if programming_no is None:
                     production.fetchCNC()
                     programming_no = production.programming_no

sf_manufacturing/models/mrp_workorder.py

@@ -643,10 +643,13 @@ class ResMrpWorkOrder(models.Model):
     def _compute_state(self):
         for workorder in self:
             if workorder.routing_type == '装夹预调':
-                if not workorder.cnc_ids:
+                cnc_workorder = self.search(
+                    [('production_id', '=', workorder.production_id.id), ('routing_type', '=', 'CNC加工')],
+                    limit=1, order='id asc')
+                if not cnc_workorder:
                     workorder.state = 'waiting'
                 else:
-                    for item in workorder.cnc_ids:
+                    for item in cnc_workorder.cnc_ids:
                         functional_cutting_tool = self.env['sf.functional.cutting.tool.entity'].search(
                             [('tool_name_id.name', '=', item.cutting_tool_name)])
                         if not functional_cutting_tool:
@@ -741,12 +744,12 @@ class ResMrpWorkOrder(models.Model):
                 limit=1, order='id asc')
             if not cnc_workorder:
                 raise UserError(_('该制造订单还未下发CNC程序，请稍后再试'))
-            else:
-                for item in cnc_workorder.cnc_ids:
-                    functional_cutting_tool = self.env['sf.functional.cutting.tool.entity'].search(
-                        [('tool_name_id.name', '=', item.cutting_tool_name)])
-                    if not functional_cutting_tool:
-                        raise UserError(_('该制造订单的CNC程序为%s没有对应的功能刀具' % item.cutting_tool_name))
+            # else:
+            # for item in cnc_workorder.cnc_ids:
+            #     functional_cutting_tool = self.env['sf.functional.cutting.tool.entity'].search(
+            #         [('tool_name_id.name', '=', item.cutting_tool_name)])
+            #     if not functional_cutting_tool:
+            #         raise UserError(_('该制造订单的CNC程序为%s没有对应的功能刀具' % item.cutting_tool_name))
         if self.routing_type == '解除装夹':
             '''
             记录开始时间
@@ -930,6 +933,7 @@ class CNCprocessing(models.Model):
 
     # mrs下发编程单创建CNC加工
     def cnc_processing_create(self, cnc_workorder, ret, program_path, program_path_tmp):
+        cnc_processing = None
         for obj in ret['programming_list']:
             workorder = self.env['mrp.workorder'].search([('production_id.name', '=', ret['production_order_no']),
                                                           ('processing_panel', '=', obj['processing_panel']),
@@ -964,6 +968,7 @@ class CNCprocessing(models.Model):
                 item.is_cnc_program_down = True
                 if item.workorder_id.state == 'waiting':
                     item.workorder_id.state = 'ready'
+        return cnc_processing
 
         # cnc_workorder.time_ids.date_end = datetime.now()
         # cnc_workorder.button_finish()
@@ -999,7 +1004,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)
+        serverdir = os.path.join('C:/Users/43484/Desktop/fsdownload/return', 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'])

sf_manufacturing/models/product_template.py

@@ -7,8 +7,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):