sf1.0推送到master

sf_dlm/models/product_template.py

@@ -1,12 +1,6 @@
-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 odoo import models, fields
 import logging
 import base64
-import hashlib
-import os
 
 
 class ResProductTemplate(models.Model):
@@ -15,9 +9,7 @@ class ResProductTemplate(models.Model):
     # 模型的长,宽,高,体积,精度,材料
     model_name = fields.Char('模型名称')
     categ_type = fields.Selection(
-        [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺")],
-        string='产品的类别', related='categ_id.type',
-        store=True)
+        [("成品", "成品"), ("胚料", "胚料"), ("原材料", "原材料")], string='产品的类别', related='categ_id.type', store=True)
     model_long = fields.Float('模型长[mm]', digits=(16, 3))
     model_width = fields.Float('模型宽[mm]', digits=(16, 3))
     model_height = fields.Float('模型高[mm]', digits=(16, 3))
@@ -29,14 +21,10 @@ class ResProductTemplate(models.Model):
         ('0.02', '±0.02mm'),
         ('0.01', '±0.01mm')], string='加工精度')
     product_model_type_id = fields.Many2one('sf.model.type', string='产品模型类型')
-    embryo_model_type_id = fields.Many2one('sf.model.type', string='坯料模型类型')
+    embryo_model_type_id = fields.Many2one('sf.model.type', string='胚料模型类型')
     model_processing_panel = fields.Char('模型加工面板')
-    # model_surface_process_category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别')
-    # model_surface_process_ids = fields.Many2many('sf.production.process', 'rel_product_process', string='表面工艺')
-    server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter',
-                                                           string='表面工艺参数(服务产品)')
-    model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel',
-                                                    string='表面工艺参数')
+    model_surface_process_id = fields.Many2one('sf.production.process', string='表面工艺')
+    model_process_parameters_id = fields.Many2one('sf.processing.technology', string='工艺参数')
     # model_price = fields.Float('模型单价', digits=(16, 3))
     model_remark = fields.Char('模型备注说明')
     length = fields.Float('长[mm]', digits=(16, 3))
@@ -58,7 +46,7 @@ class ResProductTemplate(models.Model):
 
     # model_file = fields.Binary('模型文件')
 
-    # 坯料的库存路线设置
+    # 胚料的库存路线设置
     # def _get_routes(self, route_type):
     #     route_manufacture = self.env.ref('mrp.route_warehouse0_manufacture', raise_if_not_found=False).sudo()
     #     route_mto = self.env.ref('stock.route_warehouse0_mto', raise_if_not_found=False).sudo()
@@ -103,7 +91,6 @@ class ResProductTemplate(models.Model):
             'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
             'model_name': attachment.name,
             'upload_model_file': [(6, 0, [attachment.id])],
-            # 'tag_ids': [(6, 0, [t.id for t in account_template.tag_ids])],
             # 'single_manufacturing': True,
             # 'tracking': 'serial',
             'list_price': item['price'],
@@ -112,8 +99,10 @@ class ResProductTemplate(models.Model):
                 [('materials_no', '=', item['texture_code'])]).id,
             'materials_type_id': self.env['sf.materials.model'].search(
                 [('materials_no', '=', item['texture_type_code'])]).id,
-            # 'model_surface_process_ids': self.get_production_process_id(item['surface_process_code']),
-            'model_process_parameters_ids': self.get_process_parameters_id(item['process_parameters_code']),
+            'model_surface_process_id': self.env['sf.production.process'].search(
+                [('process_encode', '=', item['surface_process_code'])]).id,
+            # 'model_process_parameters_id': self.env['sf.processing.technology'].search(
+            #     [('process_encode', '=', item['process_parameters_code'])]).id,
             'model_remark': item['remark'],
             'default_code': '%s-%s' % (order_number, i),
             # 'barcode': item['barcode'],
@@ -124,20 +113,6 @@ class ResProductTemplate(models.Model):
         # product_id.product_tmpl_id.active = False
         return copy_product_id
 
