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

# Conflicts:
#	sf_base/security/ir.model.access.csv
#	sf_base/views/mrs_common_view.xml

sf_base/models/__init__.py

@@ -1,2 +1,5 @@
-from. import sf_base
-from. import sf_common
+from . import sf_base
+from . import sf_common
+from . import product_template
+from . import sale_order
+from . import process

sf_base/models/process.py

@@ -0,0 +1,39 @@
+from odoo import fields, models, api
+
+
+class ModelType(models.Model):
+    _name = 'sf.model.type'
+    _description = '模型类型'
+
+    name = fields.Char('名称')
+    routing_tmpl_ids = fields.One2many('sf.model.type.routing.sort', 'model_type_id', '工序模板')
+
+
+class ResMrpRoutingWorkcenter(models.Model):
+    _inherit = 'mrp.routing.workcenter'
+
+    is_repeat = fields.Boolean('重复', default=False)
+    workcenter_id = fields.Many2one('mrp.workcenter', required=False)
+    workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)
+    bom_id = fields.Many2one('mrp.bom', required=False)
+
+    # 获得当前登陆者公司
+    def get_company_id(self):
+        self.company_id = self.env.user.company_id.id
+
+    company_id = fields.Many2one('res.company', compute="get_company_id", related=False)
+
+
+class ModelTypeRoutingSort(models.Model):
+    _name = 'sf.model.type.routing.sort'
+    _description = '工序排序'
+
+    sequence = fields.Integer('Sequence')
+    route_workcenter_id = fields.Many2one('mrp.routing.workcenter')
+    is_repeat = fields.Boolean('重复', related='route_workcenter_id.is_repeat')
+    workcenter_ids = fields.Many2many('mrp.workcenter', required=False, related='route_workcenter_id.workcenter_ids')
+    model_type_id = fields.Many2one('sf.model.type')
+
+    _sql_constraints = [
+        ('route_model_type_uniq', 'unique (route_workcenter_id,model_type_id)', '工序不能重复!')
+    ]

sf_base/models/product_template.py

