1.物料page里的库存模型新增物料长宽高三个字段

2.修复功能夹具同步Bug
3.夹具物料新增不可删除控制

sf_base/models/fixture.py

@@ -1,4 +1,5 @@
 from odoo import models, fields, api
+from odoo.exceptions import UserError
 
 
 class FixtureMaterial(models.Model):
@@ -9,6 +10,11 @@ class FixtureMaterial(models.Model):
     name = fields.Char(string="名称", size=15)
     remark = fields.Char(string="备注")
 
+    def unlink(self):
+        for record in self:
+            if record:
+                raise UserError('不允许删除数据！')
+
 
 class Multi_MountingType(models.Model):
     _name = 'sf.multi_mounting.type'

sf_base/models/functional_fixture.py

@@ -36,7 +36,6 @@ class FunctionalFixture(models.Model):
         fixture_model_ids = []
         for item in fixture_model_code:
             fixture_model = self.env['sf.fixture.model'].search([('code', '=', item)])
-            fixture_model_ids.append(fixture_model.id)
+            if fixture_model:
+                fixture_model_ids.append(fixture_model.id)
         return [(6, 0, fixture_model_ids)]
-
-

sf_manufacturing/models/stock.py

@@ -318,6 +318,10 @@ class StockPicking(models.Model):
 class ReStockMove(models.Model):
     _inherit = 'stock.move'
 
+    materiel_length = fields.Float(string='物料长度', digits=(16, 4))
+    materiel_width = fields.Float(string='物料宽度', digits=(16, 4))
+    materiel_height = fields.Float(string='物料高度', digits=(16, 4))
+  
     def _get_new_picking_values_Res(self, item, sorted_workorders, rescode):
         logging.info('new_picking-rescode: %s' % rescode)
         return {