Merge branch 'feature/自动生成二维码' into feature/序列号添加二维码

sf_tool_management/controllers/controllers.py

@@ -12,7 +12,7 @@ class Manufacturing_Connect(http.Controller):
                 cors="*")
     def get_equipment_tool_Info(self, **kw):
         """
-        机床当前刀库实时信息
+        机床刀库实时信息
         :param kw:
         :return:
         """
@@ -31,6 +31,7 @@ class Manufacturing_Connect(http.Controller):
                     for equipment_tool_id in item.product_template_ids:
                         functional_tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
                             [('code', '=', equipment_tool_id.tool_code)])
+
                         alarm_time = None
                         if functional_tool_id.functional_tool_status == '报警':
                             alarm_time = self.env['sf.functional.tool.warning'].sudo().search(