@@ -0,0 +1,124 @@
+from odoo import models, fields,api
+from odoo.exceptions import ValidationError
+
+
+class ResProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    # 模型的长,宽,高,体积,精度,材料
+    model_long = fields.Float('模型长[mm]', digits=(16, 3))
+    model_width = fields.Float('模型宽[mm]', digits=(16, 3))
+    model_height = fields.Float('模型高[mm]', digits=(16, 3))
+    model_volume = fields.Float('模型体积[mm³]', digits=(16, 3))
+    model_precision = fields.Float('精度要求', digits=(16, 3))
+    model_materials_id = fields.Many2one('mrs.production.materials', string='模型材料')
+    model_materials_type_id = fields.Many2one('mrs.materials.model', string='模型材料型号')
+    model_type_id = fields.Many2one('sf.model.type', string='模型类型')
+    processing_panel = fields.Char('模型加工面板')
+    # 胚料的长,宽,高
+    embryo_long = fields.Float('胚料长[mm]', digits=(16, 3), onchange='count_embryo_size')
+    embryo_width = fields.Float('胚料宽[mm]', digits=(16, 3), onchange='count_embryo_size')
+    embryo_height = fields.Float('胚料高[mm]', digits=(16, 3), onchange='count_embryo_size')
+    embryo_materials_id = fields.Many2one('mrs.production.materials', string='胚料材料')
+    embryo_materials_type_id = fields.Many2one('mrs.materials.model', string='胚料材料型号')
+
+    volume = fields.Float(compute='_compute_volume', store=True)
+
+    @api.depends('embryo_long', 'embryo_width', 'embryo_height')
+    def _compute_volume(self):
+        self.volume = self.embryo_long * self.embryo_width * self.embryo_height
+
+    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
+    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
+        vals = {
+            'name': '%s-%s' % (order_id.name, i),
+            'model_long': item['model_long'],
+            'model_width': item['model_width'],
+            'model_height': item['model_height'],
+            'model_volume': item['model_volume'],
+            'list_price': item['price'],
+            'model_materials_id': self.env['mrs.production.materials'].search(
+                [('materials_no', '=', item['texture_code'])]).id,
+            'model_materials_type_id': self.env['mrs.materials.model'].search(
+                [('materials_no', '=', item['texture_type_code'])]).id,
+            'default_code': '%s-%s' % (order_number, i),
+            'barcode': item['barcode'],
+            'active': True
+        }
+        copy_product_id.sudo().write(vals)
+        return copy_product_id
+
+    # 在产品上增加模型类型和加工的面（例如：A、B) ，
+    # 并根据模型类型计算出产品的胚料尺寸；
+    @api.onchange('model_type_id')
+    def count_embryo_size(self):
+        if not self.model_type_id:
+            return
+        bom = self.env['product.product'].search(
+            [('categ_id.is_embryo', '=', True), ('product_tmpl_id', '=', self.id)],
+            limit=1,
+            order='volume desc'
+        )
+        for item in self:
+            item.embryo_long = bom.embryo_long + 1
+            item.embryo_width = bom.embryo_width + 1
+            item.embryo_height = bom.embryo_height + 1
+
+
+
+
+
+class ResProductCategory(models.Model):
+    _inherit = "product.category"
+
+    is_embryo = fields.Boolean('胚料')
+
+
+class ResMrpBom(models.Model):
+    _inherit = 'mrp.bom'
+
+    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
+    def bom_create(self, product):
+        bom_id = self.env['mrp.bom'].create({
+            'product_tmpl_id': product.product_tmpl_id.id,
+            'type': 'normal',
+            'product_qty': 1,
+            'product_uom_id': 1
+        })
+        return bom_id
+
+    # 生成产品BOM匹配胚料，胚料的匹配规则：
+    # 一、匹配的胚料类别需要带有胚料的标签；
+    # 二、胚料的材料型号与生成产品的材料型号一致；
+    # 三、胚料的长宽高均要大于模型的长宽高；
+    # 四、如果匹配成功多个胚料，则选取体积最小的胚料；
+    def bom_create_Line(self, product):
+        embryo = self.env['product.product'].search(
+            [('categ_id.is_embryo', '=', True), ('embryo_materials_type_id', '=', product.model_materials_type_id.id),
+             ('embryo_long', '>', product.model_long), ('embryo_width', '>', product.model_width),
+             ('embryo_height', '>', product.model_height)
+             ],
+            limit=1,
+            order='volume desc'
+        )
+        vals = {
+            'bom_id': self.id,
+            'product_id': embryo.id,
+            'product_tmpl_id': embryo.product_tmpl_id.id,
+            'product_qty': 1,
+            'product_uom_id': 1
+        }
+        return self.env['mrp.bom.line'].create(vals)
+
+
+
+
+
+
+
+
+
+
+

sf_base/models/sale_order.py

@@ -0,0 +1,34 @@
+from odoo import models, fields
+from odoo.exceptions import ValidationError
+import datetime
+
+
+class ReSaleOrder(models.Model):
+    _inherit = 'sale.order'
+
+    deadline_of_delivery = fields.Date('交货截止日期')
+
+    # 业务平台分配工厂后在智能工厂先创建销售订单
+    def sale_order_create(self, deadline_of_delivery, company_id):
+        now_time = datetime.datetime.now()
+        order_id = self.env['sale.order'].sudo().create({
+            'company_id': company_id.id,
+            'date_order': now_time,
+            'name': self.env['ir.sequence'].next_by_code('sale.order', sequence_date=now_time),
+            'partner_id': 8,
+            'state': 'sale',
+            'user_id': 6,
+            'deadline_of_delivery': deadline_of_delivery
+        })
+        return order_id
+
+    # 业务平台分配工厂时在创建完产品后再创建销售明细信息
+    def sale_order_create_line(self, product, item):
+        vals = {
+            'order_id': self.id,
+            'product_id': product.id,
+            'name': '%s/%s/%s/%s/%s' % (item['model_long'], item['model_width'], item['model_height'], item['model_volume'], product.model_materials_id.name),
+            'price_unit': item['price'],
+            'product_uom_qty': item['number']
+        }
+        return self.env['sale.order.line'].create(vals)