Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/工单文件优化

# Conflicts:
#	sf_manufacturing/models/mrp_workorder.py

sf_dlm/models/product_template.py

@@ -1,12 +1,17 @@
 from odoo import models, fields, api
 from odoo.exceptions import ValidationError
 import logging
+import base64
+import os
+# from OCC.Extend.DataExchange import read_step_file, write_stl_file
+from odoo.modules import get_resource_path
 
 
 class ResProductTemplate(models.Model):
     _inherit = 'product.template'
 
     # 模型的长,宽,高,体积,精度,材料
+    model_name = fields.Char('模型名称')
     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,6 +34,17 @@ class ResProductTemplate(models.Model):
     materials_id = fields.Many2one('sf.production.materials', string='材料')
     materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
     single_manufacturing = fields.Boolean(string="单个制造")
+    upload_model_file = fields.Many2many('ir.attachment', 'upload_model_file_attachment_ref', string='上传模型文件')
+    model_code = fields.Char('模型编码')
+
+    def _get_volume_uom_id_from_ir_config_parameter(self):
+        product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet')
+        if product_length_in_feet_param == '1':
+            return self.env.ref('uom.product_uom_cubic_foot')
+        else:
+            return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
+
+    # model_file = fields.Binary('模型文件')
 
     # 胚料的库存路线设置
     # def _get_routes(self, route_type):
@@ -53,59 +69,82 @@ class ResProductTemplate(models.Model):
     # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
     def product_create(self, product_id, item, order_id, order_number, i):
         copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
-        # copy_product_id.product_tmpl_id.active = True
+        copy_product_id.product_tmpl_id.active = True
+        model_type = self.env['sf.model.type'].search([], limit=1)
+        attachment = self.attachment_create(item['model_name'], item['model_data'])
         vals = {
             'name': '%s-%s' % (order_id.name, i),
-            'model_long': item['model_long'],
-            'model_width': item['model_width'],
-            'model_height': item['model_height'],
+            'model_long': item['model_long'] + model_type.embryo_tolerance,
+            'model_width': item['model_width'] + model_type.embryo_tolerance,
+            'model_height': item['model_height'] + model_type.embryo_tolerance,
+            'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    item['model_width'] + model_type.embryo_tolerance) * (
+                                    item['model_height'] + model_type.embryo_tolerance),
             'model_type_id': 1,
-            'model_machining_precision': item['model_machining_precision'],
-            'model_processing_panel': 'R,U',
+            # 'model_machining_precision': item['model_machining_precision'],
+            'model_processing_panel': 'R',
+            'model_machining_precision': '±0.10mm',
+            'model_code': item['barcode'],
             'length': item['model_long'],
             'width': item['model_width'],
             'height': item['model_height'],
-            'volume': (item['model_long'] * item['model_width'] * item['model_height']),
-            # 'model_price': item['price'],
+            'volume': item['model_long'] * item['model_width'] * item['model_height'],
+            'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
+            'model_name': attachment.name,
+            'upload_model_file': [(6, 0, [attachment.id])],
             # 'single_manufacturing': True,
+            'tracking': 'serial',
             'list_price': item['price'],
             # 'categ_id': self.env.ref('sf_dlm.product_category_finished_sf').id,
             'materials_id': self.env['sf.production.materials'].search(
                 [('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_id': self.env['sf.production.process'].search(
-            #     [('process_encode', '=', item['surface_process_code'])]).id,
+            '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'],
+            # 'barcode': item['barcode'],
             'active': True,
             # 'route_ids': self._get_routes('')
         }
         copy_product_id.sudo().write(vals)
-        # product_id.active = False
+        # product_id.product_tmpl_id.active = False
         return copy_product_id
 
+    def attachment_create(self, name, data):
+        attachment = self.env['ir.attachment'].create({
+            'datas': base64.b64decode(data),
+            'type': 'binary',
+            'description': '模型文件',
+            'name': name
+        })
+        return attachment
+
     # 创建胚料
-    def no_bom_product_create(self, product_id, item, order_id, route_type):
+    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
+        no_bom_copy_product_id.product_tmpl_id.active = True
         materials_id = self.env['sf.production.materials'].search(
             [('materials_no', '=', item['texture_code'])])
         materials_type_id = self.env['sf.materials.model'].search(
             [('materials_no', '=', item['texture_type_code'])])
+        model_type = self.env['sf.model.type'].search([], limit=1)
         supplier = self.env['mrp.bom'].get_supplier(materials_type_id)
         logging.info('no_bom_copy_product_supplier-vals:%s' % supplier)
         vals = {
-            'name': '%s %s %s %s * %s * %s' % (
-                order_id.name, materials_id.name, materials_type_id.name, item['model_long'], item['model_width'],
-                item['model_height']),
-            'length': item['model_long'],
-            'width': item['model_width'],
-            'height': item['model_height'],
-            'volume': item['model_long'] * item['model_width'] * item['model_height'],
+            'name': '%s-%s %s %s %s * %s * %s' % (
+                order_id.name, i, materials_id.name, materials_type_id.name,
+                item['model_long'] + model_type.embryo_tolerance, item['model_width'] + model_type.embryo_tolerance,
+                item['model_height'] + model_type.embryo_tolerance),
+            'length': item['model_long'] + model_type.embryo_tolerance,
+            'width': item['model_width'] + model_type.embryo_tolerance,
+            'height': item['model_height'] + model_type.embryo_tolerance,
+            'volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    item['model_width'] + model_type.embryo_tolerance) * (
+                              item['model_height'] + model_type.embryo_tolerance),
             # 'model_price': item['price'],
             'list_price': item['price'],
             'materials_id': materials_id.id,
@@ -131,22 +170,32 @@ class ResProductTemplate(models.Model):
             logging.info('no_bom_copy_product_id-seller_ids-vals:%s' % no_bom_copy_product_id.seller_ids)
         no_bom_copy_product_id.write(vals)
         logging.info('no_bom_copy_product_id-vals:%s' % vals)
-        # product_id.active = False
+        # product_id.product_tmpl_id.active = False
         return no_bom_copy_product_id
 
-    # 根据模型类型默认给模型的长高宽加配置的长度；
-    @api.onchange('model_type_id')
-    def add_product_size(self):
-        if not self.model_type_id:
-            return
-        model_type = self.env['sf.model.type'].search(
-            [('id', '=', self.model_type_id.id), ('embryo_tolerance', '=', True)])
-        if model_type:
-            self.model_long = self.model_long + 1
-            self.model_width = self.model_width + 1
-            self.model_height = self.model_width + 1
-        else:
-            return
+    # @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):
@@ -207,8 +256,6 @@ class ResMrpBom(models.Model):
 
     # 匹配bom
     def get_bom(self, product):
-        logging.info('get_bom-product:%s' % product)
-        logging.info('get_bom-product:%s' % product.materials_type_id.id)
         embryo_has = self.env['product.product'].search(
             [('categ_id.type', '=', '胚料'), ('materials_type_id', '=', product.materials_type_id.id),
              ('length', '>', product.length), ('width', '>', product.width),
@@ -220,7 +267,7 @@ class ResMrpBom(models.Model):
         logging.info('get_bom-vals:%s' % embryo_has)
         if embryo_has:
             rate_of_waste = ((embryo_has.volume - product.model_volume) % embryo_has.volume) * 100
-            if rate_of_waste >= 20:
+            if rate_of_waste <= 20:
                 return embryo_has
         else:
             return