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

# Conflicts:
#	sf_maintenance/__manifest__.py

sf_maintenance/models/__init__.py

@@ -3,4 +3,3 @@ from . import sf_maintenance
 from . import sf_maintenance_logs
 from . import sf_equipment_maintenance_standards
 from . import sf_maintenance_requests
-from . import production_line_base

sf_maintenance/models/production_line_base.py

@@ -1,30 +0,0 @@
-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('备注')
-
-
-
-