Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/优化返工和重新制造订单

jikimo_frontend/static/src/scss/custom_style.scss

@@ -503,4 +503,16 @@ div:has(.o_required_modifier) > label::before {
   color: #fff;
   background-color: #4A4F59;
   border-color: #4A4F59;
+}
+
+// 功能刀具组装单 弹窗样式
+.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div.col-lg-6 .o_inner_group.col-lg-6 {
+  width: 100%;
+}
+.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div .o_inner_group .o_wrap_field.d-flex.d-sm-contents.flex-column{
+  display: flex!important;
+  flex-direction: row!important;
+  input {
+    border-bottom: 1px solid;
+  }
 }

sf_manufacturing/security/ir.model.access.csv

@@ -126,7 +126,8 @@ access_sf_cnc_processing,sf.cnc.processing,model_sf_cnc_processing,sf_base.group
 access_sf_cmm_program_group_plan_dispatch,sf_cmm_program_group_plan_dispatch,model_sf_cmm_program,sf_base.group_plan_dispatch,1,0,0,0
 
 
-access_mrp_workcenter_productivity,mrp.workcenter.productivity,mrp.model_mrp_workcenter_productivity,sf_base.group_plan_dispatch,1,0,0,0
+access_mrp_workcenter_productivity_group_plan_dispatch,mrp.workcenter.productivity.group_plan_dispatch,mrp.model_mrp_workcenter_productivity,sf_base.group_plan_dispatch,1,0,0,0
+access_mrp_workcenter_productivity_group_sf_stock_user,mrp.workcenter.productivity.group_sf_stock_user,mrp.model_mrp_workcenter_productivity,sf_base.group_sf_stock_user,1,0,0,0
 access_maintenance_equipment_tool_group_plan_dispatch,maintenance.equipment.tool,sf_manufacturing.model_maintenance_equipment_tool,sf_base.group_plan_dispatch,1,0,0,0
 
 access_sf_workpiece_delivery_group_plan_dispatch,sf_workpiece_delivery_group_plan_dispatch,sf_manufacturing.model_sf_workpiece_delivery,sf_base.group_plan_dispatch,1,1,0,0

sf_mrs_connect/models/sync_common.py

@@ -2116,19 +2116,21 @@ class CuttingSpeed(models.Model):
             for item in result['feed_per_tooth_all_list']:
                 feed_per_tooth = self.search([("name", '=', item['name']), ('active', 'in', [True, False])])
                 if not feed_per_tooth:
-                    self.create({
+                    _logger.info("item[standard_library_code] %s" % item.get('standard_library_code'))
-                        'name': item['name'],
+                    if item.get('standard_library_code'):
-                        'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
+                        self.create({
-                            [('code', '=', item['standard_library_code'].replace("JKM", result[
+                            'name': item['name'],
-                                'factory_short_name']))]).id,
+                            'standard_library_id': self.env['sf.cutting_tool.standard.library'].search(
-                        'materials_type_id': self.env['sf.materials.model'].search(
+                                [('code', '=', item['standard_library_code'].replace("JKM", result[
-                            [('materials_no', '=', item['materials_type_code'])]).id,
+                                    'factory_short_name']))]).id,
-                        'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
+                            'materials_type_id': self.env['sf.materials.model'].search(
-                            [('name', '=', item['cutting_width_depth'])]).id,
+                                [('materials_no', '=', item['materials_type_code'])]).id,
-                        'blade_diameter': item['blade_diameter'],
+                            'cutting_width_depth_id': self.env['sf.cutting.width.depth'].search(
-                        'feed_per_tooth': item['feed_per_tooth'],
+                                [('name', '=', item['cutting_width_depth'])]).id,
-                        'active': item['active'],
+                            'blade_diameter': item['blade_diameter'],
-                    })
+                            'feed_per_tooth': item['feed_per_tooth'],
+                            'active': item['active'],
+                        })
                 else:
                     feed_per_tooth.write({
                         'materials_type_id': self.env['sf.materials.model'].search(

sf_tool_management/controllers/controllers.py

@@ -36,3 +36,34 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('get_functional_tool_groups_Info error:%s' % e)
         return json.JSONEncoder().encode(res)
+
+    @http.route('/AutoDeviceApi/PutToolParameter', type='http', auth='none', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def put_tool_preset_parameter_port(self, **kw):
+        """
+        刀具预调仪接口
+        :param kw:
+        :return:
+        """
+        logging.info('put_tool_preset_parameter_port:%s' % kw)
+        res = {'Succeed': True, 'Datas': []}
+        try:
+            datas = request.httprequest.data
+            ret = str(datas, 'utf-8')
+            data_lists = ret.split(",")
+            data_list = [data.replace('+', '') for data in data_lists]
+            logging.info(data_list)
+            tool_assembly = request.env['sf.functional.tool.assembly'].sudo().search(
+                [('assembly_order_code', '=', data_list[0])])
+            if not tool_assembly:
+                return json.JSONEncoder().encode(
+                    {'Succeed': False, 'ErrorCode': 201, 'Error': '没有找到组装单！'})
+            tool_assembly.write({
+                'after_assembly_tool_loading_length': float(data_list[1]),  # 高度(总长度)
+                'after_assembly_functional_tool_diameter': float(data_list[2] or "0"),  # 直径
+                'after_assembly_knife_tip_r_angle': float(data_list[3] or "0")  # R角
+            })
+        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)

sf_tool_management/data/tool_data.xml

@@ -5,8 +5,8 @@
         <field name="model_id" ref="model_sf_tool_datasync"/>
         <field name="state">code</field>
         <field name="code">model._cron_tool_datasync_all()</field>
-        <field name="interval_number">1</field>
+        <field name="interval_number">12</field>
-        <field name="interval_type">days</field>
+        <field name="interval_type">hours</field>
         <field name="numbercall">-1</field>
     </record>
 </odoo>

sf_tool_management/models/base.py

@@ -538,12 +538,13 @@ class FunctionalToolAssembly(models.Model):
     chuck_name = fields.Char('')
     # ==============================================
     # 组装功能刀具参数信息
+    start_preset_bool = fields.Boolean('开始预调', default=False)
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
     after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
     after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
                                                              string='组装后功能刀具类型', readonly=True)
-    after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True)
+    after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True, digits=(10, 3))
-    after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True)
+    after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True, digits=(10, 3))
     after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True)
     cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
     cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
@@ -555,7 +556,7 @@ class FunctionalToolAssembly(models.Model):
     after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
     after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True)
     after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
-    after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True)
+    after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3))
     after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True)
     after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
     L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
@@ -574,29 +575,59 @@ class FunctionalToolAssembly(models.Model):
 
     active = fields.Boolean(string='已归档', default=True)
 