-    # def get_production_process_id(self, surface_process_code):
-    #     production_process_ids = []
-    #     for item in surface_process_code:
-    #         production_process = self.env['sf.production.process'].search([('process_encode', '=', item)])
-    #         production_process_ids.append(production_process.id)
-    #     return [(6, 0, production_process_ids)]
-
-    def get_process_parameters_id(self, process_parameters_code):
-        process_parameters_ids = []
-        for item in process_parameters_code:
-            process_parameters = self.env['sf.production.process.parameter'].search([('code', '=', item)])
-            process_parameters_ids.append(process_parameters.id)
-        return [(6, 0, process_parameters_ids)]
-
     def attachment_create(self, name, data):
         attachment = self.env['ir.attachment'].create({
             'datas': base64.b64decode(data),
@@ -148,7 +123,7 @@ class ResProductTemplate(models.Model):
         })
         return attachment
 
-    # 创建坯料
+    # 创建胚料
     def no_bom_product_create(self, product_id, item, order_id, route_type, i):
         no_bom_copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
         no_bom_copy_product_id.product_tmpl_id.active = True
@@ -184,7 +159,7 @@ class ResProductTemplate(models.Model):
             #     [('process_encode', '=', item['process_parameters_code'])]).id,
             'active': True
         }
-        # 外协和采购生成的坯料需要根据材料型号绑定供应商
+        # 外协和采购生成的胚料需要根据材料型号绑定供应商
         if route_type == 'subcontract' or route_type == 'purchase':
             no_bom_copy_product_id.purchase_ok = True
             no_bom_copy_product_id.seller_ids = [
@@ -197,66 +172,29 @@ class ResProductTemplate(models.Model):
         # product_id.product_tmpl_id.active = False
         return no_bom_copy_product_id
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        for vals in vals_list:
-            if vals.get('upload_model_file'):
-                if vals.get('is_bfm') is False and vals.get('categ_type') == '成品':
-                    for item in vals['upload_model_file']:
-                        attachment = self.env['ir.attachment'].sudo().search([('id', '=', int(item[2][0]))])
-                        base64_data = base64.b64encode(attachment.datas)
-                        base64_datas = base64_data.decode('utf-8')
-                        model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
-                        report_path = attachment._full_path(attachment.store_fname)
-                        vals['model_file'] = self.transition_glb_file(report_path, model_code)
-            self._sanitize_vals(vals)
-        templates = super(ResProductTemplate, self).create(vals_list)
-        if "create_product_product" not in self._context:
-            templates._create_variant_ids()
-
-        # This is needed to set given values to first variant after creation
-        for template, vals in zip(templates, vals_list):
-            related_vals = {}
-            for field_name in self._get_related_fields_variant_template():
-                if vals.get(field_name):
-                    related_vals[field_name] = vals[field_name]
-            if related_vals:
-                template.write(related_vals)
-
-        return templates
-
-    @api.onchange('upload_model_file')
-    def onchange_model_file(self):
-        for item in self:
-            if item.upload_model_file:
-                if len(item.upload_model_file) > 1:
-                    raise ValidationError('只允许上传一个文件')
-                manufacturing_order = self.env['mrp.production'].search([('product_id', '=', self.id)])
-                if manufacturing_order:
-                    raise ValidationError('该产品已生成制造订单，无法进行修改')
-                file_attachment_id = item.upload_model_file[0]
-                # 附件路径
-                report_path = file_attachment_id._full_path(file_attachment_id.store_fname)
-                base64_data = base64.b64encode(file_attachment_id.datas)
-                base64_datas = base64_data.decode('utf-8')
-                model_code = hashlib.sha1(base64_datas.encode('utf-8')).hexdigest()
-                item.model_file = self.transition_glb_file(report_path, model_code)
-
-    # 将attach的datas内容转为glb文件
-    def transition_glb_file(self, report_path, code):
-        shapes = read_step_file(report_path)
-        output_file = os.path.join('/tmp', str(code) + '.stl')
-        write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
-        # 转化为glb
-        output_glb_file = os.path.join('/tmp', str(code) + '.glb')
-        util_path = get_resource_path('sf_dlm', 'static/util')
-        cmd = 'python3 %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
-        os.system(cmd)
-        # 转base64
-        with open(output_glb_file, 'rb') as fileObj:
-            image_data = fileObj.read()
-            base64_data = base64.b64encode(image_data)
-        return base64_data
+    # @api.onchange('upload_model_file')
+    # def onchange_model_file(self):
+    #     for item in self:
+    #         if len(item.upload_model_file) > 1:
+    #             raise ValidationError('只允许上传一个文件')
+    #         if item.upload_model_file:
+    #             file_attachment_id = item.upload_model_file[0]
+    #             item.model_name = file_attachment_id.name
+    #             # 附件路径
+    #             report_path = file_attachment_id._full_path(file_attachment_id.store_fname)
+    #             shapes = read_step_file(report_path)
+    #             output_file = get_resource_path('sf_dlm', 'static/file', 'out.stl')
+    #             write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+    #             # 转化为glb
+    #             output_glb_file = get_resource_path('sf_dlm', 'static/file', 'out.glb')
+    #             util_path = get_resource_path('sf_dlm', 'static/util')
+    #             cmd = 'python %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
+    #             os.system(cmd)
+    #             # 转base64
+    #             with open(output_glb_file, 'rb') as fileObj:
+    #                 image_data = fileObj.read()
+    #                 base64_data = base64.b64encode(image_data)
+    #                 item.model_file = base64_data
 
 
 class ResMrpBom(models.Model):
@@ -288,11 +226,11 @@ class ResMrpBom(models.Model):
             bom_id.subcontractor_id = subcontract.partner_id.id
         return bom_id
 
-    # 坯料BOM组件：选取当前坯料原材料，
-    # 然后根据当前的坯料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
-    # 坯料所需原材料公式：当前的坯料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
+    # 胚料BOM组件：选取当前胚料原材料，
+    # 然后根据当前的胚料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
+    # 胚料所需原材料公式：当前的胚料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
     def bom_create_line(self, embryo):
-        # 选取当前坯料原材料
+        # 选取当前胚料原材料
         raw_bom_line = self.get_raw_bom(embryo)
         if raw_bom_line:
             bom_line = self.env['mrp.bom.line'].create({
@@ -317,7 +255,7 @@ class ResMrpBom(models.Model):
     # 匹配bom
     def get_bom(self, product):
         embryo_has = self.env['product.product'].search(
-            [('categ_id.type', '=', '坯料'), ('materials_type_id', '=', product.materials_type_id.id),
+            [('categ_id.type', '=', '胚料'), ('materials_type_id', '=', product.materials_type_id.id),
              ('length', '>', product.length), ('width', '>', product.width),
              ('height', '>', product.height), ('is_bfm', '=', False)
              ],
@@ -343,7 +281,7 @@ class ResProductCategory(models.Model):
     _inherit = "product.category"
 
     type = fields.Selection(
-        [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺")],
+        [("成品", "成品"), ("胚料", "胚料"), ("原材料", "原材料")],
         default="", string="类型")
 
     # @api.constrains('type')

sf_dlm/models/product_workorder.py

@@ -1,12 +1,13 @@
-from odoo import fields, models
+from odoo import api, fields, models
+
 
 
 class ResMrpWorkOrder(models.Model):
     _inherit = 'mrp.workorder'
     _order = 'sequence'
 
-    product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True, check_company=True, string="坯料长度(mm)")
-    product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True, check_company=True, string="坯料宽度(mm)")
-    product_tmpl_id_height = fields.Float(related='production_id.product_tmpl_id.height', readonly=True, store=True, check_company=True, string="坯料高度(mm)")
+    product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True, check_company=True, string="胚料长度(mm)")
+    product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True, check_company=True, string="胚料宽度(mm)")
+    product_tmpl_id_height = fields.Float(related='production_id.product_tmpl_id.height', readonly=True, store=True, check_company=True, string="胚料高度(mm)")
     product_tmpl_id_materials_id = fields.Many2one(related='production_id.product_tmpl_id.materials_id', readonly=True, store=True, check_company=True, string="材料")
     product_tmpl_id_materials_type_id = fields.Many2one(related='production_id.product_tmpl_id.materials_type_id', readonly=True, store=True, check_company=True, string="型号")