Merge branch 'hotfix/新增刀具按批次管理' into hotfix/新增刀具按批次管理_1.1

# Conflicts: # sf_tool_management/controllers/controllers.py
2024-06-06 09:17:32 +08:00
parent 07b1c3cceb b6acbb8357
commit 206fc7bb21
14 changed files with 558 additions and 296 deletions
--- a/sf_tool_management/controllers/controllers.py
+++ b/sf_tool_management/controllers/controllers.py
@@ -126,4 +126,4 @@ class Manufacturing_Connect(http.Controller):
        except Exception as e:
            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
            logging.info('put_tool_preset_parameter_port error:%s' % e)
-        return json.JSONEncoder().encode(res)
+        return json.JSONEncoder().encode(res)