+    def put_start_preset(self):
+        self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
+        self.write({'start_preset_bool': True})
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'sf.functional.tool.assembly.order',
+            'name': '功能刀具组装单',
+            'view_mode': 'form',
+            'target': 'new',
+            'context': {'default_name': self.name,
+                        'default_assembly_order_code': self.assembly_order_code,
+                        'default_production_line_name_id': self.production_line_name_id,
+                        'default_machine_tool_name_id': self.machine_tool_name_id,
+                        'default_cutter_spacing_code_id': self.cutter_spacing_code_id,
+                        'default_functional_tool_name': self.functional_tool_name,
+                        'default_functional_tool_type_id': self.functional_tool_type_id,
+                        'default_tool_groups_id': self.tool_groups_id,
+                        'default_functional_tool_diameter': self.functional_tool_diameter,
+                        'default_knife_tip_r_angle': self.knife_tip_r_angle,
+                        'default_tool_loading_length': self.tool_loading_length,
+                        'default_functional_tool_length': self.functional_tool_length,
+                        'default_effective_length': self.effective_length,
+                        'default_whether_standard_knife': self.whether_standard_knife,
+                        'default_coarse_middle_thin': self.coarse_middle_thin,
+                        'default_new_former': self.new_former,
+                        'default_use_tool_time': self.use_tool_time,
+                        'default_reason_for_applying': self.reason_for_applying
+                        }
+        }
+
     def _get_code(self, loading_task_source):
         """
         自动生成组装单编码
         """
         new_time = str(fields.Date.today())
-        datetime = new_time[2:4] + new_time[5:7] + new_time[-2:]
+        datetime = new_time[2:4] + new_time[5:7]
+        if loading_task_source == '0':
+            code = 'C' + datetime
+        elif loading_task_source == '1':
+            code = 'J' + datetime
+        elif loading_task_source == '2':
+            code = 'K' + datetime
+        else:
+            code = False
         functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
             [('loading_task_source', '=', loading_task_source),
-             ('assembly_order_code', 'ilike', datetime)], limit=1, order="id desc")
+             ('assembly_order_code', 'ilike', code)], limit=1, order="id desc")
         if not functional_tool_assembly:
             num = "%03d" % 1
         else:
             m = int(functional_tool_assembly.assembly_order_code[-3:]) + 1
             num = "%03d" % m
-        if loading_task_source == '0':
+        return code + str(num)
-            code = 'CAMZZD' + datetime + str(num)
-        elif loading_task_source == '1':
-            code = 'JTZZD' + datetime + str(num)
-        elif loading_task_source == '2':
-            code = 'MTSZZD' + datetime + str(num)
-        else:
-            code = False
-        return code
 
     def get_functional_tool(self, val):
         functional_tools = self.env['sf.functional.tool.assembly'].search(

sf_tool_management/models/fixture_enroll.py

@@ -1,6 +1,7 @@
 import json
 import base64
 import requests
+import logging
 from odoo import models, api
 from odoo.addons.sf_base.commons.common import Common
 from odoo.exceptions import UserError
@@ -10,30 +11,36 @@ class StockLot(models.Model):
     _inherit = 'stock.lot'
     _description = '夹具物料序列号注册'
 
-    def enroll_fixture_material_stock(self):
+    def sync_enroll_fixture_material_stock_all(self):
+        logging.info("调用 sync_enroll_fixture_material_stock_all 同步接口")
         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'] + "/api/fixture_material_stock/create"
-        objs_all = self.env['stock.lot'].search([('id', '=', self.id)])
+        product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '夹具')]).ids
+        objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('product_id', 'in', product_ids)])
         fixture_material_stock_list = []
-        if objs_all:
+        try:
-            for item in objs_all:
+            if objs_all:
-                val = {
+                for item in objs_all:
-                    'name': item.name,
+                    val = {
-                    'tool_material_status': item.tool_material_status,
+                        'name': item.name,
-                    'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
+                        'tool_material_status': item.tool_material_status,
-                    'fixture_material_search_id': item.fixture_material_search_id.id,
+                        'location': [] if not item.quant_ids else item.quant_ids[-1].location_id.name,
-                }
+                        'fixture_material_search_id': item.fixture_material_search_id.id,
-                fixture_material_stock_list.append(val)
+                    }
-            kw = json.dumps(fixture_material_stock_list, ensure_ascii=False)
+                    fixture_material_stock_list.append(val)
-            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+                kw = json.dumps(fixture_material_stock_list, ensure_ascii=False)
-            ret = r.json()
+                r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
-            if ret.get('code') == 200:
+                ret = r.json()
-                return '夹具物料序列号注册成功'
+                if ret.get('code') == 200:
-        else:
+                    logging.info("夹具物料序列号每日同步成功")
-            raise UserError("没有注册夹具物料序列号信息")
+                    return '夹具物料序列号注册成功'
+            else:
+                logging.info("没有注册夹具物料序列号信息")
+        except Exception as e:
+            logging.info("夹具物料序列号同步失败:%s" % e)
 
 
 class FixtureMaterialSearch(models.Model):
@@ -42,41 +49,46 @@ class FixtureMaterialSearch(models.Model):
 
     crea_url = "/api/fixture_material/create"
 
-    def enroll_fixture_material(self):
+    def sync_enroll_fixture_material_all(self):
+        logging.info("调用 sync_enroll_fixture_material_all 同步接口")
         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)])
+        objs_all = self.search([])
         fixture_material_list = []
-        if objs_all:
+        try:
-            for obj in objs_all:
+            if objs_all:
-                val = {
+                for obj in objs_all:
-                    'name': obj.name,
+                    val = {
-                    'id': obj.id,
+                        'name': obj.name,
-                    'fixture_material_code': obj.fixture_material_id.code,
+                        'id': obj.id,
-                    'fixture_model_code': obj.fixture_model_id.code,
+                        'fixture_material_code': obj.fixture_material_id.code,
-                    'specification_name': obj.specification_fixture_id.name,
+                        'fixture_model_code': obj.fixture_model_id.code,
-                    'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'),
+                        'specification_name': obj.specification_fixture_id.name,
-                    'number': obj.number,
+                        'image': '' if not obj.image else base64.b64encode(obj.image).decode('utf-8'),
-                    'usable_num': obj.usable_num,
+                        'number': obj.number,
-                    'have_been_used_num': obj.have_been_used_num,
+                        'usable_num': obj.usable_num,
-                    'scrap_num': obj.scrap_num
+                        'have_been_used_num': obj.have_been_used_num,
-                }
+                        'scrap_num': obj.scrap_num
-                fixture_material_list.append(val)
+                    }
-            kw = json.dumps(fixture_material_list, ensure_ascii=False)
+                    fixture_material_list.append(val)
-            r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+                kw = json.dumps(fixture_material_list, ensure_ascii=False)
-            ret = r.json()
+                r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
-            if ret.get('code') == 200:
+                ret = r.json()
-                return '夹具物料注册成功'
+                if ret.get('code') == 200:
-        else:
+                    logging.info("夹具物料每日同步成功")
-            raise UserError("没有注册夹具物料信息")
+                    return '夹具物料注册成功'
+            else:
+                logging.info("没有注册夹具物料信息")
+        except Exception as e:
+            logging.info("夹具物料同步失败:%s" % e)
 
-    @api.model_create_multi
+    # @api.model_create_multi
-    def create(self, vals_list):
+    # def create(self, vals_list):
-        records = super(FixtureMaterialSearch, self).create(vals_list)
+    #     records = super(FixtureMaterialSearch, self).create(vals_list)
-        for record in records:
+    #     for record in records:
-            if record:
+    #         if record:
-                record.enroll_fixture_material()
+    #             record.enroll_fixture_material()
-        return records
+    #     return records

sf_tool_management/models/functional_tool_enroll.py

