diff --git a/sf_tool_management/models/base.py b/sf_tool_management/models/base.py
index 37c534da..e1d1010b 100644
--- a/sf_tool_management/models/base.py
+++ b/sf_tool_management/models/base.py
@@ -296,6 +296,12 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
sf_functional_tool_assembly_ids = fields.Many2many('sf.functional.tool.assembly', 'sf_functional_tool_assembly_ref',
'功能刀具组装单', readonly=True)
+ @api.constrains('min_stock_num', 'max_stock_num')
+ def _check_stock_num(self):
+ for obj in self:
+ if obj.min_stock_num > obj.min_stock_num:
+ raise ValidationError('【最低安全库存】不能高于【最高安全库存】!!!')
+
@api.model
def _read_mrs_cutting_tool_type_ids(self, categories, domain, order):
mrs_cutting_tool_type_ids = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)
@@ -327,7 +333,6 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
else:
tool.batch_replenishment_num = 0
-
def create_functional_tool_assembly(self):
"""
创建功能刀具组装单
@@ -673,7 +678,7 @@ class FunctionalToolAssembly(models.Model):
knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
new_former = fields.Selection([('0', '新'), ('1', '旧')], string='新/旧', readonly=True)
- tool_loading_length = fields.Float(strin='总长度(mm)', readonly=True)
+ tool_loading_length = fields.Float(string='总长度(mm)', readonly=True)
functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
effective_length = fields.Float(string='有效长(mm)', readonly=True)
loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
diff --git a/sf_tool_management/views/tool_base_views.xml b/sf_tool_management/views/tool_base_views.xml
index 01779a2d..86c42c92 100644
--- a/sf_tool_management/views/tool_base_views.xml
+++ b/sf_tool_management/views/tool_base_views.xml
@@ -1099,7 +1099,7 @@
-
+