Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into develop

2023-10-23 17:36:15 +08:00
parent dc8aecba93
commit 919a200750
13 changed files with 372 additions and 10 deletions
--- a/sf_base/models/tool_other_features.py
+++ b/sf_base/models/tool_other_features.py
@@ -9,7 +9,6 @@ class ToolMaterialsBasicParameters(models.Model):
    specification_id = fields.Many2one('sf.cutting_tool.specification.wizard', string='刀具规格')
    cutting_tool_type = fields.Char(related='standard_library_id.cutting_tool_type', string='刀具物料类型',
                                    store=True)
-    # cutting_tool_type_1 = fields.Char(related='cutting_tool_type', string='类型', store=True)

    # 整体式刀具参数
    code = fields.Char('物料号', size=50)