@@ -33,23 +33,26 @@ def get_suitable_coolant_names(item):
 
 class ToolDatasync(models.Model):
     _name = 'sf.tool.datasync'
-    _description = '定时同步所有刀具'
+    _description = '定时同步所有刀具、夹具'
 
     def _cron_tool_datasync_all(self):
         try:
             self.env['stock.lot'].sudo().sync_enroll_tool_material_stock_all()
-            logging.info("刀具物料序列号每日同步成功")
+
+            self.env['stock.lot'].sudo().sync_enroll_fixture_material_stock_all()
+
             self.env['sf.tool.material.search'].sudo().sync_enroll_tool_material_all()
-            logging.info("刀具物料每日同步成功")
+
+            self.env['sf.fixture.material.search'].sudo().sync_enroll_fixture_material_all()
+
             self.env['sf.functional.cutting.tool.entity'].sudo().esync_enroll_functional_tool_entity_all()
-            logging.info("功能刀具列表每日同步成功")
+            logging.info("已全部同步完成！！！")
-            self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all()
+            # self.env['sf.functional.tool.warning'].sudo().sync_enroll_functional_tool_warning_all()
-            logging.info("功能刀具预警每日同步成功")
+            # logging.info("功能刀具预警每日同步成功")
-            self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all()
+            # self.env['stock.move.line'].sudo().sync_enroll_functional_tool_move_all()
-            logging.info("功能刀具出入库记录每日同步成功")
+            # logging.info("功能刀具出入库记录每日同步成功")
-            self.env[
+            # self.env['sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all()
-                'sf.real.time.distribution.of.functional.tools'].sudo().sync_enroll_functional_tool_real_time_distribution_all()
+            # logging.info("功能刀具安全库存每日同步成功")
-            logging.info("功能刀具安全库存每日同步成功")
         except Exception as e:
             logging.info("捕获错误信息:%s" % e)
             raise ValidationError("数据错误导致同步失败,请联系管理员")
@@ -59,24 +62,25 @@ class StockLot(models.Model):
     _inherit = 'stock.lot'
     _description = '刀具物料序列号注册'
 
-    def enroll_tool_material_stock(self):
+    # def enroll_tool_material_stock(self):
-        logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()')
+    #     logging.info('调用刀具物料序列号注册接口: enroll_tool_material_stock()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+    #     sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+    #     token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+    #     sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+    #     headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
+    #     str_url = sf_sync_config['sf_url'] + "/api/tool_material_stock/create"
-        objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])])
+    #     objs_all = self.env['stock.lot'].search([('id', '=', self.id), ('active', 'in', [True, False])])
-        self._get_sync_stock_lot(objs_all, str_url, token, headers)
+    #     self._get_sync_stock_lot(objs_all, str_url, token, headers)
 
     def sync_enroll_tool_material_stock_all(self):
-        logging.info('调用刀具物料序列号注册接口: sync_enroll_tool_material_stock_all()')
+        logging.info('调用 sync_enroll_tool_material_stock_all 同步接口')
         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'] + "/api/tool_material_stock/create"
-        objs_all = self.env['stock.lot'].search([('rfid', '!=', False)])
+        product_ids = self.env['product.product'].sudo().search([('categ_type', '=', '刀具')]).ids
+        objs_all = self.env['stock.lot'].search([('rfid', '!=', False), ('product_id', 'in', product_ids)])
         self._get_sync_stock_lot(objs_all, str_url, token, headers)
 
     def _get_sync_stock_lot(self, objs_all, str_url, token, headers):
@@ -95,11 +99,12 @@ class StockLot(models.Model):
                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
                 ret = r.json()
                 if ret.get('code') == 200:
-                    return '刀具物料序列号注册成功'
+                    logging.info("刀具物料序列号每日同步成功")
+                    return '刀具(夹具)物料序列号注册成功'
             else:
-                logging.info("没有注册刀具物料序列号信息")
+                logging.info("没有刀具物料序列号信息")
         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+            logging.info("刀具物料序列号同步失败:%s" % e)
 
 
 class ToolMaterial(models.Model):
@@ -108,18 +113,18 @@ class ToolMaterial(models.Model):
 
     crea_url = '/api/tool_material/create'
 
-    def enroll_tool_material(self):
+    # def enroll_tool_material(self):
-        logging.info('调用刀具物料注册接口: enroll_tool_material()')
+    #     logging.info('调用刀具物料注册接口: enroll_tool_material()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+    #     sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+    #     token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+    #     sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+    #     headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+    #     str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.search([('id', '=', self.id)])
+    #     objs_all = self.search([('id', '=', self.id)])
-        self._get_sync_tool_material_search(objs_all, str_url, token, headers)
+    #     self._get_sync_tool_material_search(objs_all, str_url, token, headers)
 
     def sync_enroll_tool_material_all(self):
-        logging.info('调用刀具物料注册接口: sync_enroll_tool_material_all()')
+        logging.info('调用 sync_enroll_tool_material_all 同步接口')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -150,19 +155,20 @@ class ToolMaterial(models.Model):
                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
                 ret = r.json()
                 if ret.get('code') == 200:
+                    logging.info("刀具物料每日同步成功")
                     return '刀具物料注册成功'
             else:
                 logging.info('没有注册刀具物料信息')
         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+            logging.info("刀具物料同步失败:%s" % e)
 
-    @api.model_create_multi
+    # @api.model_create_multi
-    def create(self, vals_list):
+    # def create(self, vals_list):
-        records = super(ToolMaterial, self).create(vals_list)
+    #     records = super(ToolMaterial, self).create(vals_list)
-        for record in records:
+    #     for record in records:
-            if record:
+    #         if record:
-                record.enroll_tool_material()
+    #             record.enroll_tool_material()
-        return records
+    #     return records
 
 
 class FunctionalCuttingToolEntity(models.Model):
@@ -172,18 +178,18 @@ class FunctionalCuttingToolEntity(models.Model):
     crea_url = "/api/functional_tool_entity/create"
 
     # 注册同步功能刀具列表
-    def enroll_functional_tool_entity(self):
+    # def enroll_functional_tool_entity(self):
-        logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()')
+    #     logging.info('调用功能刀具列表注册接口: enroll_functional_tool_entity()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+    #     sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+    #     token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+    #     sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+    #     headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+    #     str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)])
+    #     objs_all = self.env['sf.functional.cutting.tool.entity'].search([('id', '=', self.id)])
-        self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers)
+    #     self._get_sync_functional_cutting_tool_entity(objs_all, str_url, token, headers)
 
     def esync_enroll_functional_tool_entity_all(self):
-        logging.info('调用功能刀具列表注册接口: esync_enroll_functional_tool_entity_all()')
+        logging.info('调用 esync_enroll_functional_tool_entity_all 同步接口')
         sf_sync_config = self.env['res.config.settings'].get_values()
         token = sf_sync_config['token']
         sf_secret_key = sf_sync_config['sf_secret_key']
@@ -242,256 +248,257 @@ class FunctionalCuttingToolEntity(models.Model):
                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
                 ret = r.json()
                 if ret.get('code') == 200:
+                    logging.info("功能刀具列表每日同步成功")
                     return "功能刀具注册成功"
             else:
                 logging.info('没有注册功能刀具信息')
         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+            logging.info("功能刀具同步失败:%s" % e)
 
