From 1f32aafc9b779cb526a0ebbf324084e87cd392fe Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Wed, 19 Jun 2024 16:38:30 +0800
Subject: [PATCH 1/2] =?UTF-8?q?1=E3=80=81=E5=AE=8C=E6=88=90=20=20=E5=B7=A5?=
=?UTF-8?q?=E4=BB=B6=E8=A3=85=E5=A4=B9=E9=A2=84=E8=B0=83=E5=B7=A5=E5=8D=95?=
=?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96=E9=9C=80=E6=B1=82-3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_manufacturing/views/mrp_workorder_view.xml | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/sf_manufacturing/views/mrp_workorder_view.xml b/sf_manufacturing/views/mrp_workorder_view.xml
index a5d902bf..d93df718 100644
--- a/sf_manufacturing/views/mrp_workorder_view.xml
+++ b/sf_manufacturing/views/mrp_workorder_view.xml
@@ -285,20 +285,26 @@
+
+
+
+
+
+
-
-
-
+
+
+
From f8c1d75b63bee22ea286de9a4d09115172d11a9d Mon Sep 17 00:00:00 2001
From: yuxianghui <3437689193@qq.com>
Date: Thu, 20 Jun 2024 17:30:23 +0800
Subject: [PATCH 2/2] =?UTF-8?q?1=E3=80=81=E5=88=80=E5=85=B7=E8=BF=87?=
=?UTF-8?q?=E6=BB=A4=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
sf_tool_management/models/functional_tool.py | 4 ++--
sf_tool_management/views/functional_tool_views.xml | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/sf_tool_management/models/functional_tool.py b/sf_tool_management/models/functional_tool.py
index 34f26ff6..45f52f4f 100644
--- a/sf_tool_management/models/functional_tool.py
+++ b/sf_tool_management/models/functional_tool.py
@@ -404,8 +404,8 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
side_shelf_num = fields.Integer(string='线边刀库数量', compute='_compute_stock_num', store=True)
on_tool_stock_num = fields.Integer(string='机内刀库数量', compute='_compute_stock_num', store=True)
tool_stock_total = fields.Integer(string='当前库存量', compute='_compute_tool_stock_total', store=True)
- min_stock_num = fields.Integer('最低库存量')
- max_stock_num = fields.Integer('最高库存量')
+ min_stock_num = fields.Integer('最低库存量', tracking=True)
+ max_stock_num = fields.Integer('最高库存量', tracking=True)
batch_replenishment_num = fields.Integer('批次补货量', readonly=True, compute='_compute_batch_replenishment_num',
store=True)
unit = fields.Char('单位', default="件")
diff --git a/sf_tool_management/views/functional_tool_views.xml b/sf_tool_management/views/functional_tool_views.xml
index 283eb2cc..6d812368 100644
--- a/sf_tool_management/views/functional_tool_views.xml
+++ b/sf_tool_management/views/functional_tool_views.xml
@@ -531,7 +531,7 @@
ref="sf_tool_management.sf_inbound_and_outbound_records_of_functional_tools_view_tree"/>
- [('functional_tool_name', '!=', False)]
+ [('rfid', '!=', ''),('functional_tool_name', '!=', '')]