Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/权限去掉继承

sf_warehouse/models/model.py

@@ -11,6 +11,14 @@ class SfLocation(models.Model):
     name = fields.Char('Location Name', required=True, size=20)
     barcode = fields.Char('Barcode', copy=False, size=15)
 
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
     # 仓库类别（selection：库区、库位、货位）
     # location_type = fields.Selection([
     #     ('库区', '库区'),
@@ -218,6 +226,14 @@ class ShelfLocation(models.Model):
     name = fields.Char('名称', required=True, size=20)
     barcode = fields.Char('编码', copy=False, size=15)
 
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
     # 仓库类别（selection：库区、库位、货位）
     location_type = fields.Selection([
         ('货架', '货架'),
@@ -258,10 +274,11 @@ class ShelfLocation(models.Model):
         """
         根据货架的所属库区修改货位的所属库区
         """
-        all_location = self.env['sf.shelf.location'].search([('name', 'ilike', self.name)])
-        for record in self:
-            for location in all_location:
-                location.location_id = record.shelf_location_id.id
+        if self.name:
+            all_location = self.env['sf.shelf.location'].search([('name', 'ilike', self.name)])
+            for record in self:
+                for location in all_location:
+                    location.location_id = record.shelf_location_id.id
 
     @api.depends('product_sn_id')
     def _compute_product_id(self):
@@ -500,3 +517,135 @@ class SfProcurementGroup(models.Model):
                     res = Rule.search(expression.AND([[('route_id', 'in', warehouse_routes.ids)], domain]),
                                       order='route_sequence, sequence', limit=1)
         return res
+
+
+class SfWarehouse(models.Model):
+    _inherit = 'stock.warehouse'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfRule(models.Model):
+    _inherit = 'stock.rule'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfRoute(models.Model):
+    _inherit = 'stock.route'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfPickingType(models.Model):
+    _inherit = 'stock.picking.type'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfProductCategory(models.Model):
+    _inherit = 'product.category'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfUomCategory(models.Model):
+    _inherit = 'uom.category'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfBarcodeNomenclature(models.Model):
+    _inherit = 'barcode.nomenclature'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfPutawayRule(models.Model):
+    _inherit = 'stock.putaway.rule'
+
+    check_state = fields.Selection([
+        ('enable', '同意'),
+        ('close', '不同意')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfWarehouseOrderpoint(models.Model):
+    _inherit = 'stock.warehouse.orderpoint'
+
+    check_state = fields.Selection([
+        ('enable', '同意'),
+        ('close', '不同意')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfStockQuant(models.Model):
+    _inherit = 'stock.quant'
+
+    check_state = fields.Selection([
+        ('enable', '同意'),
+        ('close', '不同意')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'
+
+
+class SfStockScrap(models.Model):
+    _inherit = 'stock.scrap'
+
+    check_state = fields.Selection([
+        ('enable', '启用'),
+        ('close', '关闭')
+    ], string='审核状态', default='close')
+
+    def action_check(self):
+        self.check_state = 'enable'