-    @api.model_create_multi
+    # @api.model_create_multi
-    def create(self, vals_list):
+    # def create(self, vals_list):
-        records = super(FunctionalCuttingToolEntity, self).create(vals_list)
+    #     records = super(FunctionalCuttingToolEntity, self).create(vals_list)
-        for record in records:
+    #     for record in records:
-            if record:
+    #         if record:
-                record.enroll_functional_tool_entity()
+    #             record.enroll_functional_tool_entity()
-        return records
+    #     return records
 
-    def write(self, vals):
+    # def write(self, vals):
-        res = super().write(vals)
+    #     res = super().write(vals)
-        if vals.get('current_location'):
+    #     if vals.get('current_location'):
-            self.enroll_functional_tool_entity()
+    #         self.enroll_functional_tool_entity()
-        return res
+    #     return res
 
-
+#
-class FunctionalToolWarning(models.Model):
+# class FunctionalToolWarning(models.Model):
-    _inherit = 'sf.functional.tool.warning'
+#     _inherit = 'sf.functional.tool.warning'
-    _description = '功能刀具预警注册'
+#     _description = '功能刀具预警注册'
-
+#
-    crea_url = "/api/functional_tool_warning/create"
+#     crea_url = "/api/functional_tool_warning/create"
-
+#
-    # 注册同步功能刀具预警
+#     # 注册同步功能刀具预警
-    def enroll_functional_tool_warning(self):
+#     def enroll_functional_tool_warning(self):
-        logging.info('调用功能刀具预警注册接口: enroll_functional_tool_warning()')
+#         logging.info('调用功能刀具预警注册接口: enroll_functional_tool_warning()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+#         sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+#         token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+#         sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+#         headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+#         str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)])
+#         objs_all = self.env['sf.functional.tool.warning'].search([('id', '=', self.id)])
-        self.get_sync_functional_tool_warning(objs_all, str_url, token, headers)
+#         self.get_sync_functional_tool_warning(objs_all, str_url, token, headers)
-
+#
-    def sync_enroll_functional_tool_warning_all(self):
+#     def sync_enroll_functional_tool_warning_all(self):
-        logging.info('调用功能刀具预警注册接口: sync_enroll_functional_tool_warning_all()')
+#         logging.info('调用功能刀具预警注册接口: sync_enroll_functional_tool_warning_all()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+#         sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+#         token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+#         sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+#         headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+#         str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.env['sf.functional.tool.warning'].search([])
+#         objs_all = self.env['sf.functional.tool.warning'].search([])
-        self.get_sync_functional_tool_warning(objs_all, str_url, token, headers)
+#         self.get_sync_functional_tool_warning(objs_all, str_url, token, headers)
-
+#
-    def get_sync_functional_tool_warning(self, objs_all, str_url, token, headers):
+#     def get_sync_functional_tool_warning(self, objs_all, str_url, token, headers):
-        tool_warning_list = []
+#         tool_warning_list = []
-        try:
+#         try:
-            if objs_all:
+#             if objs_all:
-                for item in objs_all:
+#                 for item in objs_all:
-                    val = {
+#                     val = {
-                        'id': item.id,
+#                         'id': item.id,
-                        'name': item.name,
+#                         'name': item.name,
-                        'code': item.code,
+#                         'code': item.code,
-                        'rfid': item.rfid,
+#                         'rfid': item.rfid,
-                        'tool_groups_name': item.tool_groups_id.name,
+#                         'tool_groups_name': item.tool_groups_id.name,
-                        'production_line': item.production_line_id.name,
+#                         'production_line': item.production_line_id.name,
-                        'machine_tool_id': item.maintenance_equipment_id.code,
+#                         'machine_tool_id': item.maintenance_equipment_id.code,
-                        'machine_tool_code': item.machine_tool_code,
+#                         'machine_tool_code': item.machine_tool_code,
-                        'cutter_spacing_code': item.cutter_spacing_code_id.code,
+#                         'cutter_spacing_code': item.cutter_spacing_code_id.code,
-                        'functional_tool_name': item.name,
+#                         'functional_tool_name': item.name,
-                        'barcode': item.barcode_id.name,
+#                         'barcode': item.barcode_id.name,
-                        'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code,
+#                         'mrs_cutting_tool_type_code': item.mrs_cutting_tool_type_id.code,
-                        'diameter': item.diameter,
+#                         'diameter': item.diameter,
-                        'knife_tip_r_angle': item.knife_tip_r_angle,
+#                         'knife_tip_r_angle': item.knife_tip_r_angle,
-                        'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
+#                         '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'),
+#                         'on_board_time': item.on_board_time.strftime('%Y-%m-%d %H:%M:%S'),
-                        'max_lifetime_value': item.max_lifetime_value,
+#                         'max_lifetime_value': item.max_lifetime_value,
-                        'alarm_value': item.alarm_value,
+#                         'alarm_value': item.alarm_value,
-                        'used_value': item.used_value,
+#                         'used_value': item.used_value,
-                        'functional_tool_status': item.functional_tool_status,
+#                         'functional_tool_status': item.functional_tool_status,
-                        'alarm_time': item.alarm_time.strftime('%Y-%m-%d %H:%M:%S'),
+#                         'alarm_time': item.alarm_time.strftime('%Y-%m-%d %H:%M:%S'),
-                        'dispose_user': item.dispose_user,
+#                         'dispose_user': item.dispose_user,
-                        'dispose_time': item.dispose_time,
+#                         'dispose_time': item.dispose_time,
-                        'dispose_func': item.dispose_func,
+#                         'dispose_func': item.dispose_func,
-                    }
+#                     }
-                    tool_warning_list.append(val)
+#                     tool_warning_list.append(val)
-                kw = json.dumps(tool_warning_list, ensure_ascii=False)
+#                 kw = json.dumps(tool_warning_list, ensure_ascii=False)
-                r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+#                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
-                ret = r.json()
+#                 ret = r.json()
-                if ret.get('code') == 200:
+#                 if ret.get('code') == 200:
-                    return "功能刀具预警注册成功"
+#                     return "功能刀具预警注册成功"
-            else:
+#             else:
-                logging.info('没有注册功能刀具预警信息')
+#                 logging.info('没有注册功能刀具预警信息')
-        except Exception as e:
+#         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+#             logging.info("捕获错误信息:%s" % e)
-
+#
-    @api.model_create_multi
+#     @api.model_create_multi
-    def create(self, vals_list):
+#     def create(self, vals_list):
-        records = super(FunctionalToolWarning, self).create(vals_list)
+#         records = super(FunctionalToolWarning, self).create(vals_list)
-        for record in records:
+#         for record in records:
-            if record:
+#             if record:
-                record.enroll_functional_tool_warning()
+#                 record.enroll_functional_tool_warning()
-        return records
+#         return records
-
+#
-
+#
-class StockMoveLine(models.Model):
+# class StockMoveLine(models.Model):
-    _inherit = 'stock.move.line'
+#     _inherit = 'stock.move.line'
-    _description = '功能刀具出入库记录注册'
+#     _description = '功能刀具出入库记录注册'
-
+#
-    crea_url = "/api/functional_tool_move/create"
+#     crea_url = "/api/functional_tool_move/create"
-
+#
-    # 注册同步功能刀具出入库记录
+#     # 注册同步功能刀具出入库记录
-    def enroll_functional_tool_move(self):
+#     def enroll_functional_tool_move(self):
-        logging.info('调用功能刀具出入库记录注册接口: enroll_functional_tool_move()')
+#         logging.info('调用功能刀具出入库记录注册接口: enroll_functional_tool_move()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+#         sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+#         token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+#         sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+#         headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+#         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)])
+#         objs_all = self.env['stock.move.line'].search([('id', '=', self.id), ('functional_tool_name_id', '!=', False)])
-        self.get_sync_stock_move_line(objs_all, str_url, token, headers)
+#         self.get_sync_stock_move_line(objs_all, str_url, token, headers)
-
+#
-    def sync_enroll_functional_tool_move_all(self):
+#     def sync_enroll_functional_tool_move_all(self):
-        logging.info('调用功能刀具出入库记录注册接口: sync_enroll_functional_tool_move_all()')
+#         logging.info('调用功能刀具出入库记录注册接口: sync_enroll_functional_tool_move_all()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+#         sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+#         token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+#         sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+#         headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+#         str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.env['stock.move.line'].search([('functional_tool_name_id', '!=', False)])
+#         objs_all = self.env['stock.move.line'].search([('functional_tool_name_id', '!=', False)])
-        self.get_sync_stock_move_line(objs_all, str_url, token, headers)
+#         self.get_sync_stock_move_line(objs_all, str_url, token, headers)
-
+#
-    def get_sync_stock_move_line(self, objs_all, str_url, token, headers):
+#     def get_sync_stock_move_line(self, objs_all, str_url, token, headers):
-        tool_stock_list = []
+#         tool_stock_list = []
-        try:
+#         try:
-            if objs_all:
+#             if objs_all:
-                for item in objs_all:
+#                 for item in objs_all:
-                    val = {
+#                     val = {
-                        'id': item.id,
+#                         'id': item.id,
-                        'name': item.functional_tool_name,
+#                         'name': item.functional_tool_name,
-                        'code': item.code,
+#                         'code': item.code,
-                        'rfid': item.rfid,
+#                         'rfid': item.rfid,
-                        'tool_groups_name': item.tool_groups_id.name,
+#                         'tool_groups_name': item.tool_groups_id.name,
-                        'reference': item.reference,
+#                         'reference': item.reference,
-                        'barcode': item.lot_id.name,
+#                         'barcode': item.lot_id.name,
-                        'functional_tool_type_code': item.functional_tool_type_id.code,
+#                         'functional_tool_type_code': item.functional_tool_type_id.code,
-                        'diameter': item.diameter,
+#                         'diameter': item.diameter,
-                        'knife_tip_r_angle': item.knife_tip_r_angle,
+#                         'knife_tip_r_angle': item.knife_tip_r_angle,
-                        'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
+#                         'install_tool_time': item.install_tool_time.strftime('%Y-%m-%d %H:%M:%S'),
-                        'location_id': item.location_id.name,
+#                         'location_id': item.location_id.name,
-                        'location_dest_name': item.location_dest_id.name,
+#                         'location_dest_name': item.location_dest_id.name,
-                        'date': item.date.strftime('%Y-%m-%d %H:%M:%S'),
+#                         'date': item.date.strftime('%Y-%m-%d %H:%M:%S'),
-                        'qty_done': item.qty_done,
+#                         'qty_done': item.qty_done,
-                    }
+#                     }
-                    tool_stock_list.append(val)
+#                     tool_stock_list.append(val)
-                kw = json.dumps(tool_stock_list, ensure_ascii=False)
+#                 kw = json.dumps(tool_stock_list, ensure_ascii=False)
-                r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+#                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
-                ret = r.json()
+#                 ret = r.json()
-                if ret.get('code') == 200:
+#                 if ret.get('code') == 200:
-                    return "功能刀具出入库记录注册成功"
+#                     return "功能刀具出入库记录注册成功"
-            else:
+#             else:
-                logging.info('没有注册功能刀具出入库记录信息')
+#                 logging.info('没有注册功能刀具出入库记录信息')
-        except Exception as e:
+#         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+#             logging.info("捕获错误信息:%s" % e)
-
+#
-    @api.model_create_multi
+#     @api.model_create_multi
-    def create(self, vals_list):
+#     def create(self, vals_list):
-        records = super(StockMoveLine, self).create(vals_list)
+#         records = super(StockMoveLine, self).create(vals_list)
-        for record in records:
+#         for record in records:
-            if record.functional_tool_name_id:
+#             if record.functional_tool_name_id:
-                record.enroll_functional_tool_move()
+#                 record.enroll_functional_tool_move()
-        return records
+#         return records
-
+#
-
+#
-class RealTimeDistributionFunctionalTools(models.Model):
+# class RealTimeDistributionFunctionalTools(models.Model):
-    _inherit = 'sf.real.time.distribution.of.functional.tools'
+#     _inherit = 'sf.real.time.distribution.of.functional.tools'
-    _description = '功能刀具安全库存注册'
+#     _description = '功能刀具安全库存注册'
-
+#
-    crea_url = "/api/functional_tool_distribution/create"
+#     crea_url = "/api/functional_tool_distribution/create"
-
+#
-    # 注册同步功能刀具预警
+#     # 注册同步功能刀具预警
-    def enroll_functional_tool_real_time_distribution(self):
+#     def enroll_functional_tool_real_time_distribution(self):
-        logging.info('调用功能刀具安全库存注册接口: enroll_functional_tool_real_time_distribution()')
+#         logging.info('调用功能刀具安全库存注册接口: enroll_functional_tool_real_time_distribution()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+#         sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+#         token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+#         sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+#         headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+#         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)])
+#         objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([('id', '=', self.id)])
-        self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers)
+#         self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers)
-
+#
-    def sync_enroll_functional_tool_real_time_distribution_all(self):
+#     def sync_enroll_functional_tool_real_time_distribution_all(self):
-        logging.info('调用功能刀具安全库存注册接口: sync_enroll_functional_tool_real_time_distribution_all()')
+#         logging.info('调用功能刀具安全库存注册接口: sync_enroll_functional_tool_real_time_distribution_all()')
-        sf_sync_config = self.env['res.config.settings'].get_values()
+#         sf_sync_config = self.env['res.config.settings'].get_values()
-        token = sf_sync_config['token']
+#         token = sf_sync_config['token']
-        sf_secret_key = sf_sync_config['sf_secret_key']
+#         sf_secret_key = sf_sync_config['sf_secret_key']
-        headers = Common.get_headers(self, token, sf_secret_key)
+#         headers = Common.get_headers(self, token, sf_secret_key)
-        str_url = sf_sync_config['sf_url'] + self.crea_url
+#         str_url = sf_sync_config['sf_url'] + self.crea_url
-        objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([])
+#         objs_all = self.env['sf.real.time.distribution.of.functional.tools'].search([])
-        self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers)
+#         self.get_sync_real_time_distribution_functional_tools(objs_all, str_url, token, headers)
-
+#
-    def get_sync_real_time_distribution_functional_tools(self, objs_all, str_url, token, headers):
+#     def get_sync_real_time_distribution_functional_tools(self, objs_all, str_url, token, headers):
-        tool_distribution_list = []
+#         tool_distribution_list = []
-        try:
+#         try:
-            if objs_all:
+#             if objs_all:
-                for item in objs_all:
+#                 for item in objs_all:
-                    functional_tool_codes = []
+#                     functional_tool_codes = []
-                    for obj in item.sf_functional_tool_entity_ids:
+#                     for obj in item.sf_functional_tool_entity_ids:
-                        functional_tool_codes.append(obj.code)
+#                         functional_tool_codes.append(obj.code)
-                    val = {
+#                     val = {
-                        'id': item.id,
+#                         'id': item.id,
-                        'name': item.name,
+#                         'name': item.name,
-                        'tool_groups_name': item.tool_groups_id.name,
+#                         'tool_groups_name': item.tool_groups_id.name,
-                        'cutting_tool_type_code': item.sf_cutting_tool_type_id.code,
+#                         'cutting_tool_type_code': item.sf_cutting_tool_type_id.code,
-                        'diameter': item.diameter,
+#                         'diameter': item.diameter,
-                        'knife_tip_r_angle': item.knife_tip_r_angle,
+#                         'knife_tip_r_angle': item.knife_tip_r_angle,
-                        'tool_stock_num': item.tool_stock_num,
+#                         'tool_stock_num': item.tool_stock_num,
-                        'side_shelf_num': item.side_shelf_num,
+#                         'side_shelf_num': item.side_shelf_num,
-                        'on_tool_stock_num': item.on_tool_stock_num,
+#                         'on_tool_stock_num': item.on_tool_stock_num,
-                        'tool_stock_total': item.tool_stock_total,
+#                         'tool_stock_total': item.tool_stock_total,
-                        'min_stock_num': item.min_stock_num,
+#                         'min_stock_num': item.min_stock_num,
-                        'max_stock_num': item.max_stock_num,
+#                         'max_stock_num': item.max_stock_num,
-                        'batch_replenishment_num': item.batch_replenishment_num,
+#                         'batch_replenishment_num': item.batch_replenishment_num,
-                        'unit': item.unit,
+#                         'unit': item.unit,
-                        'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
+#                         'image': '' if not item.image else base64.b64encode(item.image).decode('utf-8'),
-                        'functional_tool_codes': str(functional_tool_codes),
+#                         'functional_tool_codes': str(functional_tool_codes),
-                        'coarse_middle_thin': item.coarse_middle_thin,
+#                         'coarse_middle_thin': item.coarse_middle_thin,
-                        'whether_standard_knife': item.whether_standard_knife,
+#                         'whether_standard_knife': item.whether_standard_knife,
-                        'suitable_machining_method_names': get_suitable_machining_method_names(item),
+#                         'suitable_machining_method_names': get_suitable_machining_method_names(item),
-                        'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name,
+#                         'blade_tip_characteristics_name': item.blade_tip_characteristics_id.name,
-                        'handle_type_name': item.handle_type_id.name,
+#                         'handle_type_name': item.handle_type_id.name,
-                        'cutting_direction_names': get_cutting_direction_names(item),
+#                         'cutting_direction_names': get_cutting_direction_names(item),
-                        'suitable_coolant_names': get_suitable_coolant_names(item),
+#                         'suitable_coolant_names': get_suitable_coolant_names(item),
-                        'active': item.active
+#                         'active': item.active
-                    }
+#                     }
-                    tool_distribution_list.append(val)
+#                     tool_distribution_list.append(val)
-                kw = json.dumps(tool_distribution_list, ensure_ascii=False)
+#                 kw = json.dumps(tool_distribution_list, ensure_ascii=False)
-                r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
+#                 r = requests.post(str_url, json={}, data={'kw': kw, 'token': token}, headers=headers)
-                ret = r.json()
+#                 ret = r.json()
-                if ret.get('code') == 200:
+#                 if ret.get('code') == 200:
-                    return "功能刀具出入库记录注册成功"
+#                     return "功能刀具出入库记录注册成功"
-            else:
+#             else:
-                logging.info('没有注册功能刀具出入库记录信息')
+#                 logging.info('没有注册功能刀具出入库记录信息')
-        except Exception as e:
+#         except Exception as e:
-            logging.info("捕获错误信息:%s" % e)
+#             logging.info("捕获错误信息:%s" % e)
-
+#
-    @api.model_create_multi
+#     @api.model_create_multi
-    def create(self, vals_list):
+#     def create(self, vals_list):
-        records = super(RealTimeDistributionFunctionalTools, self).create(vals_list)
+#         records = super(RealTimeDistributionFunctionalTools, self).create(vals_list)
-        for record in records:
+#         for record in records:
-            if record:
+#             if record:
-                record.enroll_functional_tool_real_time_distribution()
+#                 record.enroll_functional_tool_real_time_distribution()
-        return records
+#         return records
-
+#
-    def write(self, vals):
+#     def write(self, vals):
-        res = super().write(vals)
+#         res = super().write(vals)
-        if vals.get('sf_functional_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'):
+#         if vals.get('sf_functional_tool_entity_ids') or vals.get('min_stock_num') or vals.get('max_stock_num'):
-            self.enroll_functional_tool_real_time_distribution()
+#             self.enroll_functional_tool_real_time_distribution()
-        return res
+#         return res

