Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化消息模版

# Conflicts: # sf_tool_management/models/base.py
2024-09-18 15:40:54 +08:00
parent ce6b36a77e 213b76a280
commit 8bf1c56efd
34 changed files with 1959 additions and 669 deletions
--- a/sf_manufacturing/manifest.py
+++ b/sf_manufacturing/manifest.py
@@ -45,7 +45,6 @@
            'sf_manufacturing/static/src/scss/kanban_change.scss',
            'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
            'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
-            'sf_manufacturing/static/src/js/custom_barcode_handlers.js',
        ]

    },