From ae2fdad4f161de383b97994a00b2f589e27af3ef Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Fri, 21 Jul 2023 17:35:44 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=89=A9=E6=96=99page=E9=87=8C=E7=9A=84?=
 =?UTF-8?q?=E5=BA=93=E5=AD=98=E6=A8=A1=E5=9E=8B=E6=96=B0=E5=A2=9E=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E9=95=BF=E5=AE=BD=E9=AB=98=E4=B8=89=E4=B8=AA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=202.=E4=BF=AE=E5=A4=8D=E5=8A=9F=E8=83=BD=E5=A4=B9?=
 =?UTF-8?q?=E5=85=B7=E5=90=8C=E6=AD=A5Bug=203.=E5=A4=B9=E5=85=B7=E7=89=A9?=
 =?UTF-8?q?=E6=96=99=E6=96=B0=E5=A2=9E=E4=B8=8D=E5=8F=AF=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_base/models/fixture.py            | 6 ++++++
 sf_base/models/functional_fixture.py | 5 ++---
 sf_manufacturing/models/stock.py     | 4 ++++
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/sf_base/models/fixture.py b/sf_base/models/fixture.py
index fa0972bf..9387fb78 100644
--- a/sf_base/models/fixture.py
+++ b/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'
diff --git a/sf_base/models/functional_fixture.py b/sf_base/models/functional_fixture.py
index cce1d9e3..55237c2f 100644
--- a/sf_base/models/functional_fixture.py
+++ b/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)]
-
-
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index cbd20b6e..bd6e6853 100644
--- a/sf_manufacturing/models/stock.py
+++ b/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 {