Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

# Conflicts:
#	sf_dlm/data/product_data.xml
#	sf_dlm/models/product_template.py
#	sf_manufacturing/models/mrp_workorder.py
#	sf_mrs_connect/controllers/controllers.py

sf_dlm/models/product_template.py

@@ -35,6 +35,23 @@ class ResProductTemplate(models.Model):
     # def _compute_volume(self):
     #     self.volume = self.long * self.width * self.height
 
+
+    single_manufacturing = fields.Boolean(string="单个制造")
+
+    @api.model
+    def _get_route(self):
+        route_manufacture = self.env.ref('stock.warehouse0', raise_if_not_found=False).manufacture_pull_id.route_id.id
+        route_mto = self.env.ref('stock.warehouse0', raise_if_not_found=False).mto_pull_id.route_id.id
+        if route_manufacture and route_mto:
+            return [route_manufacture, route_mto]
+        return []
+
+    route_ids = fields.Many2many(default=lambda self: self._get_route())
+
+    # @api.depends('long', 'width', 'height')
+    # def _compute_volume(self):
+    #     self.volume = self.long * self.width * self.height
+
     # @api.depends('model_long', 'model_width', 'model_height')
     # def _compute_model_volume(self):
     #     self.model_volume = self.model_long * self.model_width * self.model_height
@@ -54,6 +71,12 @@ class ResProductTemplate(models.Model):
             'height': item['height'],
             'volume': item['long'] * item['width'] * item['height'],
             'model_price': item['price'],
+            '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'],
+            'tracking': 'serial',
             'single_manufacturing': True,
             'list_price': item['price'],
             'materials_id': self.env['sf.production.materials'].search(
@@ -65,8 +88,44 @@ class ResProductTemplate(models.Model):
             # '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'],
+            # 'default_code': '%s-%s' % (order_number, i),
+            # 'barcode': item['barcode'],
+            'active': True
+        }
+        logging.info('product_create1:%s' % item)
+        copy_product_id.sudo().write(vals)
+        return copy_product_id
+
+    def no_bom_product_create(self, product_id, item, order_id):
+        copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
+        copy_product_id.product_tmpl_id.active = True
+        logging.info('no_bom_product_create:%s' % item)
+        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
+        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']),
+            'model_long': item['model_long'],
+            'model_width': item['model_width'],
+            'model_height': item['model_height'],
+            'model_volume': 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'],
+            'model_price': item['price'],
+            'tracking': 'serial',
+            'single_manufacturing': True,
+            'list_price': item['price'],
+            'materials_id': materials_id.id,
+            'materials_type_id': materials_type_id.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,
             'active': True
         }
         logging.info('product_create1:%s' % item)
@@ -99,10 +158,10 @@ class ResMrpBom(models.Model):
     _inherit = 'mrp.bom'
 
     # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
-    def bom_create(self, product):
+    def bom_create(self, product, bom_type):
         bom_id = self.env['mrp.bom'].create({
             'product_tmpl_id': product.product_tmpl_id.id,
-            'type': 'normal',
+            'type': bom_type,
             'product_qty': 1,
             'product_uom_id': 1
         })
@@ -117,6 +176,24 @@ class ResMrpBom(models.Model):
         logging.info('bom_create_Line:%s' % product)
         embryo = self.env['product.product'].search(
             [('categ_id.is_embryo', '=', True), ('materials_type_id', '=', product.materials_type_id.id),
+    # 创建新的胚料，根据胚料材料型号的获取方式(
+    # 自加工，外协，采购) 的配置, 选择不同的库存路线，一种材料型号配置一个路线相关的配置:
+    # 材料型号配置不同的获取方式: (自加工, 外协, 采购);
+    # 原材料重量KG（公斤）= 胚料的体积（立方米m³） * 材料密度 * 1000
+    def bom_create_Line(self, embryo, materials):
+        bom_line = self.get_raw_bom(embryo, materials)
+        vals = {
+            'bom_id': self.id,
+            'product_id': bom_line.id,
+            'product_tmpl_id': bom_line.product_tmpl_id.id,
+            'product_qty': bom_line.volume * bom_line.materials_type_id.density * 1000,
+            'product_uom_id': bom_line.uom_id.id
+        }
+        return self.env['mrp.bom.line'].create(vals)
+
+    def get_bom(self, product):
+        embryo = self.env['product.product'].search(
+            [('categ_id.type', '=', '胚料'), ('materials_type_id', '=', product.materials_type_id.id),
              ('length', '>', product.length), ('width', '>', product.width),
              ('height', '>', product.height)
              ],
@@ -125,9 +202,32 @@ class ResMrpBom(models.Model):
         )
         logging.info('bom_create_Line1:%s' % product)
         return self.env['mrp.bom.line'].create(vals)
+        if embryo:
+            rate_of_waste = ((embryo.volume - product.model_volume) % embryo.volume) * 100
+            if rate_of_waste <= 20:
+                return embryo
+        else:
+            return
+
+    # 查bom的原材料
+    def get_raw_bom(self, product):
+        raw_bom = self.env['product.product'].search(
+            [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)])
+        return raw_bom
 
 
 class ResProductCategory(models.Model):
     _inherit = "product.category"
 
-    is_embryo = fields.Boolean('胚料')
+    type = fields.Selection(
+        [("成品", "成品"), ("胚料", "胚料"), ("原材料", "原材料")],
+        default="", string="类型")
+
+    # @api.constrains('type')
+    # def _check_type(self):
+    #     category = self.env['product.category'].search(
+    #         [('type', '=', self.type)])
+    #     if category:
+    #         raise ValidationError("该类别已存在,请选择其他类别")
+
+