diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index b55d7003..51ac861d 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -956,18 +956,6 @@ class FunctionalToolAssembly(models.Model):
return functional_tool
return False
- def automated_assembly(self):
- """
- todo 自动组装
- :return:
- """
-
- def automatic_printing_of_QR_code(self):
- """
- todo 自动打印二维码
- :return:
- """
-
def assemble_single_print(self):
"""
todo 组装单打印
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 59229492..2d5cdf63 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -967,10 +967,10 @@
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
class="btn-primary"/>
-
+
+
+
+
@@ -1006,14 +1006,10 @@
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
-
-
+
+
+
+
diff --git a/sf_tool_management/wizard/wizard.py b/sf_tool_management/wizard/wizard.py
index 9f4e075e..3b2649a2 100644
--- a/sf_tool_management/wizard/wizard.py
+++ b/sf_tool_management/wizard/wizard.py
@@ -445,6 +445,21 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
if obj.after_assembly_functional_tool_length == 0:
raise ValidationError('组装参数信息【伸出长】不能为0!!!')
+ @api.constrains('rfid')
+ def _check_rfid(self):
+ self.get_rfid()
+
+ @api.onchange('rfid')
+ def _onchange_rfid(self):
+ self.get_rfid()
+
+ def get_rfid(self):
+ for obj in self:
+ if obj.rfid:
+ tool_entity = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', obj.rfid)])
+ if tool_entity:
+ raise ValidationError('【%s】的rfid已被使用,请重新录入!!!' % obj.rfid)
+
def functional_tool_assembly(self):
"""
功能刀具组装