Accept Merge Request #889: (feature/功能刀具注册优化 -> develop)

Merge Request: 刀具管理模块新增功能刀具相关模型注册到mrs接口

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/889?initial=true

sf_tool_management/models/__init__.py

@@ -2,4 +2,5 @@ from . import base
 from . import tool_material_search
 from . import maintenance_equipment
 from . import mrp_workorder
+from . import functional_tool_enroll
 

sf_tool_management/models/functional_tool_enroll.py

@@ -0,0 +1,351 @@
+import json
+import base64
+import requests
+from odoo import models, api
+from odoo.addons.sf_base.commons.common import Common
+from odoo.exceptions import UserError
+
+
+class StockLot(models.Model):
+    _inherit = 'stock.lot'
+    _description = '刀具物料序列号注册'
+
+    crea_url = "/api/tool_material_stock/create"
+
+    def enroll_tool_material_stock(self):
+        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(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.env['stock.lot'].search([('id', '=', self.id)])
+        tool_material_stock_list = []
+        if objs_all:
+            for item in objs_all:
+                val = {
+                    'name': item.name,
+                    'tool_material_status': item.tool_material_status,
+                    'location': item.quant_ids[-1].location_id.name
+                }
+                tool_material_stock_list.append(val)
+            kw = json.dumps(tool_material_stock_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            if r == 200:
+                return '刀具物料序列号注册成功'
+        else:
+            raise UserError("没有注册刀具物料序列号信息")
+
+    @api.onchange('quant_ids')
+    def _onchange_quant_ids(self):
+        for item in self:
+            if item.product_id.categ_id == '刀具':
+                item.enroll_tool_material_stock()
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super(StockLot, self).create(vals_list)
+        for record in records:
+            if record.product_id.categ_id == '刀具':
+                record.enroll_tool_material_stock()
+        return records
+
+
+class ToolMaterial(models.Model):
+    _inherit = 'sf.tool.material.search'
+    _description = '刀具物料注册'
+
+    crea_url = '/api/tool_material/create'
+
+    def enroll_tool_material(self):
+        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(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.search([('id', '=', self.id)])
+        tool_material_list = []
+        if objs_all:
+            for item in objs_all:
+                barcode_names = []
+                for barcode_id in item.barcode_ids:
+                    if barcode_id.name:
+                        barcode_names.append(barcode_id.name)
+                val = {
+                    'name': item.name,
+                    'code': item.code,
+                    'cutting_tool_material_code': item.cutting_tool_material_id.code,
+                    'cutting_tool_standard_library_code': item.cutting_tool_standard_library_id.code,
+                    'specification_name': item.specification_id.name,
+                    'image': item.image,
+                    'number': item.number,
+                    'usable_num': item.usable_num,
+                    'have_been_used_num': item.have_been_used_num,
+                    'scrap_num': item.scrap_num,
+                    'barcode_names': str(barcode_names),
+                    'active': item.active
+                }
+                tool_material_list.append(val)
+            kw = json.dumps(tool_material_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            if r == 200:
+                return '刀具物料注册成功'
+        else:
+            raise UserError("没有注册刀具物料信息")
+
+
+class FunctionalCuttingToolEntity(models.Model):
+    _inherit = 'sf.functional.cutting.tool.entity'
+    _description = '功能刀具列表注册'
+
+    crea_url = "/api/functional_tool_entity/create"
+
+    # 注册同步功能刀具列表
+    def enroll_functional_tool_entity(self):
+        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(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)])
+        functional_tool_list = []
+        if objs_all:
+            for item in objs_all:
+                val = {
+                    'id': item.id,
+                    'code': item.code,
+                    'name': item.name,
+                    'tool_groups_name': item.tool_groups_id.name,
+                    'barcode': item.barcode_id.name,
+                    'cutting_tool_type_code': item.sf_cutting_tool_type_id.code,
+                    'functional_tool_diameter': item.functional_tool_diameter,
+                    'knife_tip_r_angle': item.knife_tip_r_angle,
+                    'coarse_middle_thin': item.coarse_middle_thin,
+                    'new_former': item.new_former,
+                    'tool_loading_length': item.tool_loading_length,
+                    'functional_tool_length': item.functional_tool_length,
+                    'effective_length': item.effective_length,
+                    'tool_room_num': item.tool_room_num,
+                    'line_edge_knife_library_num': item.line_edge_knife_library_num,
+                    'machine_knife_library_num': item.machine_knife_library_num,
+                    'max_lifetime_value': item.max_lifetime_value,
+                    'alarm_value': item.alarm_value,
+                    'used_value': item.used_value,
+                    'functional_tool_status': item.functional_tool_status,
+                    'current_location': item.current_location,
+                    'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
+                    'whether_standard_knife': item.whether_standard_knife,
+                    'L_D_number': item.L_D_number,
+                    'hiding_length': item.hiding_length,
+                    'cut_time': item.cut_time,
+                    'cut_length': item.cut_length,
+                    'cut_number': item.cut_number,
+                    'cutting_tool_integral_model_code': item.cutting_tool_integral_model_id.code,
+                    'cutting_tool_blade_model_code': item.cutting_tool_blade_model_id.code,
+                    'cutting_tool_cutterbar_model_code': item.cutting_tool_cutterbar_model_id.code,
+                    'cutting_tool_cutterpad_model_code': item.cutting_tool_cutterpad_model_id.code,
+                    'cutting_tool_cutterhandle_model_code': item.cutting_tool_cutterhandle_model_id.code,
+                    'cutting_tool_cutterhead_model_code': item.cutting_tool_cutterhead_model_id.code,
+                    'active': item.active,
+                }
+                functional_tool_list.append(val)
+            kw = json.dumps(functional_tool_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            # self.code = ret['data']
+            # self.state_zc = "已注册"
+            if r == 200:
+                return "功能刀具注册成功"
+        else:
+            raise UserError("没有注册功能刀具信息")
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super(FunctionalCuttingToolEntity, self).create(vals_list)
+        for record in records:
+            if record:
+                record.enroll_functional_tool_entity()
+        return records
+
+
+class FunctionalToolWarning(models.Model):
+    _inherit = 'sf.functional.tool.warning'
+    _description = '功能刀具预警注册'
+
+    crea_url = "/api/functional_tool_warning/create"
+
+    # 注册同步功能刀具预警
+    def enroll_functional_tool_warning(self):
+        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(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)])
+        tool_warning_list = []
+        if objs_all:
+            for item in objs_all:
+                val = {
+                    'id': item.id,
+                    'name': item.name,
+                    'code': item.code,
+                    'tool_groups_name': item.tool_groups_id.name,
+                    'production_line': item.production_line_id.name,
+                    'machine_tool_id': item.maintenance_equipment_id.code,
+                    'machine_tool_code': item.machine_tool_code,
+                    'machine_table_type_code': item.machine_table_type_id.code,
+                    'cutter_spacing_code': item.cutter_spacing_code_id.code,
+                    'functional_tool_name': item.name,
+                    'barcode': item.barcode_id.name,
+                    'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code,
+                    'diameter': item.diameter,
+                    'knife_tip_r_angle': item.knife_tip_r_angle,
+                    'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'on_board_time': item.on_board_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'max_lifetime_value': item.max_lifetime_value,
+                    'alarm_value': item.alarm_value,
+                    'used_value': item.used_value,
+                    'functional_tool_status': item.functional_tool_status,
+                    'alarm_time': item.alarm_time,
+                    'dispose_user': item.dispose_user,
+                    'dispose_time': item.dispose_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'dispose_func': item.dispose_func,
+                }
+                tool_warning_list.append(val)
+            kw = json.dumps(tool_warning_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            # self.code = ret['data']
+            # self.state_zc = "已注册"
+            if r == 200:
+                return "功能刀具预警注册成功"
+        else:
+            raise UserError("没有注册功能刀具预警信息")
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super(FunctionalToolWarning, self).create(vals_list)
+        for record in records:
+            if record:
+                record.enroll_functional_tool_warning()
+        return records
+
+
+class StockMoveLine(models.Model):
+    _inherit = 'stock.move.line'
+    _description = '功能刀具出入库记录注册'
+
+    crea_url = "/api/functional_tool_move/create"
+
+    # 注册同步功能刀具出入库记录
+    def enroll_functional_tool_move(self):
+        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(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.env['stock.move.line'].search([('id', '=', self.id), ('functional_tool_name_id', '!=', False)])
+        tool_stock_list = []
+        if objs_all:
+            for item in objs_all:
+                val = {
+                    'id': item.id,
+                    'name': item.functional_tool_name_id.name,
+                    'code': item.code,
+                    'tool_groups_name': item.tool_groups_id.name,
+                    'reference': item.reference,
+                    'barcode': item.lot_id.name,
+                    'functional_tool_type_code': item.functional_tool_type_id.code,
+                    'diameter': item.diameter,
+                    'knife_tip_r_angle': item.knife_tip_r_angle,
+                    'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'location_id': item.location_id.name,
+                    'location_dest_name': item.location_dest_id.name,
+                    'date': item.date.strftime('%Y-%m-%d %H:%M:%S'),
+                    'qty_done': item.qty_done,
+                }
+                tool_stock_list.append(val)
+            kw = json.dumps(tool_stock_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            # self.code = ret['data']
+            # self.state_zc = "已注册"
+            if r == 200:
+                return "功能刀具出入库记录注册成功"
+        else:
+            raise UserError("没有注册功能刀具出入库记录信息")
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super(StockMoveLine, self).create(vals_list)
+        for record in records:
+            if record.functional_tool_name_id:
+                record.enroll_functional_tool_move()
+        return records
+
+
+class RealTimeDistributionFunctionalTools(models.Model):
+    _inherit = 'sf.real.time.distribution.of.functional.tools'
+    _description = '功能刀具安全库存注册'
+
+    crea_url = "/api/functional_tool_distribution/create"
+
+    # 注册同步功能刀具预警
+    def enroll_functional_tool_real_time_distribution(self):
+        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(self, token, sf_secret_key)
+        str_url = sf_sync_config['sf_url'] + self.crea_url
+        objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([('id', '=', self.id)])
+        tool_distribution_list = []
+        if objs_all:
+            for item in objs_all:
+                functional_tool_codes = []
+                for obj in item.sf_functional_cutting_tool_entity_ids:
+                    functional_tool_codes.append(obj.code)
+                val = {
+                    'id': item.id,
+                    'name': item.name,
+                    'tool_groups_name': item.tool_groups_id.name,
+                    'sf_cutting_tool_type_code': item.sf_cutting_tool_type_id.code,
+                    'diameter': item.diameter,
+                    'knife_tip_r_angle': item.knife_tip_r_angle,
+                    'tool_stock_num': item.tool_stock_num,
+                    'side_shelf_num': item.side_shelf_num,
+                    'on_tool_stock_num': item.on_tool_stock_num,
+                    'tool_stock_total': item.tool_stock_total,
+                    'min_stock_num': item.min_stock_num,
+                    'max_stock_num': item.max_stock_num,
+                    'batch_replenishment_num': item.batch_replenishment_num,
+                    'unit': item.unit,
+                    'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
+                    'functional_tool_codes': str(functional_tool_codes),
+                    'whether_standard_knife': item.whether_standard_knife,
+                    'coarse_middle_thin': item.coarse_middle_thin,
+                    'active': item.active
+                }
+                tool_distribution_list.append(val)
+            kw = json.dumps(tool_distribution_list, ensure_ascii=False)
+            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+            ret = r.json()
+            # self.code = ret['data']
+            # self.state_zc = "已注册"
+            if r == 200:
+                return "功能刀具出入库记录注册成功"
+        else:
+            raise UserError("没有注册功能刀具出入库记录信息")
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        records = super(RealTimeDistributionFunctionalTools, self).create(vals_list)
+        for record in records:
+            if record.functional_tool_name_id:
+                record.enroll_functional_tool_move()
+        return records
+
+    def write(self, vals):
+        res = super().write(vals)
+        self.enroll_functional_tool_move()
+        return res

sf_tool_management/models/maintenance_equipment.py

@@ -104,10 +104,11 @@ class StockLot(models.Model):
     def _compute_tool_material_status(self):
         for record in self:
             if record:
-                if record.quant_ids[-1].location_id.name == '刀具组装位置':
-                    record.tool_material_status = '在用'
-                else:
-                    record.tool_material_status = '可用'
+                if record.quant_ids:
+                    if record.quant_ids[-1].location_id.name == '刀具组装位置':
+                        record.tool_material_status = '在用'
+                    else:
+                        record.tool_material_status = '可用'
 
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):

sf_tool_management/models/tool_material_search.py

@@ -311,6 +311,7 @@ class ToolMaterial(models.Model):
     product_id = fields.Many2one('product.product', string='刀具物料产品')
 
     name = fields.Char('名称', related='product_id.name')
+    code = fields.Char('编码', store=True)
     cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', '刀具物料',
                                                related='product_id.cutting_tool_material_id',
                                                store=True,
@@ -330,6 +331,14 @@ class ToolMaterial(models.Model):
 
     active = fields.Boolean(string='已归档', default=True)
 
+    @api.depends('product_id')
+    def _compute_code(self):
+        for record in self:
+            if record:
+                code = '%s_%s' % (record.cutting_tool_standard_library_id.code, record.specification_id.name)
+                obj = self.search([('code', 'like', code)], limit=1, order="id desc")
+                record.code = '%s_%03d' % (code, 1 if obj else int(obj.code[-3:]) + 1)
+
     @api.depends('barcode_ids')
     def _compute_number(self):
         for record in self:

sf_tool_management/views/tool_base_views.xml

@@ -40,6 +40,8 @@
             <field name="arch" type="xml">
                 <form create="0" edit="0" delete="0">
                     <header>
+                        <button name="enroll_functional_tool_entity" string="功能刀具注册" type="object"
+                                class="btn-primary"/>
                         <field name="functional_tool_status" widget="statusbar" statusbar_visible="正常,报警,已拆除"/>
                     </header>
                     <sheet>
@@ -243,6 +245,8 @@
                     <field name="dispose_user"/>
                     <field name="dispose_time"/>
                     <field name="dispose_func"/>
+                    <button name="enroll_functional_tool_warning" string="刀具预警注册" type="object"
+                            class="btn-primary"/>
                 </tree>
             </field>
         </record>
@@ -318,6 +322,10 @@
             <field name="model">sf.real.time.distribution.of.functional.tools</field>
             <field name="arch" type="xml">
                 <form>
+                    <header>
+                        <button name="enroll_functional_tool_real_time_distribution" string="安全库存注册" type="object"
+                                class="btn-primary"/>
+                    </header>
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -454,6 +462,7 @@
                     <field name="date"/>
                     <field name="qty_done" string="数量"/>
                     <field name="functional_tool_type_id" invisible="True"/>
+                    <button name="enroll_functional_tool_move" string="安全库存注册" type="object" class="btn-primary"/>
                 </tree>
             </field>
         </record>

sf_tool_management/views/tool_material_search.xml

@@ -22,6 +22,9 @@
             <field name="model">sf.tool.material.search</field>
             <field name="arch" type="xml">
                 <form string="刀具物料查询" create="0">
+                    <header>
+                        <button string="刀具物料注册" name="enroll_tool_material" type="object" class="btn-primary"/>
+                    </header>
                     <sheet>
                         <div class="oe_title">
                             <h1>