sf_tool_management/models/maintenance_equipment.py

@@ -128,12 +128,12 @@ class StockLot(models.Model):
                             record.tool_material_status = '报废'
                         else:
                             record.tool_material_status = '未入库'
-                        if record.tool_material_search_id:
+                        # if record.tool_material_search_id:
-                            # 注册刀具物料状态到cloud平台
+                        #     # 注册刀具物料状态到cloud平台
-                            record.enroll_tool_material_stock()
+                        #     record.enroll_tool_material_stock()
-                        elif record.fixture_material_search_id:
+                        # elif record.fixture_material_search_id:
-                            # 注册夹具物料状态到cloud平台
+                        #     # 注册夹具物料状态到cloud平台
-                            record.enroll_fixture_material_stock()
+                        #     record.enroll_fixture_material_stock()
 
     @api.model
     def name_search(self, name='', args=None, operator='ilike', limit=100):

sf_tool_management/models/tool_material_search.py

@@ -46,7 +46,7 @@ class ToolMaterial(models.Model):
             record.scrap_num = scrap_num
             record.number = usable_num + have_been_used_num + scrap_num
             # 更新数据到cloud的动态数据
-            record.enroll_tool_material()
+            # record.enroll_tool_material()
 
     @api.model
     def _read_group_cutting_tool_material_id(self, categories, domain, order):

