1、优化刀具物料接口、优化功能刀具安全库存接口、优化功能刀具预警接口；2、优化功能刀具组装流程；3、优化刀具物料序列号同步步骤；

sf_tool_management/models/base.py

@@ -16,7 +16,7 @@ class FunctionalCuttingToolEntity(models.Model):
     tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
     code = fields.Char('编码', related='functional_tool_name_id.code')
     rfid = fields.Char('rfid', readonly=True)
-    name = fields.Char(related='functional_tool_name_id.name')
+    name = fields.Char('名称')
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称', readonly=True)
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
     sf_cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀具型号')
@@ -69,22 +69,15 @@ class FunctionalCuttingToolEntity(models.Model):
         """
         for obj in self:
             if obj.current_location_id:
+                obj.tool_room_num = 0
+                obj.line_edge_knife_library_num = 0
+                obj.machine_knife_library_num = 0
                 if obj.current_location in ['刀具房']:
                     obj.tool_room_num = 1
-                    obj.line_edge_knife_library_num = 0
-                    obj.machine_knife_library_num = 0
                 elif "线边刀库" in obj.current_location:
-                    obj.tool_room_num = 0
                     obj.line_edge_knife_library_num = 1
-                    obj.machine_knife_library_num = 0
                 elif "机内刀库" in obj.current_location:
-                    obj.tool_room_num = 0
-                    obj.line_edge_knife_library_num = 0
                     obj.machine_knife_library_num = 1
-                else:
-                    obj.tool_room_num = 0
-                    obj.line_edge_knife_library_num = 0
-                    obj.machine_knife_library_num = 0
 
     @api.model
     def _read_group_mrs_cutting_tool_type_id(self, categories, domain, order):
@@ -193,36 +186,35 @@ class FunctionalCuttingToolEntity(models.Model):
         stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')])
         # 创建功能刀具该批次/序列号  库存移动和移动历史
         self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id,
-                                           self.functional_tool_name_id.id, '机床装刀')
+                                           self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id)
 
+    # ==========刀具组接口==========
+    # def _register_functional_tool_groups(self, obj):
+    #     create_url = '/AutoDeviceApi/ToolGroup'
+    #     sf_sync_config = self.env['res.config.settings'].get_values()
+    #     token = sf_sync_config['token']
+    #     sf_secret_key = sf_sync_config['sf_secret_key']
+    #     headers = Common.get_headers(obj, token, sf_secret_key)
+    #     strurl = sf_sync_config['sf_url'] + create_url
+    #     val = {
+    #         'ToolName': obj.name,
+    #         'GroupName': obj.tool_groups_id.name,
+    #         'ToolId': obj.code
+    #     }
+    #     kw = json.dumps(val, ensure_ascii=False)
+    #     r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
+    #     ret = r.json()
+    #     if r == 200:
+    #         return "刀具组发送成功"
+    #     else:
+    #         raise ValidationError("刀具组发送失败")
 
-# ==========刀具组接口==========
-# def _register_functional_tool_groups(self, obj):
-#     create_url = '/AutoDeviceApi/ToolGroup'
-#     sf_sync_config = self.env['res.config.settings'].get_values()
-#     token = sf_sync_config['token']
-#     sf_secret_key = sf_sync_config['sf_secret_key']
-#     headers = Common.get_headers(obj, token, sf_secret_key)
-#     strurl = sf_sync_config['sf_url'] + create_url
-#     val = {
-#         'ToolName': obj.name,
-#         'GroupName': obj.tool_groups_id.name,
-#         'ToolId': obj.code
-#     }
-#     kw = json.dumps(val, ensure_ascii=False)
-#     r = requests.post(strurl, json={}, data={'kw': kw, 'token': token}, headers=headers)
-#     ret = r.json()
-#     if r == 200:
-#         return "刀具组发送成功"
-#     else:
-#         raise ValidationError("刀具组发送失败")
-
-# @api.model_create_multi
-# def create(self, vals):
-#     obj = super(FunctionalCuttingToolEntity, self).create(vals)
-#     # 调用刀具组接口
-#     self._register_functional_tool_groups(obj)
-#     return obj
+    # @api.model_create_multi
+    # def create(self, vals):
+    #     obj = super(FunctionalCuttingToolEntity, self).create(vals)
+    #     # 调用刀具组接口
+    #     self._register_functional_tool_groups(obj)
+    #     return obj
 
 
 class FunctionalToolWarning(models.Model):
@@ -238,7 +230,8 @@ class FunctionalToolWarning(models.Model):
                                          group_expand='_read_group_machine_table_name_ids')
     maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='CNC机床')
     machine_tool_code = fields.Char(string='机台号', related='maintenance_equipment_id.name')
-    machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型')
+    machine_table_type_id = fields.Many2one('maintenance.equipment.category', string='机床类型',
+                                            related='maintenance_equipment_id.category_id')
     cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号',
                                              domain="[('equipment_id', '=', maintenance_equipment_id)]")
     # 功能刀具信息
@@ -297,14 +290,14 @@ class StockMoveLine(models.Model):
 
     functional_tool_name_id = fields.Many2one('sf.functional.tool.assembly', string='功能刀具名称')
     functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
-                                              group_expand='_read_group_functional_tool_type_id',
-                                              related='functional_tool_name_id.functional_tool_type_id')
-    diameter = fields.Integer(string='刀具直径(mm)', related='functional_tool_name_id.functional_tool_diameter')
-    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', related='functional_tool_name_id.knife_tip_r_angle')
-    install_tool_time = fields.Datetime("刀具组装时间", related='functional_tool_name_id.tool_loading_time')
-    code = fields.Char('编码', related='functional_tool_name_id.code')
-    rfid = fields.Char('rfid', related='functional_tool_name_id.rfid')
-    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', related='functional_tool_name_id.tool_groups_id')
+                                              group_expand='_read_group_functional_tool_type_id')
+    functional_tool_name = fields.Char('刀具名称')
+    diameter = fields.Integer(string='刀具直径(mm)')
+    knife_tip_r_angle = fields.Float(string='刀尖R角(mm)')
+    install_tool_time = fields.Datetime("刀具组装时间", default=fields.Datetime.now())
+    code = fields.Char('编码')
+    rfid = fields.Char('rfid')
+    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组')
 
     @api.model
     def _read_group_functional_tool_type_id(self, categories, domain, order):
@@ -441,17 +434,17 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         计算刀具房数量、线边刀库数量、机内刀库数量
         """
         if tool:
