Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/新增工件装夹

# Conflicts:
#	sf_maintenance/__manifest__.py

sf_manufacturing/models/__init__.py

@@ -8,6 +8,7 @@ from . import mrp_maintenance
 from . import mrp_routing_workcenter
 from . import stock
 from . import res_user
+from . import production_line_base
 
 
 

sf_manufacturing/models/production_line_base.py

@@ -0,0 +1,30 @@
+from odoo import models,fields
+
+
+class ProductionLine(models.Model):
+    _name = 'sf.production.line'
+    _description = '生产线'
+
+    def _get_code(self):
+        """
+        自动生成编码
+        :return:
+        """
+        fixture_material = self.env['sf.production.line'].sudo().search(
+            [('code', '!=', '')],
+            limit=1,
+            order="id desc")
+        if not fixture_material:
+            num = "%03d" % 1
+        else:
+            m = int(fixture_material.code) + 1
+            num = "%03d" % m
+        return num
+
+    name = fields.Char('生产线')
+    code = fields.Char('编码', default=_get_code, readonly=True)
+    remark = fields.Char('备注')
+
+
+
+