Accept Merge Request #216: (feature/sf刀具功能分支 -> develop)

Merge Request: 优化了功能刀具自动申请装刀功能的数据显示问题


Created By: @禹翔辉
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/216?initial=true

sf_tool_management/models/base.py

@@ -157,9 +157,9 @@ class MachineTableToolChangingApply(models.Model):
                     'replacement_tool_type': self.functional_tool_type,
                     'replacement_tool_coarse_middle_thin': self.coarse_middle_thin,
                     'new_former': '0',
-                    'applicant': None,
+                    'applicant': '自动申请',
                     'used_tool_time': fields.Datetime.now(),
-                    'reason_for_applying': None,
+                    'reason_for_applying': '功能刀具状态异常',
                     'remark': None,
                     'status': '1'
             })
@@ -171,12 +171,12 @@ class MachineTableToolChangingApply(models.Model):
                 'functional_tool_type': self.functional_tool_type,
                 'functional_tool_diameter': self.diameter,
                 'loading_task_source': '1',
-                'applicant': self.applicant,
-                'reason_for_applying': self.reason_for_applying,
+                'applicant': '自动申请',
+                'reason_for_applying': '功能刀具状态异常',
                 'use_tool_time': self.used_tool_time,
                 'machine_tool_name': self.CNC_machine_table,
                 'machine_tool_code': self.machine_tool_code,
-                'cutter_spacing_code': self.cutter_spacing_code
+                'cutter_spacing_code': self.cutter_spacing_code,
             })