-            tool.sudo().tool_stock_num = 0
-            tool.sudo().side_shelf_num = 0
-            tool.sudo().on_tool_stock_num = 0
+            tool.tool_stock_num = 0
+            tool.side_shelf_num = 0
+            tool.on_tool_stock_num = 0
             if tool.sf_functional_cutting_tool_entity_ids:
                 for cutting_tool in tool.sf_functional_cutting_tool_entity_ids:
                     if cutting_tool.tool_room_num > 0:
-                        tool.sudo().tool_stock_num += 1
+                        tool.tool_stock_num += 1
                     elif cutting_tool.line_edge_knife_library_num > 0:
-                        tool.sudo().side_shelf_num += 1
+                        tool.side_shelf_num += 1
                     elif cutting_tool.machine_knife_library_num > 0:
-                        tool.sudo().on_tool_stock_num += 1
+                        tool.on_tool_stock_num += 1
 
     def create_or_edit_safety_stock(self, vals, sf_functional_cutting_tool_entity_ids):
         """
@@ -478,6 +471,14 @@ class RealTimeDistributionOfFunctionalTools(models.Model):
         records = super(RealTimeDistributionOfFunctionalTools, self).create(vals_list)
         return records
 
+    def write(self, vals):
+        res = super().write(vals)
+        for item in self:
+            if item:
+                if vals.get('min_stock_num') or vals.get('max_stock_num'):
+                    item.enroll_functional_tool_real_time_distribution()
+        return res
+
 
 class MachineTableToolChangingApply(models.Model):
     _name = 'sf.machine.table.tool.changing.apply'