sf_tool_management/views/functional_tool_views.xml

@@ -46,8 +46,8 @@
                     </header>
                     <sheet>
                         <div class="oe_button_box" name="button_box">
-                            <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"
+<!--                            <button name="button_safe_inventory_id" string="更新功能刀具关联的安全库存记录"-->
-                                    type="object" class="btn-primary"/>
+<!--                                    type="object" class="btn-primary"/>-->
                             <button class="oe_stat_button" groups="sf_base.group_sf_mrp_user"
                                     name="open_functional_tool_warning"
                                     icon="fa-list-ul"

sf_tool_management/views/tool_base_views.xml

@@ -451,36 +451,9 @@
                     <field name="whether_standard_knife" invisible="True"/>
                     <field name="reason_for_applying" invisible="True"/>
                     <field name="functional_tool_type_id" invisible="True"/>
-                    <!--                    <field name="functional_tool_cutting_type" invisible="True"/>-->
+                    <button string="组装" name="put_start_preset" type="object"
-
+                                attrs="{'invisible': [('assemble_status', '!=', '0')]}"
-                    <button string="组装"
+                                class="btn-primary"/>
-                            name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
-                            type="action"
-                            context="{'default_name':name,
-                                    'default_assembly_order_code':assembly_order_code,
-                                    'default_production_line_name_id':production_line_name_id,
-                                    'default_machine_tool_name_id':machine_tool_name_id,
-                                    'default_cutter_spacing_code_id':cutter_spacing_code_id,
-                                    'default_functional_tool_name':functional_tool_name,
-                                    'default_functional_tool_type_id':functional_tool_type_id,
-                                    'default_tool_groups_id': tool_groups_id,
-                                    'default_functional_tool_diameter':functional_tool_diameter,
-                                    'default_knife_tip_r_angle':knife_tip_r_angle,
-                                    'default_tool_loading_length':tool_loading_length,
-                                    'default_functional_tool_length':functional_tool_length,
-                                    'default_effective_length':effective_length,
-                                    'default_whether_standard_knife':whether_standard_knife,
-                                    'default_coarse_middle_thin':coarse_middle_thin,
-                                    'default_new_former':new_former,
-                                    'default_use_tool_time':use_tool_time,
-                                    'default_reason_for_applying':reason_for_applying,
-                                    }"
-                            attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
-                            class="btn-primary"/>
-                    <!--                    <button string="组装单打印" name="assemble_single_print" type="object"-->
-                    <!--                            groups="sf_base.group_sf_mrp_user"-->
-                    <!--                            attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
-                    <!--                            confirm="是否确认打印组装单"/>-->
                 </tree>
             </field>
         </record>
