Merge branch refs/heads/develop into refs/heads/hotfix/刀具预调仪

2024-06-06 09:30:50 +08:00
parent f4926820fe e306d02ff2
commit fd6b579e2a
13 changed files with 356 additions and 155 deletions
--- a/sf_tool_management/models/tool_material_search.py
+++ b/sf_tool_management/models/tool_material_search.py
@@ -46,6 +46,8 @@ class ToolMaterial(models.Model):
            record.scrap_num = scrap_num
            record.number = usable_num + have_been_used_num + scrap_num

+
+
    @api.model
    def _read_group_cutting_tool_material_id(self, categories, domain, order):
        cutting_tool_material_id = categories._search([], order=order, access_rights_uid=SUPERUSER_ID)