Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/刀具产品调取Cloud刀具标准库（10.11）

2023-11-01 17:46:24 +08:00
parent 108cb96ca5 03efa01a85
commit 0b7dc6d09a
23 changed files with 665 additions and 620 deletions
--- a/sf_manufacturing/models/model_type.py
+++ b/sf_manufacturing/models/model_type.py
@@ -6,7 +6,7 @@ class ResProductCategory(models.Model):

    type = fields.Selection(
        [("成品", "成品"), ("坯料", "坯料"), ("原材料", "原材料"), ("表面工艺", "表面工艺"), ("刀具", "刀具"),
-         ("夹具", "夹具")],
+         ("夹具", "夹具"), ("功能刀具", "功能刀具")],
        default="", string="类型")