@@ -491,35 +464,9 @@
             <field name="arch" type="xml">
                 <form create="0" delete="0" edit="0">
                     <header>
-                        <button string="组装"
+                        <button string="组装" name="put_start_preset" type="object"
-                                name="%(sf_tool_management.sf_functional_tool_assembly_order_act)d"
-                                type="action" groups="sf_base.group_sf_mrp_user"
-                                context="{'default_name':name,
-                                    'default_assembly_order_code':assembly_order_code,
-                                    'default_production_line_name_id':production_line_name_id,
-                                    'default_machine_tool_name_id':machine_tool_name_id,
-                                    'default_cutter_spacing_code_id':cutter_spacing_code_id,
-                                    'default_functional_tool_name':functional_tool_name,
-                                    'default_functional_tool_type_id':functional_tool_type_id,
-                                    'default_tool_groups_id': tool_groups_id,
-                                    'default_functional_tool_diameter':functional_tool_diameter,
-                                    'default_knife_tip_r_angle':knife_tip_r_angle,
-                                    'default_tool_loading_length':tool_loading_length,
-                                    'default_functional_tool_length':functional_tool_length,
-                                    'default_effective_length':effective_length,
-                                    'default_whether_standard_knife':whether_standard_knife,
-                                    'default_coarse_middle_thin':coarse_middle_thin,
-                                    'default_new_former':new_former,
-                                    'default_use_tool_time':use_tool_time,
-                                    'default_reason_for_applying':reason_for_applying,
-                                    }"
                                 attrs="{'invisible': [('assemble_status', '!=', '0')]}"
                                 class="btn-primary"/>
-
-                        <!--                        <button string="组装单打印" name="assemble_single_print" type="object"-->
-                        <!--                                groups="sf_base.group_sf_mrp_user"-->
-                        <!--                                attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
-                        <!--                                confirm="是否确认打印组装单"/>-->
                         <field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
                     </header>
                     <sheet>
@@ -544,7 +491,7 @@
                             </group>
                         </group>
                         <notebook>
-                            <page string="组装信息" attrs="{'invisible': [('assemble_status', '=' ,'0')]}">
+                            <page string="组装信息">
                                 <group col="1">
                                     <group col="1">
                                         <group>

sf_tool_management/wizard/wizard.py

@@ -355,7 +355,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     # ================刀柄型号===============
     handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_rfid')
-    handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', required=True,
+    handle_code_id = fields.Many2one('stock.lot', '刀柄序列号',
                                      domain=[('product_id.cutting_tool_material_id.name', '=', '刀柄'),
                                              ('tool_material_status', '=', '可用')])
     handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id',
@@ -463,8 +463,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', compute='_compute_name', store=True)
     after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
                                                              string='组装后功能刀具类型')
-    after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)')
+    after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', digits=(10, 3))
-    after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)')
+    after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', digits=(10, 3))
     after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0')
     cut_time = fields.Integer(string='已切削时间(min)')
     cut_length = fields.Float(string='已切削长度(mm)')
@@ -476,13 +476,34 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
     after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)')
     after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
     after_assembly_used_value = fields.Integer(string='组装后已使用值(min)')
-    after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)')
+    after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3))
     after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', required=True)
     after_assembly_effective_length = fields.Float(string='组装后有效长(mm)')
     L_D_number = fields.Float(string='L/D值(mm)', compute='_compute_l_d_number')
     hiding_length = fields.Float(string='避空长(mm)')
     after_tool_groups_id = fields.Many2one('sf.tool.groups', string='组装后刀具组')
 
+    def get_tool_preset_parameter(self):
+        """
+        获取刀具预调仪数据
+        """
+        tool = self.env['sf.functional.tool.assembly'].search([('assembly_order_code', '=', self.assembly_order_code)])
+
+        self.write({
+            'after_assembly_tool_loading_length': tool.after_assembly_tool_loading_length,  # 总长度
+            'after_assembly_functional_tool_diameter': tool.after_assembly_functional_tool_diameter,  # 直径
+            'after_assembly_knife_tip_r_angle': tool.after_assembly_knife_tip_r_angle  # R角
+        })
+
+        return {
+            'type': 'ir.actions.act_window',
+            'res_model': 'sf.functional.tool.assembly.order',
+            'view_mode': 'form',
+            'res_id': self.id,
+            'target': 'new',
+            'flags': {'form': {'action_buttons': True, 'options': {'mode': 'modal'}}}
+        }
+
     @api.onchange('after_name_id')
     def _onchange_number(self):
         for item in self:
@@ -574,24 +595,6 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
             else:
                 record.L_D_number = 0
 
-    @api.constrains('after_assembly_tool_loading_length', 'after_assembly_functional_tool_length',
-                    'after_assembly_max_lifetime_value', 'after_assembly_alarm_value',
-                    'after_assembly_effective_length', 'hiding_length')
-    def _check_length_control(self):
-        for obj in self:
-            if obj.after_assembly_tool_loading_length == 0:
-                raise ValidationError('组装参数信息【总长度】不能为0！！！')
-            if obj.after_assembly_functional_tool_length == 0:
-                raise ValidationError('组装参数信息【伸出长】不能为0！！！')
-            if obj.after_assembly_max_lifetime_value == 0:
-                raise ValidationError('组装参数信息【最大寿命值】不能为0！！！')
-            if obj.after_assembly_alarm_value == 0:
-                raise ValidationError('组装参数信息【报警值】不能为0！！！')
-            if obj.after_assembly_effective_length == 0:
-                raise ValidationError('组装参数信息【有效长】不能为0！！！')
-            if obj.hiding_length == 0:
-                raise ValidationError('组装参数信息【避空长】不能为0！！！')
-
     def functional_tool_assembly(self):
         """
         功能刀具组装
@@ -659,16 +662,35 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
 
     def materials_must_be_judged(self):
         """
-        功能刀具组装物料必填判断
+        功能刀具组装必填判断
         """
+        # 物料必填校验
+        if not self.handle_code_id:
+            raise ValidationError('缺少【刀柄】物料信息！')
         if not self.integral_product_id and not self.blade_product_id:
             raise ValidationError('【整体式刀具】和【刀片】必须填写一个！')
         if self.blade_product_id:
             if not self.bar_product_id and not self.pad_product_id:
                 raise ValidationError('【刀盘】和【刀杆】必须填写一个！')
+        # 组装参数必填校验
+        if self.after_assembly_tool_loading_length == 0:
+            raise ValidationError('组装参数信息【总长度】不能为0！！！')
+        if self.after_assembly_functional_tool_length == 0:
+            raise ValidationError('组装参数信息【伸出长】不能为0！！！')
+        if self.after_assembly_max_lifetime_value == 0:
+            raise ValidationError('组装参数信息【最大寿命值】不能为0！！！')
+        if self.after_assembly_alarm_value == 0:
+            raise ValidationError('组装参数信息【报警值】不能为0！！！')
+        if self.after_assembly_effective_length == 0:
+            raise ValidationError('组装参数信息【有效长】不能为0！！！')
+        if self.hiding_length == 0:
+            raise ValidationError('组装参数信息【避空长】不能为0！！！')
+        if self.after_assembly_functional_tool_diameter == 0 and self.after_assembly_knife_tip_r_angle == 0:
+            raise ValidationError('组装参数信息【刀具直径】和【刀具R角】必须有一个不能为0！！！')
 
     def get_desc_1(self, stock_lot):
         return {
+            'start_preset_bool': False,
             'barcode_id': stock_lot.id,
             'code': self.code,
             'rfid': self.rfid,
@@ -918,14 +940,13 @@ class StockLot(models.Model):
         })
         return stock_move_id, stock_move_line_id
 
-
+# class StockQuant(models.Model):
-class StockQuant(models.Model):
+#     _inherit = 'stock.quant'
-    _inherit = 'stock.quant'
+#
-
+#     @api.model_create_multi
-    @api.model_create_multi
+#     def create(self, vals_list):
-    def create(self, vals_list):
+#         records = super(StockQuant, self).create(vals_list)
-        records = super(StockQuant, self).create(vals_list)
+#         for record in records:
-        for record in records:
+#             if record.lot_id.product_id.categ_id.name == '刀具':
-            if record.lot_id.product_id.categ_id.name == '刀具':
+#                 record.lot_id.enroll_tool_material_stock()
-                record.lot_id.enroll_tool_material_stock()
+#         return records
-        return records

sf_tool_management/wizard/wizard_view.xml

@@ -330,47 +330,55 @@
                         </group>
                     </group>
 
-                    <group string="组装参数信息">
+                    <group string="组装参数信息" col="1">
+                        <div>
+                            <button name="get_tool_preset_parameter" string="刷新" type="object" class="btn-primary"/>
+                        </div>
                         <group>
                             <group>
-                                <field name="barcode_id" invisible="True"/>
+                                <group>
-                                <field name="code" readonly="True"/>
+                                    <field name="barcode_id" invisible="True"/>
-                                <field name="rfid" class="custom_required"/>
+                                    <field name="code" readonly="True"/>
-                                <field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称"
+                                    <field name="rfid" class="custom_required"/>
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                    <field name="after_name_id" string="功能刀具名称" placeholder="请选择功能刀具名称"
-                                <field name="after_assembly_functional_tool_name" string="功能刀具名称" invisible="1"/>
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="after_assembly_functional_tool_type_id" string="功能刀具类型"
+                                    <field name="after_assembly_functional_tool_name" string="功能刀具名称"
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                           invisible="1"/>
-                                <field name="after_tool_groups_id"
+                                    <field name="after_assembly_functional_tool_type_id" string="功能刀具类型"
-                                       options="{'no_create': True, 'no_quick_create': True}"/>
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
+                                    <field name="after_tool_groups_id"
-                                       class="custom_required"/>
+                                           options="{'no_create': True, 'no_quick_create': True}"/>
-                                <field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
+                                    <field name="after_assembly_functional_tool_diameter" string="刀具直径(mm)"
-                                       class="custom_required"/>
+                                           class="custom_required"/>
-                                <field name="after_assembly_new_former" string="新/旧"/>
+                                    <field name="after_assembly_knife_tip_r_angle" string="刀尖R角(mm)"
-                                <field name="cut_time" attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
+                                           class="custom_required"/>
-                                <field name="cut_length"
+                                    <field name="after_assembly_new_former" string="新/旧"/>
-                                       attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
+                                    <field name="cut_time"
-                                <field name="cut_number"
+                                           attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
-                                       attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
+                                    <field name="cut_length"
+                                           attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
+                                    <field name="cut_number"
+                                           attrs="{'invisible': [('after_assembly_new_former','=','0')]}"/>
+                                </group>
                             </group>
-                        </group>
-                        <group>
                             <group>
-                                <field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
+                                <group>
-                                <field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
+                                    <field name="after_assembly_whether_standard_knife" string="是否标准刀"/>
-                                <field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"
+                                    <field name="after_assembly_coarse_middle_thin" string="粗/中/精"/>
-                                       class="custom_required"/>
+                                    <field name="after_assembly_max_lifetime_value" string="最大寿命值(min)"
-                                <field name="after_assembly_alarm_value" string="报警值(min)" class="custom_required"/>
+                                           class="custom_required"/>
-                                <field name="after_assembly_used_value" string="已使用值(min)"/>
+                                    <field name="after_assembly_alarm_value" string="报警值(min)"
-                                <field name="after_assembly_tool_loading_length" string="总长度(mm)"
+                                           class="custom_required"/>
-                                       class="custom_required"/>
+                                    <field name="after_assembly_used_value" string="已使用值(min)"/>
-                                <field name="after_assembly_functional_tool_length" string="伸出长(mm)"
+                                    <field name="after_assembly_tool_loading_length" string="总长度(mm)"
-                                       class="custom_required"/>
+                                           class="custom_required"/>
-                                <field name="after_assembly_effective_length" string="有效长(mm)"
+                                    <field name="after_assembly_functional_tool_length" string="伸出长(mm)"
-                                       class="custom_required"/>
+                                           class="custom_required"/>
-                                <field name="hiding_length" class="custom_required"/>
+                                    <field name="after_assembly_effective_length" string="有效长(mm)"
-                                <field name="L_D_number"/>
+                                           class="custom_required"/>
+                                    <field name="hiding_length" class="custom_required"/>
+                                    <field name="L_D_number"/>
+                                </group>
                             </group>
                         </group>
                     </group>