增加日志

Merge Request: cnc校验刀无效刀创建检测结果时先检测是否已经存在待处理记录

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

jikimo_frontend/static/src/bye_odoo/favicon.js

@@ -6,6 +6,6 @@ import { patch } from "web.utils";
 patch(WebClient.prototype, "kolpolok_custom_title_and_favicon.WebClient", {
     setup() {
         this._super();
-        this.title.setParts({ zopenerp: "JIKIMO" });
+        // this.title.setParts({ zopenerp: "JIKIMO" });
     },
 });

jikimo_sale_order_message_notify/__init__.py

@@ -1 +0,0 @@
-from . import models

jikimo_sale_order_message_notify/__manifest__.py

@@ -1,26 +0,0 @@
-# -*- coding: utf-8 -*-
-# Part of Odoo. See LICENSE file for full copyright and licensing details.
-
-{
-    'name': '机企猫智能工厂 消息提醒',
-    'version': '1.0',
-    'summary': '智能工厂消息提醒模块',
-    'sequence': 1,
-    'description': """
-
-    """,
-    'category': 'sf',
-    'website': 'https://www.sf.jikimo.com',
-    'depends': ['jikimo_message_notify'],
-    'data': [
-        'security/ir.model.access.csv',
-        'data/bussiness_node.xml',
-        # 'views/sf_message_template_view.xml',
-    ],
-    'test': [
-    ],
-    'license': 'LGPL-3',
-    'installable': True,
-    'auto_install': False,
-    'application': False,
-}

jikimo_sale_order_message_notify/data/bussiness_node.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" ?>
-<odoo>
-    <data>
-          <record id="bussiness_1" model="jikimo.message.bussiness.node">
-            <field name="name">订单确认</field>
-            <field name="model">sale.order</field>
-        </record>
-    </data>
-</odoo>

jikimo_sale_order_message_notify/models/__init__.py

@@ -1,2 +0,0 @@
-from . import jikimo_message_template
-from . import sale_order

jikimo_sale_order_message_notify/models/jikimo_message_template.py

@@ -1,10 +0,0 @@
-from odoo import models, fields, api
-
-class JikimoMessageTemplate(models.Model):
-    _inherit = "jikimo.message.template"
-
-    def _get_message_model(self):
-        res = super(JikimoMessageTemplate, self)._get_message_model()
-        res.append("sale.order")
-        return res
-

jikimo_sale_order_message_notify/models/sale_order.py

@@ -1,12 +0,0 @@
-from odoo import models, fields, api
-
-
-class SaleOrder(models.Model):
-    _name = "sale.order"
-    _description = "销售订单"
-    _inherit = ["sale.order", "jikimo.message.dispatch"]
-
-    def create(self, vals_list):
-        res = super(SaleOrder, self).create(vals_list)
-        res.add_queue('订单确认')
-        return res

jikimo_sale_order_message_notify/security/group_security.xml

@@ -1,5 +0,0 @@
-<odoo>
-    <data>
-
-    </data>
-</odoo>

jikimo_sale_order_message_notify/security/ir.model.access.csv

@@ -1,6 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-
-
-
-
-

jikimo_sale_order_message_notify/views/sf_message_template_view.xml

@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- © <2016> <top hy>
-     License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). -->
-
-<odoo>
-    <data>
-
-        <record id="sf_message_template_view_form" model="ir.ui.view">
-            <field name="name">sf.message.template.view.form</field>
-            <field name="model">message.template</field>
-            <field name="arch" type="xml">
-                <form string="消息模板">
-                    <sheet>
-                        <div class="oe_title">
-                            <label for="name"/>
-                            <h1>
-                                <field name="name" class="w-100" required="1"/>
-                            </h1>
-                        </div>
-                        <group>
-<!--                            <field name="type"/>-->
-                            <field name="notify_model_id"/>
-                            <field name="content" widget="html" class="oe-bordered-editor"
-                                   options="{'style-inline': true, 'codeview': true, 'dynamic_placeholder': true}"/>
-                            <field name="description"/>
-                            <field name="msgtype"/>
-                            <field name="notification_department_id"/>
-                            <field name="notification_employee_ids" widget="many2many_tags"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <record id="sf_message_template_view_tree" model="ir.ui.view">
-            <field name="name">sf.message.template.view.tree</field>
-            <field name="model">message.template</field>
-            <field name="arch" type="xml">
-                <tree string="消息模板">
-                    <field name="name"/>
-<!--                    <field name="type"/>-->
-                    <field name="content"/>
-                    <field name="msgtype"/>
-                    <field name="notification_department_id"/>
-                    <field name="notification_employee_ids" widget="many2many_tags"/>
-                    <field name="description"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="sf_message_template_search_view" model="ir.ui.view">
-            <field name="name">sf.message.template.search.view</field>
-            <field name="model">message.template</field>
-            <field name="arch" type="xml">
-                <search>
-                    <field name="name" string="模糊搜索"
-                           filter_domain="['|','|',('name','like',self),('description','like',self)]"/>
-                    <field name="name"/>
-                    <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
-                </search>
-            </field>
-        </record>
-
-        <!--定义单证类型视图动作-->
-        <record id="sf_message_template_action" model="ir.actions.act_window">
-            <field name="name">消息模板</field>
-            <field name="res_model">message.template</field>
-            <field name="view_mode">tree,form</field>
-            <field name="view_id" ref="sf_message_template_view_tree"/>
-        </record>
-
-        <menuitem id="msg_set_menu" name="消息设置" parent="base.menu_administration" sequence="1"/>
-        <menuitem id="sf_message_template_send_menu" name="消息模板" parent="msg_set_menu"
-                  action="sf_message_template_action" sequence="1"/>
-    </data>
-</odoo>

sf_base/models/tool_base_new.py

@@ -321,7 +321,7 @@ class ToolInventory(models.Model):
     prefix = fields.Char('前缀')
     postfix = fields.Char('后缀')
     diameter = fields.Float('直径(mm)')
-    angle = fields.Float('R角(mm)')
+    angle = fields.Float('R角(mm)',default=0)
     tool_length = fields.Float('刀具总长(mm)')
     blade_length = fields.Float('避空长/刃长(mm)')
     knife_head_name = fields.Char('刀头名称')

sf_base/models/tool_other_features.py

@@ -23,7 +23,7 @@ class ToolMaterialsBasicParameters(models.Model):
     handle_length = fields.Float('柄部长度(mm)')
     blade_tip_diameter = fields.Float('刀尖直径(mm)')
     blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
-    tip_r_size = fields.Float('刀尖R角(mm)')
+    tip_r_size = fields.Float('刀尖R角(mm)',default=0)
     blade_tip_taper = fields.Integer('刀尖锥度(°)')
     blade_diameter = fields.Float('刃部直径(mm)')
     blade_length = fields.Float('刃部长度(mm)')
@@ -38,7 +38,7 @@ class ToolMaterialsBasicParameters(models.Model):
     width = fields.Float('宽度(mm)')
     cutting_blade_length = fields.Float('切削刃长(mm)')
     relief_angle = fields.Integer('后角(°)')
-    blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
+    blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20,default='0')
     inscribed_circle_diameter = fields.Float('内接圆直径IC/D(mm)')
     install_aperture_diameter = fields.Float('安装孔直径(mm)')
     chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],

sf_base/static/src/scss/test.scss

@@ -159,9 +159,6 @@ td.o_required_modifier {
   display:inline;
 }
 .diameter{
-  display: flex !important;
-  justify-content: flex-start !important;
-  align-items: center !important;
 }
 .o_address_format {
   display: flex !important;

sf_bf_connect/models/process_status.py

@@ -55,8 +55,7 @@ class StatusChange(models.Model):
                 logging.info('接口已经执行=============')
             else:
                 traceback_error = traceback.format_exc()
-                logging.error("bfm订单状态同步失败:%s request info %s" % traceback_error)
-                logging.error('/api/get/state/get_order 请求失败{}'.format(ret))
+                logging.error("bfm订单状态同步失败:%s" % traceback_error)
                 raise UserError('工厂加工同步订单状态到bfm失败')
         except UserError as e:
             traceback_error = traceback.format_exc()

sf_hr/__manifest__.py

@@ -7,7 +7,7 @@
     'sequence': 1,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['hr'],
+    'depends': ['base', 'hr'],
     'data': [
         'views/hr_employee.xml',
         'views/res_config_settings_views.xml',

sf_hr/models/hr_employee.py

@@ -20,7 +20,9 @@ class JkmPracticeEmployee(models.Model):
             if result['employee_list']:
                 for employee_info in result['employee_list']:
                     if employee_info['work_email']:
-                        self.sudo().search([('work_email', '=', employee_info['work_email'])]).write(
-                            {'we_id': employee_info['we_id']})
+                        hr_employee = self.sudo().search([('work_email', '=', employee_info['work_email'])])
+                        hr_employee.write({'we_id': employee_info['we_id']})
+                        if hr_employee.user_id:
+                            hr_employee.user_id.write({'we_employee_id': employee_info['we_id']})
         else:
             logging.info('_employee_info_sync error:%s' % result['message'])

sf_machine_connect/controllers/controllers.py

@@ -231,6 +231,95 @@ class Sf_Dashboard_Connect(http.Controller):
             res['message'] = '前端请求日志数据失败，原因:%s' % e
             return json.dumps(res)
 
+    @http.route('/api/logs/page_data', type='http', auth='public', methods=['GET', 'POST'],
+                csrf=False, cors="*")
+    def logs_page_data(self, **kw):
+        """
+                拿到日志数据返回给大屏展示（支持时间戳分页）
+                :param kw:
+                :return:
+                """
+        res = {'status': 1, 'message': '成功', 'data': {}}
+        logging.info('前端请求日志数据的参数为:%s' % kw)
+
+        try:
+            # 连接数据库
+            conn = psycopg2.connect(**db_config)
+            cur = conn.cursor()
+
+            # 获取并解析传递的参数
+            machine_list = ast.literal_eval(kw.get('machine_list', '[]'))
+            begin_time_str = kw.get('begin_time', '').strip('"')
+            end_time_str = kw.get('end_time', '').strip('"')
+            page = int(kw.get('page', 1))  # 默认页码为1
+            page_size = int(kw.get('page_size', 80))  # 默认每页条数为10
+
+            begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
+            end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
+
+            # 计算分页的 offset
+            offset = (page - 1) * page_size
+
+            # 先查询符合条件的总记录数
+            total_records = 0
+            for item in machine_list:
+                count_sql = '''
+                               SELECT COUNT(*) 
+                               FROM device_data 
+                               WHERE device_name = %s AND time >= %s AND time <= %s;
+                           '''
+                # 执行总记录数查询
+                cur.execute(count_sql, (item, begin_time, end_time))
+                record_count = cur.fetchone()[0]  # 获取总记录数
+                total_records += record_count
+
+            # 计算总页数
+            if total_records > 0:
+                total_pages = (total_records + page_size - 1) // page_size  # 向上取整
+            else:
+                total_pages = 0
+
+            # 将总页数和总记录数返回到响应中
+            res['total_records'] = total_records
+            res['total_pages'] = total_pages
+
+            for item in machine_list:
+                sql = '''
+                       SELECT time, device_state, program_name 
+                       FROM device_data 
+                       WHERE device_name = %s AND time >= %s AND time <= %s 
+                       ORDER BY time DESC 
+                       LIMIT %s OFFSET %s;
+                    '''
+                # 执行SQL命令，使用参数绑定
+                cur.execute(sql, (item, begin_time, end_time, page_size, offset))
+                results = cur.fetchall()
+
+                # 将数据按照 equipment_code 进行分组
+                if item not in res['data']:
+                    res['data'][item] = []
+
+                for result in results:
+                    res['data'][item].append({
+                        'time': result[0].strftime('%Y-%m-%d %H:%M:%S'),
+                        'state': result[1],
+                        'production_name': result[2],
+                    })
+
+            return json.dumps(res)  # 返回分页数据
+
+        except Exception as e:
+            logging.info('前端请求日志数据失败，原因:%s' % e)
+            res['status'] = -1
+            res['message'] = '前端请求日志数据失败，原因:%s' % e
+            return json.dumps(res)
+
+        finally:
+            if cur:
+                cur.close()
+            if conn:
+                conn.close()
+
     # 返回CNC机床列表
     @http.route('/api/CNCList', type='http', auth='public', methods=['GET', 'POST'], csrf=False,
                 cors="*")
@@ -378,7 +467,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 pass_rate = 1
                 if pass_nums:
                     pass_rate = round(
-                        (len(pass_nums) / detection_data if len(plan_data_finish_orders) > 0 else 0), 3)
+                        # (len(pass_nums) / detection_data if len(plan_data_finish_orders) > 0 else 0), 3)
+                        (len(pass_nums) / len(plan_data_finish_orders) if len(plan_data_finish_orders) > 0 else 0), 3)
 
                 # 返工率
                 rework_rate = round(
@@ -418,8 +508,9 @@ class Sf_Dashboard_Connect(http.Controller):
                         'plan_data_progress_deviation': plan_data_progress_deviation,
                         'plan_data_rework_counts': plan_data_rework_counts,
                         'on_time_rate': on_time_rate,
-                        'detection_data': detection_data,
-                        'pass_rate': pass_rate
+                        # 'detection_data': detection_data,
+                        'detection_data': plan_data_finish_counts,
+                        'pass_rate': (plan_data_finish_counts - plan_data_fault_counts) / plan_data_finish_counts
                     }
                     res['data'][line] = data
 
@@ -489,11 +580,14 @@ class Sf_Dashboard_Connect(http.Controller):
 
                 for time_interval in time_intervals:
                     start_time, end_time = time_interval
-                    # print(start_time, end_time)
-                    orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                                              (date_field_name, '>=', start_time.strftime('%Y-%m-%d 00:00:00')),
-                                              (date_field_name, '<', end_time.strftime('%Y-%m-%d 00:00:00'))
-                                              ])
+
+                    orders = plan_obj.search([
+                        ('production_line_id.name', '=', line),
+                        ('state', 'in', ['finished']),
+                        (date_field_name, '>=', start_time.strftime('%Y-%m-%d %H:%M:%S')),
+                        (date_field_name, '<=', end_time.strftime('%Y-%m-%d %H:%M:%S'))  # 包括结束时间
+                    ])
+
                     # 使用小时和分钟作为键，确保每个小时的数据有独立的键
                     key = start_time.strftime('%H:%M:%S')  # 只取小时:分钟:秒作为键
                     time_count_dict[key] = len(orders)
@@ -626,10 +720,16 @@ class Sf_Dashboard_Connect(http.Controller):
                  ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
                  ])
             # print(not_done_orders)
+
             # 完成订单
+            # 获取当前时间，并计算24小时前的时间
+            current_time = datetime.now()
+            time_24_hours_ago = current_time - timedelta(hours=24)
+
             finish_orders = plan_obj.search([
                 ('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                ('production_id.state', 'not in', ['cancel']), ('active', '=', True)
+                ('production_id.state', 'not in', ['cancel']), ('active', '=', True),
+                ('actual_end_time', '>=', time_24_hours_ago)
             ])
             # print(finish_orders)
 
@@ -687,6 +787,8 @@ class Sf_Dashboard_Connect(http.Controller):
                 not_done_data.append(line_dict)
 
             for finish_order in finish_orders:
+                if not finish_order.actual_end_time:
+                    continue
                 blank_name = ''
                 try:
                     blank_name = finish_order.production_id.move_raw_ids[0].product_id.name
@@ -707,7 +809,8 @@ class Sf_Dashboard_Connect(http.Controller):
                     'material': material,
                     'dimensions': dimensions,
                     'order_qty': finish_order.product_qty,
-                    'finish_time': finish_order.actual_end_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'finish_time': finish_order.actual_end_time.strftime(
+                        '%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '
 
                 }
                 done_data.append(line_dict)
@@ -791,54 +894,27 @@ class Sf_Dashboard_Connect(http.Controller):
         """
         查询设备的异常情况
         """
-        res = {'status': 1, 'message': '成功', 'data': {}}
+        res = {'status': 1, 'message': '成功', 'data': []}
         logging.info('前端请求机床数据的参数为:%s' % kw)
 
-        # 连接数据库
-        conn = psycopg2.connect(**db_config)
-        cur = conn.cursor()
         try:
-            # 获取请求的机床数据
+            maintenance_logs_obj = request.env['sf.maintenance.logs'].sudo()
+            # # 获取请求的机床数据
             # machine_list = ast.literal_eval(kw['machine_list'])
-            # idle_times = []
-            # idle_dict = {}
-
             # for item in machine_list:
-            sql = '''
-                SELECT DISTINCT ON (alarm_time) alarm_time, alarm_message, system_date, system_time, alarm_repair_time
-                FROM device_data
-                WHERE alarm_time IS NOT NULL
-                ORDER BY alarm_time, time;
+            #     machine_data = equipment_obj.search([('code', '=', item)])
+            for log in maintenance_logs_obj.search([]):
+                res['data'].append({
+                    'name': log.name,
+                    'alarm_time': log.alarm_time.strftime('%Y-%m-%d %H:%M:%S'),
+                    'fault_alarm_info': log.fault_alarm_info if log.fault_alarm_info else ' ',
+                    'fault_process': log.fault_process if log.fault_process else ' ',
+                })
 
-            '''
-            # 执行SQL命令
-            cur.execute(sql)
-            result = cur.fetchall()
-            # print('result', result)
-
-            # 将查询结果转换为字典列表
-            data = []
-            for row in result:
-                record = {
-                    'alarm_time': row[0],
-                    'alarm_message': row[1],
-                    'system_date': row[2],
-                    'system_time': row[3],
-                    'alarm_repair_time': row[4]
-                }
-                data.append(record)
-
-            # 将数据填充到返回结果中
-            res['data'] = data
-
-            # 返回统计结果
-            return json.dumps(res, ensure_ascii=False)
         except Exception as e:
-            print(f"An error occurred: {e}")
-            return json.dumps(res)
-        finally:
-            cur.close()
-            conn.close()
+            logging.error(f"An error occurred: {e}")
+
+        return json.dumps(res)
 
     # 设备oee
     @http.route('/api/OEE', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
@@ -1155,6 +1231,7 @@ class Sf_Dashboard_Connect(http.Controller):
         conn = psycopg2.connect(**db_config)
         # 获取请求的机床数据
         machine_list = ast.literal_eval(kw['machine_list'])
+        time_threshold = datetime.now() - timedelta(days=1)
 
         def fetch_result_as_dict(cursor):
             """辅助函数：将查询结果转为字典"""
@@ -1164,18 +1241,29 @@ class Sf_Dashboard_Connect(http.Controller):
         for item in machine_list:
             with conn.cursor() as cur:
                 cur.execute("""
-                    SELECT * FROM device_data
-                    WHERE device_name = %s
-                    AND device_state != '离线'
-                    ORDER BY time DESC
-                    LIMIT 1;
-                """, (item,))
+                            SELECT * FROM device_data
+                            WHERE device_name = %s
+                            AND device_state != '离线'
+                            ORDER BY time DESC
+                            LIMIT 1;
+                        """, (item,))
                 last_all_time = fetch_result_as_dict(cur)
+            with conn.cursor() as cur:
+                cur.execute("""
+                            SELECT * FROM device_data
+                            WHERE device_name = %s
+                            AND device_state != '离线' AND time >= %s
+                            ORDER BY time ASC
+                            LIMIT 1;
+                        """, (item, time_threshold))
+                last_24_time = fetch_result_as_dict(cur)
             # 返回数据
             res['data'][item] = {
                 'wait_time': last_all_time['run_time'] if last_all_time['run_time'] is not None else 0,
                 'cut_time': last_all_time['process_time'] if last_all_time['process_time'] is not None else 0,
-                'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0
+                'cut_24_time': last_24_time['process_time'] if last_24_time['process_time'] is not None else 0,
+                'power_on_time': last_all_time['power_on_time'] if last_all_time['power_on_time'] is not None else 0,
+                'power_on_24_time': last_24_time['power_on_time'] if last_24_time['power_on_time'] is not None else 0
             }
 
         conn.close()

sf_maintenance/models/sf_maintenance_logs.py

@@ -1,13 +1,14 @@
 # -*-coding:utf-8-*-
-from odoo import fields, models
+from odoo import fields, models, api
 
 
 class SfMaintenanceLogs(models.Model):
     _name = 'sf.maintenance.logs'
     _description = '设备故障日志'
+    _order = 'alarm_time desc'
 
-    code = fields.Char(string='编码')
-    name = fields.Char(string='名称')
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string='名称', compute='_compute_name')
     type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型')
     brand = fields.Many2one('sf.machine.brand', related='maintenance_equipment_id.brand_id', string='品牌')
     maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='机台号')
@@ -28,3 +29,13 @@ class SfMaintenanceLogs(models.Model):
     fault_duration = fields.Float(string='故障时长')
     note = fields.Text(string='备注')
     active = fields.Boolean('Active', default=True)
+
+    @api.depends('code')
+    def _compute_name(self):
+        for record in self:
+            if record.code:
+                record.name = self.env['maintenance.equipment'].sudo().search([('code', '=', record.code), ('active', '=', True)]).name
+                record.maintenance_equipment_id = self.env['maintenance.equipment'].sudo().search([('code', '=', record.code), ('active', '=', True)]).id
+            else:
+                record.name = ''
+

sf_maintenance/models/sf_maintenance_oee.py

@@ -1,5 +1,9 @@
 # -*- coding: utf-8 -*-
+import json
+import datetime
+import requests
 from odoo import api, fields, models, _
+from odoo.exceptions import UserError
 
 
 class SfMaintenanceEquipmentOEE(models.Model):
@@ -9,6 +13,9 @@ class SfMaintenanceEquipmentOEE(models.Model):
     name = fields.Char('设备oee')
     equipment_id = fields.Many2one('maintenance.equipment', '机台号',
                                    domain="[('category_id.equipment_type', '=', '机床'),('state_zc', '=', '已注册')]")
+
+    equipment_code = fields.Char('设备编码', related='equipment_id.code', store=True)
+
     type_id = fields.Many2one('sf.machine_tool.type', '型号', related='equipment_id.type_id')
     machine_tool_picture = fields.Binary('设备图片', related='equipment_id.machine_tool_picture')
     state = fields.Selection(
@@ -28,6 +35,157 @@ class SfMaintenanceEquipmentOEE(models.Model):
                                               related='equipment_id.sf_maintenance_logs_ids')
     oee_logs = fields.One2many('maintenance.equipment.oee.logs', 'equipment_oee_id', string='运行日志')
 
+    day_logs_detail = fields.Html('日运行日志详情')
+    history_logs_detail = fields.Html('历史运行日志详情')
+    begin_time = fields.Date('开始时间')
+    end_time = fields.Date('结束时间')
+
+    # 获取日志详情
+    def get_day_logs(self):
+        config = self.env['ir.config_parameter'].sudo()
+        url = 'http://172.16.10.112:8069/api/logs/list'
+        machine_list = [self.equipment_code]
+        begin_time = datetime.datetime.now().strftime('%Y-%m-%d') + ' 00:00:00'
+        end_time = datetime.datetime.now().strftime('%Y-%m-%d') + ' 23:59:59'
+
+        # 请求的数据
+        data = {
+            "machine_list": str(machine_list),
+            "begin_time": begin_time,
+            "end_time": end_time
+        }
+
+        print(data)
+
+        # 发送POST请求
+        response = requests.post(url, json={}, data=data)
+        print(response.json())  # 输出服务器返回的响应
+        if response.status_code == 200:
+            result = response.json()
+            print('============', result)
+            if result['status'] == 1:
+                logs_list = result['data'][self.equipment_code]
+                logs_detail = ''
+                log_state = ''
+                for log in logs_list:
+                    if log['state'] != log_state:
+                        print('loooooooooooooooooooogs', log)
+                        production_name = log['production_name'] if log['production_name'] else ' '
+                        logs_detail += '<tr><td>' + log['time'] + '</td><td>' + log[
+                            'state'] + '</td><td>' + production_name + '</td></tr>'
+                        log_state = log['state']
+                # self.day_logs_detail = '<table><tr><th>时间</th><th>事件/状态</th><th>加工工单</th></tr>' + logs_detail + '</table>'
+                self.day_logs_detail = '''
+                    <table border="1" style="border-collapse: collapse; width: 100%; text-align: center;">
+                        <tr style="background-color: #f2f2f2;">
+                            <th style="padding: 8px; border: 1px solid #ddd;">时间</th>
+                            <th style="padding: 8px; border: 1px solid #ddd;">事件/状态</th>
+                            <th style="padding: 8px; border: 1px solid #ddd;">加工工单</th>
+                        </tr>
+                        {logs_detail}
+                    </table>
+                '''.format(logs_detail=logs_detail)
+
+            else:
+                self.day_logs_detail = '获取日志失败'
+        else:
+            self.day_logs_detail = '获取日志失败'
+
+    # 获取历史日志详情
+    def get_history_logs(self):
+        config = self.env['ir.config_parameter'].sudo()
+        url = 'http://172.16.10.112:8069/api/logs/list'
+        machine_list = [self.equipment_code]
+        if not self.begin_time:
+            raise UserError('请选择开始时间')
+        if not self.end_time:
+            raise UserError('请选择结束时间')
+
+        begin_time = self.begin_time.strftime('%Y-%m-%d') + ' 00:00:00'
+        end_time = self.end_time.strftime('%Y-%m-%d') + ' 23:59:59'
+
+        # 请求的数据
+        data = {
+            "machine_list": str(machine_list),
+            "begin_time": begin_time,
+            "end_time": end_time
+        }
+
+        print(data)
+
+        # 发送POST请求
+        response = requests.post(url, json={}, data=data)
+        print(response.json())  # 输出服务器返回的响应
+        if response.status_code == 200:
+            result = response.json()
+            print('============', result)
+            if result['status'] == 1:
+                logs_list = result['data'][self.equipment_code]
+                logs_detail = ''
+                log_state = ''
+                for log in logs_list:
+                    if log['state'] != log_state:
+                        production_name = log['production_name'] if log['production_name'] else ' '
+                        logs_detail += '<tr><td>' + log['time'] + '</td><td>' + log[
+                            'state'] + '</td><td>' + production_name + '</td></tr>'
+                        log_state = log['state']
+                # self.day_logs_detail = '<table><tr><th>时间</th><th>事件/状态</th><th>加工工单</th></tr>' + logs_detail + '</table>'
+                self.history_logs_detail = '''
+                            <table border="1" style="border-collapse: collapse; width: 100%; text-align: center;">
+                                <tr style="background-color: #f2f2f2;">
+                                    <th style="padding: 8px; border: 1px solid #ddd;">时间</th>
+                                    <th style="padding: 8px; border: 1px solid #ddd;">事件/状态</th>
+                                    <th style="padding: 8px; border: 1px solid #ddd;">加工工单</th>
+                                </tr>
+                                {logs_detail}
+                            </table>
+                        '''.format(logs_detail=logs_detail)
+
+            else:
+                self.history_logs_detail = '获取日志失败'
+        else:
+            self.history_logs_detail = '获取日志失败'
+
+    # 下载历史日志
+    def download_history_logs(self):
+        config = self.env['ir.config_parameter'].sudo()
+        url = 'http://172.16.10.112:8069/api/logs/list'
+        machine_list = [self.equipment_code]
+        if not self.begin_time:
+            raise UserError('请选择开始时间')
+        if not self.end_time:
+            raise UserError('请选择结束时间')
+
+        begin_time = self.begin_time.strftime('%Y-%m-%d') + ' 00:00:00'
+        end_time = self.end_time.strftime('%Y-%m-%d') + ' 23:59:59'
+
+        # 请求的数据
+        data = {
+            "machine_list": str(machine_list),
+            "begin_time": begin_time,
+            "end_time": end_time
+        }
+
+        print(data)
+
+        # 发送POST请求
+        response = requests.post(url, json={}, data=data)
+        print(response.json())  # 输出服务器返回的响应
+        if response.status_code == 200:
+            result = response.json()
+            print('============', result)
+            if result['status'] == 1:
+                logs_list = result['data'][self.equipment_code]
+                logs_detail = ''
+                for log in logs_list:
+                    production_name = log['production_name'] if log['production_name'] else ' '
+                    # todo 下载日志
+
+            else:
+                self.history_logs_detail = '下载日志失败'
+        else:
+            self.history_logs_detail = '下载日志失败'
+
     def name_get(self):
         result = []
         for parameter in self:
@@ -95,4 +253,3 @@ class SfMaintenanceEquipmentOEELogDetail(models.Model):
     log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志')
     # equipment_code = fields.Char('设备编码', related='log_id.equipment_code')
     equipment_code = fields.Char('设备编码', readonly='True')
-

sf_maintenance/views/maintenance_equipment_oee_views.xml

@@ -38,6 +38,7 @@
                         <group>
                             <group>
                                 <field name="type_id" readonly="1"/>
+                                <field name="equipment_code"/>
                                 <field name="equipment_time"/>
                                 <field name="run_time"/>
                                 <field name="done_nums"/>
@@ -48,21 +49,61 @@
                             <group>
                                 <field name="machine_tool_picture" widget="image" readonly="1"/>
                             </group>
-
                         </group>
-<!--                         <notebook> -->
-<!--                         <page string="运行日志"> -->
-<!--                             <field name="oee_logs"> -->
-<!--                                 <tree create="1" edit="1" delete="1" editable="bottom"> -->
-<!--                                     <field name = 'run_time'/> -->
-<!--                                     <field name = 'state'/> -->
-<!--                                     <field name = 'workorder_id'/> -->
-<!--                                     <field name = 'time'/> -->
-<!--                                     <field name = 'color' widget="color"/> -->
-<!--                                 </tree> -->
-<!--                             </field> -->
-<!--                         </page> -->
-<!--                         </notebook> -->
+                        <notebook>
+                        <page string="24H日志详情">
+                            <group>
+                                <button name="get_day_logs" type="object" string="查看24H日志" t-attf-style="white-space:nowrap;"/>
+                            </group>
+                            <field name="day_logs_detail" readonly="1" widget="html"/>
+<!--                             <field name="page_num"/> -->
+<!--                             <group> -->
+<!--                                 <group> -->
+<!--                                     <button name="previous_day_logs" type="object" string="上一页" t-attf-style="white-space:nowrap;"/> -->
+<!--                                 </group> -->
+<!--                                 <group> -->
+<!--                                     <button name="next_day_logs" type="object" string="下一页" t-attf-style="white-space:nowrap;"/> -->
+<!--                                 </group> -->
+<!--                             </group> -->
+
+
+<!--                             <field name="day_logs_detail"/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1"/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1" class="oe_form_field oe_form_field_html"/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1" class="oe_form_field oe_form_field_html" options='{"class": "o_form_readonly"}'/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1" class="oe_form_field oe_form_field_html" options='{"class": "o_form_readonly", "readonly": true, "style": "width: 100%; height: 400px;"}'/> -->
+<!--                             <group> -->
+<!--                                 <div class="oe_html_field"> -->
+<!--                                     <div id="pagination_day_logs"> -->
+<!--                                         <button id="prev_page_day_logs" disabled="true">Previous</button> -->
+<!--                                         <button id="next_page_day_logs">Next</button> -->
+<!--                                     </div> -->
+<!--                                 </div> -->
+<!--                             </group> -->
+                        </page>
+                        <page string="历史日志详情">
+                            <group>
+                                <group>
+                                    <group>
+                                    <field name="begin_time"/>
+                                    </group>
+                                     <group>
+                                    <field name="end_time"/>
+                                    </group>
+                                </group>
+                                <group>
+                                    <group>
+                                        <button name="get_history_logs" type="object" string="查看历史日志" t-attf-style="white-space:nowrap;"/>
+                                    </group>
+                                    <group>
+                                        <button name="download_history_logs" type="object" string="下载历史日志" t-attf-style="white-space:nowrap;"/>
+                                    </group>
+                                </group>
+
+                            </group>
+                            <field name="history_logs_detail"/>
+                        </page>
+                    </notebook>
                     </sheet>
                 </form>
             </field>

sf_maintenance/views/maintenance_logs_views.xml

@@ -8,8 +8,8 @@
             <field name="arch" type="xml">
                 <tree>
                     <field name="type" optional="hide"/>
-                    <field name="brand"/>
-                    <field name="maintenance_equipment_id"/>
+<!--                     <field name="brand"/> -->
+                    <field name="name"/>
                     <field name="code_location" optional="hide"/>
                     <field name="fault_code" optional="hide"/>
                     <field name="alarm_time"/>
@@ -37,13 +37,14 @@
                     <sheet>
                         <div class="oe_title">
                             <h1>
-                                <field name="code" readonly="1"/>
+                                <field name="name" readonly="1"/>
                             </h1>
                         </div>
                         <group>
                             <group>
 
-<!--                                 <field name="name"/> -->
+
+                                <field name="code"/>
 <!--                                 <field name="type" required="1" widget="radio" options="{'horizontal': true}"/> -->
                                 <field name="maintenance_equipment_id"/>
                                 <field name="brand"/>
@@ -57,7 +58,6 @@
                             </group>
                             <group>
                                 <field name="operator"/>
-
                                 <field name="fault_process"/>
 <!--                                 <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/> -->
                                 <field name="recovery_time"/>

sf_manufacturing/models/agv_scheduling.py

@@ -156,17 +156,26 @@ class AgvScheduling(models.Model):
         if agv_site_state == '空闲':
             # 查询终点接驳站为agv_site_id的AGV路线
             task_routes = self.env['sf.agv.task.route'].sudo().search([('end_site_id', '=', agv_site_id)])
-            agv_scheduling = self.env['sf.agv.scheduling'].sudo().search(
+            agv_schedulings = self.env['sf.agv.scheduling'].sudo().search(
                 [('state', '=', '待下发'), ('agv_route_type', 'in', task_routes.mapped('route_type'))],
                 order='id asc',
-                limit=1
             )
-            task_route = task_routes.filtered(
-                lambda r: r.start_site_id == agv_scheduling.start_site_id and r.start_site_id == agv_scheduling.start_site_id
-            )
-            if task_route:
-                # 下发AGV调度任务并修改接驳站状态为占用
-                agv_scheduling.dispatch_scheduling(task_route)
+            for agv_scheduling in agv_schedulings:
+                # 找到所有起点接驳站匹配的路线
+                start_matched_task_routes = task_routes.filtered(
+                    lambda r: r.start_site_id == agv_scheduling.start_site_id
+                )
+                # 如果调度任务有终点接驳站，找到终点接驳站匹配的路线
+                if agv_scheduling.end_site_id:
+                    matched_task_routes = start_matched_task_routes.filtered(
+                        lambda r: r.end_site_id == agv_scheduling.end_site_id
+                    )
+                else:
+                    matched_task_routes = start_matched_task_routes
+                if matched_task_routes:
+                    # 下发AGV调度任务并修改接驳站状态为占用
+                    agv_scheduling.dispatch_scheduling(matched_task_routes[0])
+                    break;
 
     def _delivery_avg(self):
         config = self.env['res.config.settings'].get_values()

sf_manufacturing/models/mrp_production.py

@@ -990,8 +990,8 @@ class MrpProduction(models.Model):
                                 panel_workorder.cmm_ids.sudo().unlink()
                             if panel_workorder.cnc_ids:
                                 panel_workorder.cnc_ids.sudo().unlink()
-                                self.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
-                                    production)
+                                # self.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
+                                #     production)
                             # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
                             #                                       processing_panel)
                             logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)

sf_manufacturing/models/mrp_workorder.py

@@ -1082,6 +1082,12 @@ class ResMrpWorkOrder(models.Model):
 
     # 重写工单开始按钮方法
     def button_start(self):
+        if self.routing_type == 'CNC加工':
+            self.env['sf.production.plan'].sudo().search([('name', '=', self.production_id.name)]).write({
+                'state': 'processing',
+                'actual_start_time': datetime.now()
+            })
+
         if self.routing_type == '装夹预调':
             # 判断是否有坯料的序列号信息
             boolean = False

sf_manufacturing/models/product_template.py

@@ -44,6 +44,9 @@ class ResProductMo(models.Model):
     materials_id = fields.Many2one('sf.production.materials', string='材料')
     materials_type_id = fields.Many2one('sf.materials.model', string='材料型号',
                                         domain="[('materials_id', '=', materials_id)]")
+    # materials_type_id = fields.Many2one(related='cutting_tool_model_id.material_model_id', string='材料型号',
+    #                                     domain="[('materials_id', '=', materials_id)]")
+    # cutting_tool_model_id.material_model_id
     server_product_process_parameters_id = fields.Many2one('sf.production.process.parameter',
                                                            string='表面工艺参数(服务产品)')
     model_process_parameters_ids = fields.Many2many('sf.production.process.parameter', 'process_parameter_rel',
@@ -57,41 +60,100 @@ class ResProductMo(models.Model):
 
     cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
                                            domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
-
-    brand_id = fields.Many2one('sf.machine.brand', '品牌')
-
-    tool_length = fields.Float('长度(mm)')
-    tool_width = fields.Float('宽度(mm)')
+    # cutting_tool_type_id = fields.Many2one(related='cutting_tool_model_id.cutting_tool_type_id', string='类型',
+    #                                        domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
+    # brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    brand_id = fields.Many2one(related='cutting_tool_model_id.brand_id', string='品牌')
+    # cutting_tool_model_id.brand_id
+    # tool_length = fields.Float('长度(mm)')
+    tool_length = fields.Float(related='specification_id.length', string='长度(mm)')
+    # specification_id.length
+    # tool_width = fields.Float('宽度(mm)')
+    tool_width = fields.Float(related='specification_id.width', string='宽度(mm)')
+    # specification_id.width
     tool_height = fields.Float('高度(mm)')
-    tool_thickness = fields.Float('厚度(mm)')
-    tool_weight = fields.Float('重量(kg)')
-    tool_hardness = fields.Integer('硬度(hrc)')
-    coating_material = fields.Char('涂层材质')
+    # tool_thickness = fields.Float('厚度(mm)')
+    tool_thickness = fields.Float(related='specification_id.thickness', string='厚度(mm)')
+    # specification_id.thickness
+    # tool_weight = fields.Float('重量(kg)')
+    tool_weight = fields.Float(related='specification_id.weight', string='重量(kg)')
+    # specification_id.weight
+    # tool_hardness = fields.Integer('硬度(hrc)')
+    tool_hardness = fields.Integer(related='cutting_tool_model_id.tool_hardness', string='硬度(hrc)')
+    # cutting_tool_model_id.tool_hardness
+    # coating_material = fields.Char('涂层材质')
+    coating_material = fields.Char(related='cutting_tool_model_id.coating_material', string='涂层材质')
+    # cutting_tool_model_id.coating_material
     # 整体式刀具特有字段
-    cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
-    cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
-    cutting_tool_blade_length = fields.Float('刃部长度(mm)')
-    cutting_tool_blade_number = fields.Selection(
-        [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
-        string='刃数(个)', default='0')
+    # cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
+    cutting_tool_total_length = fields.Float(related='specification_id.total_length', string='总长度(mm)', digits=(6, 1))
+    # specification_id.total_length
+    # cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
+    cutting_tool_shank_length = fields.Float(related='specification_id.handle_length', string='柄部长度(mm)',
+                                             digits=(6, 1))
+    # specification_id.handle_length
+    # cutting_tool_blade_length = fields.Float('刃部长度(mm)')
+    cutting_tool_blade_length = fields.Float(related='specification_id.blade_length', string='刃部长度(mm)')
+    # specification_id.blade_length
+    # cutting_tool_blade_number = fields.Selection(
+    #     [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
+    #     string='刃数(个)', default='0')
+    cutting_tool_blade_number = fields.Selection(related='specification_id.blade_number', string='刃数(个)')
+    # specification_id.blade_number
     # 整体式刀具新增字段
-    cutting_tool_neck_length = fields.Float('颈部长度(mm)', digits=(6, 1))
-    cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
-    cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
-    cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
-    cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
-    cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
-    cutting_tool_blade_type = fields.Char('刃部类型')
-    cutting_tool_pitch = fields.Float('牙距(mm)')
-    cutting_tool_blade_width = fields.Float('刃部宽度(mm)')
-    cutting_tool_blade_depth = fields.Float('刃部深度(mm)')
+    # cutting_tool_neck_length = fields.Float('颈部长度(mm)', digits=(6, 1))
+    cutting_tool_neck_length = fields.Float(related='specification_id.neck_length', string='颈部长度(mm)', digits=(6, 1))
+    # specification_id.neck_length
+    # cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
+    cutting_tool_neck_diameter = fields.Float(related='specification_id.neck_diameter', string='颈部直径(mm)',
+                                               digits=(6, 1))
+    # specification_id.neck_diameter
+    # cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
+    cutting_tool_shank_diameter = fields.Float(related='specification_id.handle_diameter', string='柄部直径(mm)', digits=(6, 1))
+    # specification_id.handle_diameter
+    # cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
+    cutting_tool_blade_tip_diameter = fields.Float(related='specification_id.blade_tip_diameter', string='刀尖直径(mm)',
+                                               digits=(6, 1))
+    # specification_id.blade_tip_diameter
+    # cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
+    cutting_tool_blade_tip_taper = fields.Integer(related='specification_id.blade_tip_taper', string='刀尖锥度(°)')
+    # specification_id.blade_tip_taper
+    # cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
+    cutting_tool_blade_helix_angle = fields.Integer(related='specification_id.blade_helix_angle', string='刃部螺旋角(°)')
+    # specification_id.blade_helix_angle
+    # cutting_tool_blade_type = fields.Char('刃部类型')
+    cutting_tool_blade_type = fields.Char(related='cutting_tool_model_id.blade_type', string='刃部类型')
+    # cutting_tool_pitch = fields.Float('牙距(mm)')
+    cutting_tool_pitch = fields.Float(related='specification_id.pitch', string='牙距(mm)')
+    # specification_id.pitch
+    # cutting_tool_blade_width = fields.Float('刃部宽度(mm)')
+    cutting_tool_blade_width = fields.Float(related='specification_id.blade_width', string='刃部宽度(mm)')
+    # specification_id.blade_width
+    # cutting_tool_blade_depth = fields.Float('刃部深度(mm)')
+    cutting_tool_blade_depth = fields.Float(related='specification_id.blade_depth', string='刃部深度(mm)')
+    # specification_id.blade_depth
     cutting_tool_cut_depth = fields.Float('切削深度(mm)')
-    cutting_tool_cut_depth_max = fields.Float('最大切削深度(mm)')
-    cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
-    cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
-    cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
-    cutting_tool_blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
-    cutting_tool_blade_tip_r_size = fields.Float('刀尖R角(mm)')
+    # cutting_tool_cut_depth_max = fields.Float('最大切削深度(mm)')
+    cutting_tool_cut_depth_max = fields.Float(related='specification_id.cut_depth_max', string='最大切削深度(mm)')
+    # specification_id.cut_depth_max
+    # cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
+    cutting_tool_coarse_medium_fine = fields.Selection(related='cutting_tool_model_id.integral_coarse_medium_fine', string='粗/中/精')
+    # cutting_tool_model_id.integral_coarse_medium_fine
+    # cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
+    cutting_tool_run_out_accuracy_max = fields.Char(related='cutting_tool_model_id.integral_run_out_accuracy_max', string='端跳精度max', digits=(6, 1))
+    # cutting_tool_model_id.integral_run_out_accuracy_max
+    # cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
+    cutting_tool_run_out_accuracy_min = fields.Char(related='cutting_tool_model_id.integral_run_out_accuracy_min',
+                                                       string='端跳精度min', digits=(6, 1))
+    # cutting_tool_model_id.integral_run_out_accuracy_min
+    # cutting_tool_blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
+    cutting_tool_blade_tip_working_size = fields.Char(related='specification_id.blade_tip_working_size',
+                                                    string='刀尖倒角度(°)', size=20)
+    # specification_id.blade_tip_working_size
+    # cutting_tool_blade_tip_r_size = fields.Float('刀尖R角(mm)')
+    cutting_tool_blade_tip_r_size = fields.Float(related='specification_id.tip_r_size',
+                                                      string='刀尖R角(mm)')
+    # specification_id.tip_r_size
     fit_blade_shape_id = fields.Many2one('maintenance.equipment.image',
                                          '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
@@ -429,44 +491,97 @@ class ResProductMo(models.Model):
     #         if not self.cutting_direction_ids:
     #             raise ValidationError("请选择走刀方向")
 
-    cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
+    # cutting_speed_ids = fields.One2many('sf.cutting.speed', 'product_template_id', string='切削速度Vc')
+    cutting_speed_ids = fields.One2many(related='cutting_tool_model_id.cutting_speed_ids',
+                                               string='切削速度Vc')
+    # cutting_tool_model_id.cutting_speed_ids
     feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'product_template_id', string='每齿走刀量fz')
     cutting_tool_diameter = fields.Float('刀具直径(mm)')
-    cutting_tool_rear_angle = fields.Integer('后角(°)')
-    cutting_tool_main_included_angle = fields.Integer('主偏角(°)')
+    # cutting_tool_rear_angle = fields.Integer('后角(°)')
+    cutting_tool_rear_angle = fields.Integer(related='specification_id.relief_angle',
+                                        string='后角(°)')
+    # specification_id.relief_angle
+    # cutting_tool_main_included_angle = fields.Integer('主偏角(°)')
+    cutting_tool_main_included_angle = fields.Integer(related='specification_id.main_included_angle',
+                                             string='主偏角(°)')
+    # specification_id.main_included_angle
     # 适用夹头型号可以多选
     cutting_tool_chuck_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
         domain="[('cutting_tool_type', '=', '夹头')]",
         string='适用夹头型号')
     # 刀片参数
-    cutting_tool_cut_blade_length = fields.Float('切削刃长(mm)')
-    cutting_tool_blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
-    cutting_tool_top_angle = fields.Integer('顶角(°)')
-    cutting_tool_inscribed_circle_diameter = fields.Float('内接圆直径(mm)')
-    cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
-    cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
-                                                        string='有无断屑槽')
-    cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号')
-    cutting_tool_bladed_teeth_model = fields.Selection(
-        [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
-         ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
-         ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
-         ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
-         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无')
-    cutting_tool_blade_blade_number = fields.Selection(
-        [('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'),
-         ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
-        string='刀片的刃数(个)')
+    # cutting_tool_cut_blade_length = fields.Float('切削刃长(mm)')
+    cutting_tool_cut_blade_length = fields.Float(related='specification_id.cutting_blade_length',
+                                        string='切削刃长(mm)')
+    # specification_id.cutting_blade_length
+    # cutting_tool_blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
+    cutting_tool_blade_tip_circular_arc_radius = fields.Char(related='specification_id.blade_tip_circular_arc_radius',
+                                                    string='刀尖圆弧半径(mm)')
+    # specification_id.blade_tip_circular_arc_radius
+    # cutting_tool_top_angle = fields.Integer('顶角(°)')
+    cutting_tool_top_angle = fields.Integer(related='specification_id.top_angle',
+                                                      string='顶角(°)')
+    # specification_id.top_angle
+    # cutting_tool_inscribed_circle_diameter = fields.Float('内接圆直径(mm)')
+    cutting_tool_inscribed_circle_diameter = fields.Float(related='specification_id.inscribed_circle_diameter',
+                                                             string='内接圆直径(mm)')
+    # specification_id.inscribed_circle_diameter
+    # cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
+    cutting_tool_install_aperture_diameter = fields.Float(related='specification_id.install_aperture_diameter',
+                                                             string='安装孔直径(mm)')
+    # specification_id.install_aperture_diameter
+    # cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
+    #                                                     string='有无断屑槽')
+    cutting_tool_chip_breaker_groove = fields.Selection(related='specification_id.chip_breaker_groove',
+                                                          string='有无断屑槽')
+    # specification_id.chip_breaker_groove
+    # cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号')
+    cutting_tool_chip_breaker_type_code = fields.Char(related='specification_id.chip_breaker_type_code',
+                                                          string='断屑槽型代号')
+    # specification_id.chip_breaker_type_code
+    # cutting_tool_bladed_teeth_model = fields.Selection(
+    #     [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
+    #      ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
+    #      ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
+    #      ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
+    #      ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无')
+    cutting_tool_bladed_teeth_model = fields.Selection(related='specification_id.blade_teeth_model',
+                                                      string='断屑槽型代号')
+    # specification_id.blade_teeth_model
+    # cutting_tool_blade_blade_number = fields.Selection(
+    #     [('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'),
+    #      ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
+    #     string='刀片的刃数(个)')
+    cutting_tool_blade_blade_number = fields.Selection(related='specification_id.blade_blade_number',
+                                                          string='刀片的刃数(个)')
+    # specification_id.blade_blade_number
 
-    cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
-                                                 string='螺纹类型')
-    cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
-    cutting_tool_blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
-    cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
-    cutting_tool_thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
-
-    cutting_tool_jump_accuracy = fields.Char('径跳精度(mm)')
+    # cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
+    #                                              string='螺纹类型')
+    cutting_tool_thread_model = fields.Selection(related='specification_id.thread_model',
+                                                          string='螺纹类型')
+    # specification_id.thread_model
+    # cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
+    cutting_tool_thread_num = fields.Float(related='specification_id.thread_num',
+                                                 string='每英寸螺纹数(tpi)')
+    # specification_id.thread_num
+    # cutting_tool_blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
+    cutting_tool_blade_tip_height_tolerance = fields.Char(related='specification_id.blade_tip_height_tolerance',
+                                             string='刀尖高度公差(mm)')
+    # specification_id.blade_tip_height_tolerance
+    # cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
+    cutting_tool_inscribed_circle_tolerance = fields.Char(related='specification_id.inscribed_circle_tolerance',
+                                                          string='内接圆公差(mm)')
+    # specification_id.inscribed_circle_tolerance
+    # cutting_tool_thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
+    cutting_tool_thickness_tolerance = fields.Char(related='specification_id.thickness_tolerance',
+                                                          string='厚度公差(mm)')
+    # specification_id.thickness_tolerance
+    # cutting_tool_jump_accuracy = fields.Char('径跳精度(mm)')
+    cutting_tool_jump_accuracy = fields.Char(related='specification_id.run_out_accuracy',
+                                               string='径跳精度(mm)')
+    # specification_id.run_out_accuracy
     cutting_tool_working_hardness = fields.Integer('加工硬度(hrc)')
     cutting_tool_cutter_bar_ids = fields.Many2many(
         'sf.cutting_tool.standard.library',
@@ -485,55 +600,153 @@ class ResProductMo(models.Model):
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
     # 刀杆/参数
-    cutting_tool_knife_head_height = fields.Float('刀头高度(mm)')
-    cutting_tool_knife_head_width = fields.Float('刀头宽度(mm)')
-    cutting_tool_knife_head_length = fields.Float('刀头长度(mm)')
-    cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
-    cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)')
-    cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
-    cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)')
-    cutting_tool_installing_structure = fields.Char('安装结构', size=20)
+    # cutting_tool_knife_head_height = fields.Float('刀头高度(mm)')
+    cutting_tool_knife_head_height = fields.Float(related='specification_id.knife_head_height',
+                                               string='刀头高度(mm)')
+    # specification_id.knife_head_height
+    # cutting_tool_knife_head_width = fields.Float('刀头宽度(mm)')
+    cutting_tool_knife_head_width = fields.Float(related='specification_id.knife_head_width',
+                                                  string='刀头宽度(mm)')
+    # cutting_tool_knife_head_length = fields.Float('刀头长度(mm)')
+    cutting_tool_knife_head_length = fields.Float(related='specification_id.knife_head_length',
+                                                  string='刀头长度(mm)')
+    # cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
+    cutting_tool_blade_diameter = fields.Float(related='specification_id.blade_diameter',
+                                                     string='刃径/刃部直径(mm)')
+    # specification_id.blade_diameter
+    # cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)')
+    cutting_tool_cutter_arbor_diameter = fields.Float(related='specification_id.cutter_arbor_diameter',
+                                                        string='刀杆直径(mm)')
+    # specification_id.cutter_arbor_diameter
+    # cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
+    cutting_tool_min_machining_aperture = fields.Integer(related='specification_id.min_machining_aperture',
+                                                        string='最小加工孔径(mm)')
+    # specification_id.min_machining_aperture
+    # cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)')
+    cutting_tool_install_blade_tip_num = fields.Integer(related='specification_id.install_blade_tip_num',
+                                            string='可装刀片数/齿数(个)')
+    # specification_id.install_blade_tip_num
+    # cutting_tool_installing_structure = fields.Char('安装结构', size=20)
+    cutting_tool_installing_structure = fields.Char(related='specification_id.installing_structure',
+                                                        string='安装结构')
+    # specification_id.installing_structure
     cutting_tool_blade_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
         domain="[('cutting_tool_type', '=', '刀片')]",
         string='适用刀片型号'  # 使用空列表作为默认值
     )
-    cutting_tool_tool_shim = fields.Char('适配刀垫型号', size=50)
-    cutting_tool_cotter_pin = fields.Char('适配销钉型号', size=50)
-    cutting_tool_pressing_plate = fields.Char('适配压板型号', size=50)
-    cutting_tool_screw = fields.Char('适配螺钉型号', size=50)
-    cutting_tool_wrench = fields.Char('适配扳手型号')
-    cutting_tool_is_cooling_hole = fields.Boolean('有无冷却孔', default=False)
-    cutting_tool_locating_slot_code = fields.Char('定位槽代号', size=20)
+    # cutting_tool_blade_id = fields.Many2one(related='specification_id.blade_id',
+    #                                         domain="[('cutting_tool_type', '=', '刀片')]",
+    #                                  string='适用刀片型号')
+    # specification_id.blade_id
+    # cutting_tool_tool_shim = fields.Char('适配刀垫型号', size=50)
+    cutting_tool_tool_shim = fields.Char(related='specification_id.tool_shim',
+                                     string='适配刀垫型号')
+    # specification_id.tool_shim
+    # cutting_tool_cotter_pin = fields.Char('适配销钉型号', size=50)
+    cutting_tool_cotter_pin = fields.Char(related='specification_id.cotter_pin',
+                                         string='适配销钉型号')
+    # cutting_tool_pressing_plate = fields.Char('适配压板型号', size=50)
+    cutting_tool_pressing_plate = fields.Char(related='specification_id.pressing_plate',
+                                         string='适配压板型号')
+    # cutting_tool_screw = fields.Char('适配螺钉型号', size=50)
+    cutting_tool_screw = fields.Char(related='specification_id.screw',
+                                                      string='适配螺钉型号')
+    # specification_id.screw
+    # cutting_tool_wrench = fields.Char('适配扳手型号')
+    cutting_tool_wrench = fields.Char(related='specification_id.spanner',
+                                                      string='适配扳手型号')
+    # specification_id.spanner
+    # cutting_tool_is_cooling_hole = fields.Boolean('有无冷却孔', default=False)
+    cutting_tool_is_cooling_hole = fields.Boolean(related='specification_id.is_cooling_hole',
+                                                      string='有无冷却孔')
+    # specification_id.is_cooling_hole
+    # cutting_tool_locating_slot_code = fields.Char('定位槽代号', size=20)
+    cutting_tool_locating_slot_code = fields.Char(related='specification_id.locating_slot_code',
+                                                  string='定位槽代号')
+    # specification_id.locating_slot_code
     # 刀盘参数
-    cutting_tool_cutter_head_diameter = fields.Float('刀盘直径(mm)')
-    cutting_tool_interface_diameter = fields.Float('接口直径(mm)')
-
+    # cutting_tool_cutter_head_diameter = fields.Float('刀盘直径(mm)')
+    cutting_tool_cutter_head_diameter = fields.Float(related='specification_id.cutter_head_diameter',
+                                                     string='刀盘直径(mm)')
+    # specification_id.cutter_head_diameter
+    # cutting_tool_interface_diameter = fields.Float('接口直径(mm)')
+    cutting_tool_interface_diameter = fields.Float(related='specification_id.interface_diameter',
+                                                     string='接口直径(mm)')
+    # specification_id.interface_diameter
     # 刀柄参数
-    cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径')
-    cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
-    cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
-    cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
-    cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False)
-    cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
-    cutting_tool_change_time = fields.Integer('换刀时间(s)')
-    cutting_tool_clamping_way = fields.Char('夹持方式')
-    cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸')
-    cutting_tool_taper_shank_model = fields.Char('锥柄型号')
+    # cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径')
+    cutting_tool_clamping_diameter_max = fields.Float(related='specification_id.max_clamping_diameter',
+                                                      string='最大夹持直径')
+    # specification_id.max_clamping_diameter
+    # cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
+    cutting_tool_clamping_diameter_min = fields.Float(related='specification_id.min_clamping_diameter',
+                                               string='最小夹持直径')
+    # specification_id.min_clamping_diameter
+    # cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
+    cutting_tool_flange_length = fields.Float(related='specification_id.flange_shank_length',
+                                            string='法兰柄长(mm)')
+    # cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
+    cutting_tool_flange_diameter = fields.Float(related='specification_id.flange_diameter',
+                                              string='法兰直径(mm)')
+    # cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False)
+    cutting_tool_is_safety_lock = fields.Boolean(related='specification_id.is_safe_lock',
+                                                string='有无安全锁')
+    # cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
+    cutting_tool_is_high_speed_cutting = fields.Boolean(related='specification_id.is_quick_cutting',
+                                                 string='可高速切削')
+    # cutting_tool_change_time = fields.Integer('换刀时间(s)')
+    cutting_tool_change_time = fields.Integer(related='specification_id.tool_changing_time',
+                                            string='换刀时间(s)')
+    # cutting_tool_clamping_way = fields.Char('夹持方式')
+    cutting_tool_clamping_way = fields.Char(related='specification_id.clamping_mode',
+                                        string='夹持方式')
+    # cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸')
+    cutting_tool_fit_chuck_size = fields.Char(related='specification_id.fit_chuck_size',
+                                            string='适配夹头尺寸')
+    # cutting_tool_taper_shank_model = fields.Char('锥柄型号')
+    cutting_tool_taper_shank_model = fields.Char(related='specification_id.taper_shank_model',
+                                            string='锥柄型号')
     cutting_tool_standard_speed = fields.Integer('标准转速(n/min)')
-    cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
+    # cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
+    cutting_tool_speed_max = fields.Integer(related='specification_id.max_rotate_speed',
+                                        string='最大转速(n/min)')
+    # specification_id.max_rotate_speed
     cutting_tool_cooling_type = fields.Char('冷却类型')
     cutting_tool_dynamic_balance_class = fields.Char('动平衡等级')
-    cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号')
-
+    # cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号')
+    cutting_tool_fit_nut_model = fields.Char(related='specification_id.nut',
+                                                 string='适用锁紧螺母型号')
+    # specification_id.nut
     # 夹头参数
-    cutting_tool_taper = fields.Integer('锥度(°)')
-    cutting_tool_top_diameter = fields.Float('顶部直径')
-    cutting_tool_outer_diameter = fields.Float('外径(mm)')
-    cutting_tool_inner_diameter = fields.Float('内径(mm)')
-    cooling_suit_type_ids = fields.Char('适用冷却套型号')
-    cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
-    cutting_tool_er_size_model = fields.Char('尺寸型号')
+    # cutting_tool_taper = fields.Integer('锥度(°)')
+    cutting_tool_taper = fields.Integer(related='specification_id.taper',
+                                               string='锥度(°)')
+    # specification_id.taper
+    # cutting_tool_top_diameter = fields.Float('顶部直径')
+    cutting_tool_top_diameter = fields.Float(related='specification_id.top_diameter',
+                                        string='顶部直径')
+    # specification_id.top_diameter
+    # cutting_tool_outer_diameter = fields.Float('外径(mm)')
+    # specification_id.outer_diameter
+    cutting_tool_outer_diameter = fields.Float(related='specification_id.outer_diameter',
+                                               string='外径(mm)')
+    # cutting_tool_inner_diameter = fields.Float('内径(mm)')
+    cutting_tool_inner_diameter = fields.Float(related='specification_id.inner_diameter',
+                                               string='内径(mm)')
+    # specification_id.inner_diameter
+    # cooling_suit_type_ids = fields.Char('适用冷却套型号')
+    cooling_suit_type_ids = fields.Char(related='specification_id.cooling_jacket',
+                                                 string='适用冷却套型号')
+    # specification_id.cooling_jacket
+    # cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
+    cutting_tool_max_load_capacity = fields.Float(related='specification_id.max_load_capacity',
+                                                 string='最大负载能力(kg)')
+    # specification_id.max_load_capacity
+    # cutting_tool_er_size_model = fields.Char('尺寸型号')
+    cutting_tool_er_size_model = fields.Char(related='specification_id.er_size_model',
+                                                  string='尺寸型号')
+    # specification_id.er_size_model
     # cutting_tool_handle_ids = fields.Many2many(
     #     'sf.cutting_tool.standard.library',
     #     relation='product_cutting_tool_library_chuck_handle_rel',
@@ -548,6 +761,10 @@ class ResProductMo(models.Model):
         domain="[('cutting_tool_type', '=', '刀柄')]",
         string='适用刀柄型号'
     )
+    # cutting_tool_handle_id = fields.Many2one(related='cutting_tool_model_id.handle_id',
+    #                                          domain="[('cutting_tool_type', '=', '刀柄')]",
+    #                                          string='适用刀柄型号')
+    # cutting_tool_model_id.handle_id
 
     # 注册状态
     register_state = fields.Selection([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')],

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -296,6 +296,10 @@
                     </attribute>
                 </xpath>
 
+                <xpath expr="//sheet//notebook//page[@name='operations']//field[@name='workorder_ids']" position="replace">
+                    <field name="workorder_ids" attrs="{'readonly': ['|', ('state', '!=', 'test_value'), '&amp;', ('state', '=', 'done'), ('is_locked', '=', True)]}" context="{'tree_view_ref': 'mrp.mrp_production_workorder_tree_editable_view', 'default_product_uom_id': product_uom_id, 'from_manufacturing_order': True}"/>
+                </xpath>
+
                 <xpath expr="//sheet//notebook//page[@name='operations']" position="after">
                     <page string="检测结果" attrs="{'invisible': [('detection_result_ids', '=', [])]}">
                         <field name="detection_result_ids" string="" readonly="0">

sf_manufacturing/views/mrp_workorder_view.xml

@@ -520,7 +520,7 @@
 
             <xpath expr="//form//header" position="inside">
                 <button type="object" class="oe_highlight jikimo_button_confirm" name="get_three_check_datas"
-                        string="获取数据" attrs='{"invisible": [("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
+                        string="获取数据" attrs='{"invisible": ["|", ("state","!=","progress"), ("routing_type","!=","装夹预调")]}'/>
             </xpath>
 
 

sf_message/__init__.py

@@ -1 +1,2 @@
-from . import models
+from . import models
+from . import controllers

sf_message/__manifest__.py

@@ -11,9 +11,10 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify'],
+    'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock', 'sf_tool_management', 'sf_manufacturing', 'sf_hr'],
     'data': [
-        'data/bussiness_node.xml'
+        'data/bussiness_node.xml',
+        'data/template_data.xml',
     ],
     'test': [
     ],

sf_message/controllers/__init__.py

@@ -0,0 +1 @@
+from . import main

sf_message/controllers/main.py

@@ -0,0 +1,40 @@
+import json
+import requests
+import logging
+from odoo import http
+from odoo.http import request
+from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect
+from odoo.addons.sf_base.commons.common import Common
+
+_logger = logging.getLogger(__name__)
+
+class MessageSfMrsConnect(Sf_Mrs_Connect):
+
+    @http.route('/api/cnc_processing/create', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def get_cnc_processing_create(self, **kw):
+        res = super(MessageSfMrsConnect, self).get_cnc_processing_create(**kw)
+        res = json.loads(res)
+        if res.get('production_ids'):
+            try:
+                _logger.info('已编程的制造订单:%s' % res.get('production_ids'))
+                productions = request.env['mrp.production'].sudo().search([('id', 'in', res.get('production_ids'))])
+                # 过滤programming_state为已编程,tool_state为2的制造订单
+                tool_state_valid_productions = productions.filtered(lambda x: x.programming_state == '已编程' and x.tool_state == '2')
+                if tool_state_valid_productions:
+                    data = {
+                        'name': tool_state_valid_productions[0].programming_no
+                    }
+                    # 请求cloud接口，发送微信消息推送
+                    configsettings = request.env['res.config.settings'].sudo().get_values()
+                    config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+                    url = '/api/message/invalid_tool_state'
+                    config_url = configsettings['sf_url'] + url
+                    data['token'] = configsettings['token']
+                    ret = requests.post(config_url, json=data, headers=config_header)
+                    ret = ret.json()
+                    _logger.info('无效用刀异常消息推送接口:%s' % ret)
+            except Exception as e:
+                _logger.info('无效用刀异常消息推送接口:%s' % e)
+        return json.JSONEncoder().encode(res)
+

sf_message/data/bussiness_node.xml

@@ -10,5 +10,29 @@
             <field name="name">确认接单</field>
             <field name="model">sale.order</field>
         </record>
+        <record id="transfer_inventory" model="jikimo.message.bussiness.node">
+            <field name="name">调拨入库</field>
+            <field name="model">stock.picking</field>
+        </record>
+        <record id="tool_assembly" model="jikimo.message.bussiness.node">
+            <field name="name">功能刀具组装</field>
+            <field name="model">sf.functional.tool.assembly</field>
+        </record>
+        <record id="tool_dismantle" model="jikimo.message.bussiness.node">
+            <field name="name">功能刀具寿命到期</field>
+            <field name="model">sf.functional.tool.dismantle</field>
+        </record>
+        <record id="bussiness_material_purchase_remind" model="jikimo.message.bussiness.node">
+            <field name="name">坯料采购提醒</field>
+            <field name="model">purchase.order</field>
+        </record>
+        <record id="bussiness_material_picking_remind" model="jikimo.message.bussiness.node">
+            <field name="name">坯料发料提醒</field>
+            <field name="model">stock.picking</field>
+        </record>
+        <record id="bussiness_mrp_workorder_remind" model="jikimo.message.bussiness.node">
+            <field name="name">工单已下发通知</field>
+            <field name="model">mrp.workorder</field>
+        </record>
     </data>
 </odoo>

sf_message/data/template_data.xml

@@ -0,0 +1,84 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data noupdate="1">
+        <record id="template_material_purchase_remind" model="jikimo.message.template">
+            <field name="name">坯料采购提醒</field>
+            <field name="model_id" ref="purchase.model_purchase_order"/>
+            <field name="model">purchase.order</field>
+            <field name="bussiness_node_id" ref="bussiness_material_purchase_remind"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 坯料采购通知：
+单号：采购单[{{name}}]({{request_url}})
+事项：请确认坯料采购单并处理</field>
+        </record>
+
+        <record id="template_material_picking_remind" model="jikimo.message.template">
+            <field name="name">坯料发料提醒</field>
+            <field name="model_id" ref="stock.model_stock_picking"/>
+            <field name="model">stock.picking</field>
+            <field name="bussiness_node_id" ref="bussiness_material_picking_remind"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 坯料发料提醒：
+单号：产品[{{product_id}}]({{request_url}})
+事项：共{{number}}个生产发料单待确认处理</field>
+        </record>
+
+        <record id="template_mrp_workorder_remind" model="jikimo.message.template">
+            <field name="name">工单已下发通知</field>
+            <field name="model_id" ref="mrp_workorder.model_mrp_workorder"/>
+            <field name="model">mrp.workorder</field>
+            <field name="bussiness_node_id" ref="bussiness_mrp_workorder_remind"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 工单已下发通知：
+单号：产品[{{product_id}}]({{request_url}})
+事项：共{{number}}个工单已下发，请查收知悉</field>
+        </record>
+
+
+
+        <record id="template_transfer_inventory_remind" model="jikimo.message.template">
+            <field name="menu_id" ref="stock.menu_stock_root"/>
+            <field name="action_id" ref="stock.action_picking_tree_ready"/>
+            <field name="name">调拨入库</field>
+            <field name="model_id" ref="stock.model_stock_picking"/>
+            <field name="model">stock.picking</field>
+            <field name="bussiness_node_id" ref="transfer_inventory"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 调拨入库通知：
+单号：调拨入库单[{{name}}]({{request_url}})
+事项：完成刀具物料上架入库</field>
+        </record>
+
+        <record id="template_tool_expired_remind" model="jikimo.message.template">
+            <field name="menu_id" ref="mrp.menu_mrp_root"/>
+            <field name="action_id" ref="sf_tool_management.sf_functional_tool_dismantle_view_act"/>
+            <field name="name">功能刀具寿命到期</field>
+            <field name="model_id" ref="sf_tool_management.model_sf_functional_tool_dismantle"/>
+            <field name="model">sf.functional.tool.dismantle</field>
+            <field name="bussiness_node_id" ref="tool_dismantle"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 功能刀具寿命到期提醒：
+单号：拆解单[{{code}}]({{request_url}})
+事项：{{functional_tool_id.tool_name_id.name}}寿命已到期，需拆解</field>
+        </record>
+
+        <record id="template_tool_assembly_remind" model="jikimo.message.template">
+            <field name="menu_id" ref="mrp.menu_mrp_root"/>
+            <field name="action_id" ref="sf_tool_management.sf_functional_tool_assembly_view_act"/>
+            <field name="name">功能刀具组装</field>
+            <field name="model_id" ref="sf_tool_management.model_sf_functional_tool_assembly"/>
+            <field name="model">sf.functional.tool.assembly</field>
+            <field name="bussiness_node_id" ref="tool_assembly"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 功能刀具组装通知：
+单号：组装任务单[{{name}}]({{request_url}})
+事项：{{use_tool_time}}前完成组装</field>
+        </record>
+    </data>
+</odoo>

sf_message/models/__init__.py

@@ -6,3 +6,4 @@ from . import sf_message_cam_program
 from . import sf_message_functional_tool_assembly
 from . import sf_message_purchase
 from . import sf_message_workorder
+from . import sf_message_functional_tool_dismantle

sf_message/models/sf_message_functional_tool_assembly.py

@@ -3,4 +3,13 @@ from odoo import models, fields, api, _
 
 class SFMessagefunctionalToolAssembly(models.Model):
     _name = 'sf.functional.tool.assembly'
+    _description = "刀具组装单"
     _inherit = ['sf.functional.tool.assembly', 'jikimo.message.dispatch']
+
+    @api.model_create_multi
+    def create(self, vals):
+        result = super(SFMessagefunctionalToolAssembly, self).create(vals)
+        for obj in result:
+            if obj.loading_task_source == '0' and obj.assemble_status == '0':
+                obj.add_queue('功能刀具组装')
+        return result

sf_message/models/sf_message_functional_tool_dismantle.py

@@ -0,0 +1,19 @@
+from odoo import models, api
+
+
+class SFMessagefunctionalToolDismantle(models.Model):
+    _name = 'sf.functional.tool.dismantle'
+    _description = "刀具拆解单"
+    _inherit = ['sf.functional.tool.dismantle', 'jikimo.message.dispatch']
+
+    @api.model
+    def create(self, vals):
+        # 判断是否为web页面创建请求
+        is_web_request = self.env.context.get('is_web_request', False)
+        result = super(SFMessagefunctionalToolDismantle, self).create(vals)
+        if is_web_request:
+            return result
+        for obj in result:
+            if obj.dismantle_cause in ['寿命到期报废', '崩刀报废'] and obj.state == '待拆解':
+                obj.add_queue('功能刀具寿命到期')
+        return result

sf_message/models/sf_message_purchase.py

@@ -1,6 +1,35 @@
 from odoo import models, fields, api, _
+from urllib.parse import urlencode
 
 
 class SFMessagePurchase(models.Model):
     _name = 'purchase.order'
-    _inherit = ['purchase.order',  'jikimo.message.dispatch']
+    _inherit = ['purchase.order', 'jikimo.message.dispatch']
+
+    def _get_message(self, message_queue_ids):
+        contents = []
+        for message_queue_id in message_queue_ids:
+            if message_queue_id.message_template_id.name == '坯料采购提醒':
+                content = message_queue_id.message_template_id.content
+                url = self.request_url(int(message_queue_id.res_id))
+                purchase_order_line = self.env['purchase.order'].search([('id', '=', int(message_queue_id.res_id))])
+                content = content.replace('{{name}}', purchase_order_line.name).replace(
+                    '{{request_url}}', url)
+                contents.append(content)
+        return contents
+
+    def request_url(self, id):
+        we_config_info = self.env['we.config'].sudo().search([], limit=1)
+        redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain
+        full_url = 'https://%s/' % redirect_domain
+        action_id = self.env.ref('purchase.purchase_form_action').id
+        menu_id = self.env['ir.model.data'].search([('name', '=', 'module_website_payment')]).id
+        # 查询参数
+        params = {'id': id, 'menu_id': menu_id, 'action': action_id,
+                  'model': 'purchase.order',
+                  'view_type': 'form'}
+        # 拼接查询参数
+        query_string = urlencode(params)
+        # 拼接URL
+        full_url = full_url + "web#" + query_string
+        return full_url

sf_message/models/sf_message_sale.py

@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import logging
 from odoo import models, fields, api, _
 
 
@@ -21,6 +22,18 @@ class SFMessageSale(models.Model):
         if res is True:
             try:
                 self.add_queue('确认接单')
+                picking_ids = self.mrp_production_ids
+                purchase_order_id = []
+                if picking_ids:
+                    for picking_id in picking_ids:
+                        purchase_order_ids = (
+                                picking_id.procurement_group_id.stock_move_ids.created_purchase_line_id.order_id |
+                                picking_id.procurement_group_id.stock_move_ids.move_orig_ids.purchase_line_id.order_id).ids
+                        purchase_order_id.extend(purchase_order_ids)
+                    if purchase_order_id:
+                        purchase_order_list = self.env['purchase.order'].search([('id', 'in', purchase_order_id)])
+                        for purchase_order_info in purchase_order_list:
+                            purchase_order_info.add_queue('坯料采购提醒')
             except Exception as e:
                 logging.info('add_queue error:%s' % e)
         return res
@@ -28,12 +41,20 @@ class SFMessageSale(models.Model):
     # 继承并重写jikimo.message.dispatch的_get_message()
     def _get_message(self, message_queue_ids):
         res = super(SFMessageSale, self)._get_message(message_queue_ids)
-        if message_queue_ids.message_template_id.bussiness_node_id.name == '确认接单':
-            # sale_order = self.env['sale.order'].search([('id', '=', message_queue_ids.model.res_id)])
-            sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(message_queue_ids.res_id))])
-            if len(sale_order_line) == 1:
-                product = sale_order_line[0].product_id.name
-            elif len(sale_order_line) > 1:
-                product = '%s...' % sale_order_line[0].product_id.name
-            res[0] = res[0].replace('{{product_id}}', product)
+        new_res = []
+        processed_messages = set()  # 用于跟踪已经处理过的消息
+        for item in message_queue_ids:
+            if item.message_template_id.bussiness_node_id.name == '确认接单':
+                sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(item.res_id))])
+                if len(sale_order_line) == 1:
+                    product = sale_order_line[0].product_id.name
+                elif len(sale_order_line) > 1:
+                    product = '%s...' % sale_order_line[0].product_id.name
+                for message in res:
+                    message_text = message.replace('{{product_id}}', product)
+                    if message_text not in processed_messages:
+                        new_res.append(message_text)
+                        processed_messages.add(message_text)
+        if new_res:
+            res = new_res
         return res

sf_message/models/sf_message_stock_picking.py

@@ -1,6 +1,67 @@
+import re
 from odoo import models, fields, api, _
+from urllib.parse import urlencode
 
 
 class SFMessageStockPicking(models.Model):
     _name = 'stock.picking'
-    _inherit = ['stock.picking',  'jikimo.message.dispatch']
+    _description = "库存调拨"
+    _inherit = ['stock.picking', 'jikimo.message.dispatch']
+
+    @api.model_create_multi
+    def create(self, vals):
+        result = super(SFMessageStockPicking, self).create(vals)
+        for obj in result:
+            if obj.location_id.name == '进货' and obj.location_dest_id.name == '刀具房':
+                obj.add_queue('调拨入库')
+        return result
+
+    @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
+    def _compute_state(self):
+        super(SFMessageStockPicking, self)._compute_state()
+        for record in self:
+            if record.state == 'assigned' and record.check_in == 'PC':
+                record.add_queue('坯料发料提醒')
+
+    def _get_message(self, message_queue_ids):
+        contents = []
+        product_id = []
+        for message_queue_id in message_queue_ids:
+            i = 0
+            if message_queue_id.message_template_id.name == '坯料发料提醒':
+                content = message_queue_id.message_template_id.content
+                stock_picking_line = self.env['stock.picking'].search([('id', '=', int(message_queue_id.res_id))])
+                mrp_production_info = self.env['mrp.production'].search(
+                    [('name', '=', stock_picking_line.origin)])
+                mrp_production_list = self.env['mrp.production'].search(
+                    [('product_id', '=', mrp_production_info.product_id.id)])
+                for mrp_production_line in mrp_production_list:
+                    picking_ids = mrp_production_line.picking_ids
+                    for picking_id in picking_ids:
+                        if picking_id.state == 'assigned' and picking_id.check_in == 'PC':
+                            i += 1
+                if i > 0 and mrp_production_info.product_id.id not in product_id:
+                    url = self.request_url()
+                    content = content.replace('{{product_id}}', mrp_production_info.product_id.name).replace(
+                        '{{number}}', str(i)).replace('{{request_url}}', url)
+                    product_id.append(mrp_production_info.product_id.id)
+                    contents.append(content)
+                return contents
+            else:
+                res = super(SFMessageStockPicking, self)._get_message(message_queue_id)
+                return res
+
+    def request_url(self):
+        we_config_info = self.env['we.config'].sudo().search([], limit=1)
+        redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain
+        full_url = 'https://%s/' % redirect_domain
+        action_id = self.env.ref('stock.stock_picking_type_action').id
+        menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).id
+        # 查询参数
+        params = {'menu_id': menu_id, 'action': action_id, 'model': 'stock.picking',
+                  'view_type': 'kanban'}
+        # 拼接查询参数
+        query_string = urlencode(params)
+        # 拼接URL
+        full_url = full_url + "web#" + query_string
+        return full_url

sf_message/models/sf_message_template.py

@@ -9,4 +9,9 @@ class SfMessageTemplate(models.Model):
     def _get_message_model(self):
         res = super(SfMessageTemplate, self)._get_message_model()
         res.append("sale.order")
+        res.append("stock.picking")
+        res.append('sf.functional.tool.assembly')
+        res.append('sf.functional.tool.dismantle')
+        res.append('purchase.order')
+        res.append('mrp.workorder')
         return res

sf_message/models/sf_message_workorder.py

@@ -1,6 +1,55 @@
 from odoo import models, fields, api, _
+import logging, json
+import requests
+from odoo.addons.sf_base.commons.common import Common
+from urllib.parse import urlencode
 
+_logger = logging.getLogger(__name__)
 
 class SFMessageWork(models.Model):
     _name = 'mrp.workorder'
-    _inherit = ['mrp.workorder',  'jikimo.message.dispatch']
+    _inherit = ['mrp.workorder', 'jikimo.message.dispatch']
+
+    @api.depends('production_availability', 'blocked_by_workorder_ids.state')
+    def _compute_state(self):
+        super(SFMessageWork, self)._compute_state()
+        for workorder in self:
+            if workorder.state == 'ready' and workorder.routing_type == '装夹预调':
+                jikimo_message_queue = self.env['jikimo.message.queue'].sudo().search(
+                    [('res_id', '=', workorder.id), ("message_status", "=", "pending")])
+                if not jikimo_message_queue:
+                    workorder.add_queue('工单已下发通知')
+
+    def _get_message(self, message_queue_ids):
+        contents = []
+        product_id = []
+        for message_queue_id in message_queue_ids:
+            if message_queue_id.message_template_id.name == '工单已下发通知':
+                content = message_queue_id.message_template_id.content
+                mrp_workorder_line = self.env['mrp.workorder'].search([('id', '=', int(message_queue_id.res_id))])
+                mrp_workorder_list = self.env['mrp.workorder'].search(
+                    [('product_id', '=', mrp_workorder_line.product_id.id), ('state', '=', 'ready'),
+                     ('routing_type', '=', '装夹预调')])
+                if len(mrp_workorder_list) > 0 and mrp_workorder_line.product_id.id not in product_id:
+                    url = self.request_url()
+                    content = content.replace('{{product_id}}', mrp_workorder_line.product_id.name).replace(
+                        '{{number}}', str(len(mrp_workorder_list))).replace(
+                        '{{request_url}}', url)
+                    product_id.append(mrp_workorder_line.product_id.id)
+                    contents.append(content)
+        return contents
+
+    def request_url(self):
+        we_config_info = self.env['we.config'].sudo().search([], limit=1)
+        redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain
+        full_url = 'https://%s/' % redirect_domain
+        action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id
+        menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id
+        # 查询参数
+        params = {'menu_id': menu_id, 'action': action_id, 'model': 'mrp.workorder',
+                  'view_type': 'list', 'active_id': 1}
+        # 拼接查询参数
+        query_string = urlencode(params)
+        # 拼接URL
+        full_url = full_url + "web#" + query_string
+        return full_url

sf_mrs_connect/controllers/controllers.py

@@ -62,8 +62,8 @@ class Sf_Mrs_Connect(http.Controller):
                                 if cnc_workorder_has.cnc_ids:
                                     cnc_workorder_has.cmm_ids.sudo().unlink()
                                     cnc_workorder_has.cnc_ids.sudo().unlink()
-                                    request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
-                                        production)
+                                    # request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
+                                    #     production)
                                 cnc_workorder_has.write(
                                     {'cnc_ids': cnc_workorder_has.cnc_ids.sudo()._json_cnc_processing(panel, ret),
                                      'cmm_ids': cnc_workorder_has.cmm_ids.sudo()._json_cmm_program(panel, ret)})
@@ -93,6 +93,9 @@ class Sf_Mrs_Connect(http.Controller):
                             pre_workorder.write(
                                 {'processing_drawing': base64.b64encode(open(panel_file_path, 'rb').read())})
                 productions.write({'programming_state': '已编程', 'work_state': '已编程'})
+                res.update({
+                    'production_ids': productions.ids
+                })
                 return json.JSONEncoder().encode(res)
             else:
                 res = {'status': 0, 'message': '该制造订单暂未开始'}

sf_mrs_connect/models/res_config_setting.py

@@ -175,7 +175,7 @@ class ResConfigSettings(models.TransientModel):
                         new_price = res_order_lines_map.get(str(index))
                         if order_line:
                             # 修改单价
-                            order_line.write({'remark': new_price*order_line.product_uom_qty})
+                            order_line.write({'remark': round(new_price*order_line.product_uom_qty,2)})
                             order_price = self.env['order.price'].sudo().search([('sale_order_id', '=',need_change_sale_order.id )])
                             if not order_price:
                                 self.env['order.price'].sudo().create({'sale_order_id':need_change_sale_order.id})

sf_mrs_connect/models/sync_common.py

@@ -2676,7 +2676,8 @@ class CuttingToolBasicParameters(models.Model):
                                     'interface_diameter': cutter_head_item['interface_diameter'],
                                     'total_length': cutter_head_item['total_length'],
                                     'blade_length': cutter_head_item['blade_length'],
-                                    'cutting_depth': cutter_head_item['cutting_depth_max'],
+                                    'cutting_blade_length': cutter_head_item['cutting_blade_length'],
+                                    'cut_depth_max': cutter_head_item['cutting_depth_max'],
                                     'main_included_angle': cutter_head_item['edge_angle'],
                                     'installing_structure': cutter_head_item['mounting_structure'],
                                     'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[
@@ -2698,7 +2699,8 @@ class CuttingToolBasicParameters(models.Model):
                                     'interface_diameter': cutter_head_item['interface_diameter'],
                                     'total_length': cutter_head_item['total_length'],
                                     'blade_length': cutter_head_item['blade_length'],
-                                    'cutting_depth': cutter_head_item['cutting_depth_max'],
+                                    'cutting_blade_length': cutter_head_item['cutting_blade_length'],
+                                    'cut_depth_max': cutter_head_item['cutting_depth_max'],
                                     'main_included_angle': cutter_head_item['edge_angle'],
                                     'installing_structure': cutter_head_item['mounting_structure'],
                                     'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[
@@ -3031,7 +3033,8 @@ class CuttingToolBasicParameters(models.Model):
                                     'interface_diameter': cutter_head_item['interface_diameter'],
                                     'total_length': cutter_head_item['total_length'],
                                     'blade_length': cutter_head_item['blade_length'],
-                                    'cutting_depth': cutter_head_item['cutting_depth_max'],
+                                    'cutting_blade_length': cutter_head_item['cutting_blade_length'],
+                                    'cut_depth_max': cutter_head_item['cutting_depth_max'],
                                     'main_included_angle': cutter_head_item['edge_angle'],
                                     'installing_structure': cutter_head_item['mounting_structure'],
                                     'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[
@@ -3053,7 +3056,8 @@ class CuttingToolBasicParameters(models.Model):
                                     'interface_diameter': cutter_head_item['interface_diameter'],
                                     'total_length': cutter_head_item['total_length'],
                                     'blade_length': cutter_head_item['blade_length'],
-                                    'cutting_depth': cutter_head_item['cutting_depth_max'],
+                                    'cutting_blade_length': cutter_head_item['cutting_blade_length'],
+                                    'cut_depth_max': cutter_head_item['cutting_depth_max'],
                                     'main_included_angle': cutter_head_item['edge_angle'],
                                     'installing_structure': cutter_head_item['mounting_structure'],
                                     'blade_id': False if not cutter_head_item['fit_blade_model_code'] else self.env[

sf_mrs_connect/security/ir.model.access.csv

@@ -1,7 +1,4 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_static_resource_datasync,sf_static_resource_datasync,model_sf_static_resource_datasync,base.group_user,1,1,1,1
 
-access_order_price,order.price,model_order_price,base.group_user,1,1,1,1
-
-
-
+access_order_price,order.price,model_order_price,sf_base.group_sale_director,1,1,1,1

sf_mrs_connect/views/order_price.xml

@@ -8,7 +8,7 @@
     <menuitem sequence="22" name="销售订单bfm对比" id="menu_sale_order_bfm_price"
               action="order_price_tree_act"
               parent="sale.sale_order_menu"
-              groups="base.group_user"
+              groups="sf_base.group_sale_director"
     />
 
     <record id="view_order_price_tree" model="ir.ui.view">

sf_plan/views/view.xml

@@ -278,6 +278,7 @@
                 sequence="150"
                 action="sf_production_plan_action"
                 groups="sf_base.group_plan_dispatch"
+                web_icon="sf_plan,static/description/计划.png"
         />
 
         <!--         <record model="ir.ui.menu" id="mrp_custom_menu" inherit_id="mrp.menu_mrp_manufacturing"> -->

sf_stock/models/stock_picking.py

@@ -74,6 +74,8 @@ class StockPicking(models.Model):
 
     def send_to_bfm(self):
         skip_backorder = self.env.context.get('skip_backorder')
+        cancel_backorder_ids = self.env.context.get('picking_ids_not_to_backorder')
+
         # 下发发货到bfm
         config = self.env['res.config.settings'].get_values()
         move_ids, move_line_ids = self.deal_move_ids(self.move_ids, self.move_line_ids)
@@ -92,13 +94,13 @@ class StockPicking(models.Model):
                 'state': self.state,
                 'backorder_id': self.deal_send_backorder_id(self.backorder_id),
                 'backorder_ids': self.deal_send_backorder_id(self.backorder_ids),
-                'cancel_backorder_ids': skip_backorder,
+                'cancel_backorder_ids': True if skip_backorder and cancel_backorder_ids else False,  # 没有欠单判断
                 'move_type': self.move_type,
             },
         }
         url1 = config['bfm_url_new'] + '/api/stock/deliver_goods'
         json_str = json.dumps(data)
-        print('json_str', json_str)
+        logging.info('json_str= %s', json_str)
         r = requests.post(url1, json=data, data=None)
         if r.status_code == 200:
             result = json.loads(r.json()['result'])

sf_tool_management/models/base.py

@@ -185,6 +185,7 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
     _description = 'CAM工单程序用刀计划'
 
     name = fields.Char('工单任务编号')
+    programming_no = fields.Char('编程单号')
     cam_procedure_code = fields.Char('程序名')
     filename = fields.Char('文件')
     cam_cutter_spacing_code = fields.Char('刀号')
@@ -317,23 +318,33 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
         """
         根据传入的工单信息，查询是否有需要的功能刀具，如果没有则生成CAM工单程序用刀计划
         """
-        knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
-            'name': cnc_processing.workorder_id.production_id.name,
-            'cam_procedure_code': cnc_processing.program_name,
-            'filename': cnc_processing.cnc_id.name,
-            'functional_tool_name': cnc_processing.cutting_tool_name,
-            'cam_cutter_spacing_code': cnc_processing.cutting_tool_no,
-            'process_type': cnc_processing.processing_type,
-            'margin_x_y': float(cnc_processing.margin_x_y),
-            'margin_z': float(cnc_processing.margin_z),
-            'finish_depth': float(cnc_processing.depth_of_processing_z),
-            'extension_length': float(cnc_processing.cutting_tool_extension_length),
-            'shank_model': cnc_processing.cutting_tool_handle_type,
-            'estimated_processing_time': cnc_processing.estimated_processing_time,
-        })
-        logging.info('CAM工单程序用刀计划创建成功！！！')
-        # 创建装刀请求
-        knife_plan.apply_for_tooling()
+
+        # 获取编程单号
+        programming_no = cnc_processing.workorder_id.production_id.programming_no
+        logging.info(f'编程单号:{programming_no}')
+        cam_id = self.env['sf.cam.work.order.program.knife.plan'].sudo().search(
+            [('programming_no', '=', programming_no),
+             ('functional_tool_name', '=', cnc_processing.cutting_tool_name)])
+        logging.info(f'CAM装刀计划：{cam_id}')
+        if not cam_id:
+            knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
+                'name': cnc_processing.workorder_id.production_id.name,
+                'programming_no': programming_no,
+                'cam_procedure_code': cnc_processing.program_name,
+                'filename': cnc_processing.cnc_id.name,
+                'functional_tool_name': cnc_processing.cutting_tool_name,
+                'cam_cutter_spacing_code': cnc_processing.cutting_tool_no,
+                'process_type': cnc_processing.processing_type,
+                'margin_x_y': float(cnc_processing.margin_x_y),
+                'margin_z': float(cnc_processing.margin_z),
+                'finish_depth': float(cnc_processing.depth_of_processing_z),
+                'extension_length': float(cnc_processing.cutting_tool_extension_length),
+                'shank_model': cnc_processing.cutting_tool_handle_type,
+                'estimated_processing_time': cnc_processing.estimated_processing_time,
+            })
+            logging.info('CAM工单程序用刀计划创建成功！！！')
+            # 创建装刀请求
+            knife_plan.apply_for_tooling()
 
     def unlink_cam_plan(self, production):
         for item in production:

sf_tool_management/models/jikimo_bom.py

@@ -84,12 +84,12 @@ class jikimo_bom(models.Model):
 
             if option.name == '整体式刀具':
                 domain = ['&'] + domain + [
-                    '|',
+                    '&',
                     # 刀具直径
                     ('cutting_tool_blade_diameter', '=', self.tool_inventory_id.diameter),
 
                     # r角
-                    ('cutting_tool_blade_tip_working_size', '=', self.tool_inventory_id.angle)]
+                    ('cutting_tool_blade_tip_r_size', '=', self.tool_inventory_id.angle)]
             if option.name == '刀杆':
                 domain = ['&'] + domain + [
                     ("cutting_tool_cutter_arbor_diameter", "=", self.tool_inventory_id.diameter)]

sf_tool_management/models/mrp_workorder.py

@@ -95,16 +95,20 @@ class CNCprocessing(models.Model):
                         #     tool_state_remark1 = f'{key}无效刀:{data1.get(key)}'
                         # 无效刀处理逻辑
                         # 1、创建制造订单无效刀检测结果记录
-                        logging.info('创建制造订单无效刀检测结果记录！')
-                        production_id.detection_result_ids.create({
-                            'production_id': production_id.id,
-                            'processing_panel': key,
-                            'routing_type': 'CNC加工',
-                            'rework_reason': 'programming',  # 原因：编程(programming)
-                            'detailed_reason': '无效功能刀具',
-                            'test_results': '返工',
-                            'handle_result': '待处理'
-                        })
+                        if not production_id.detection_result_ids.filtered(
+                                lambda a: (a.processing_panel == key and a.detailed_reason == '无效功能刀具'
+                                           and a.handle_result == '待处理' and a.routing_type == 'CNC加工'
+                                           and a.rework_reason == 'programming' and a.test_results == '返工')):
+                            logging.info('创建制造订单无效刀检测结果记录！')
+                            production_id.detection_result_ids.create({
+                                'production_id': production_id.id,
+                                'processing_panel': key,
+                                'routing_type': 'CNC加工',
+                                'rework_reason': 'programming',  # 原因：编程(programming)
+                                'detailed_reason': '无效功能刀具',
+                                'test_results': '返工',
+                                'handle_result': '待处理'
+                            })
                         # 修改当前面装夹预调工单的 is_rework 为 True
                         # work_ids = production_id.workorder_ids.filtered(
                         #     lambda a: a.routing_type == '装夹预调' and a.processing_panel == key and not a.is_rework)

sf_tool_management/views/tool_base_views.xml

@@ -283,21 +283,22 @@
             <field name="arch" type="xml">
                 <tree create="0">
                     <field name="name" string="工单编码"/>
-                    <field name="cam_procedure_code"/>
-                    <field name="filename"/>
+                    <field name="programming_no"/>
+                    <field name="cam_procedure_code" optional="hide"/>
+                    <field name="filename" optional="hide"/>
                     <field name="functional_tool_name" string="刀具名称"/>
                     <field name="cam_cutter_spacing_code"/>
                     <field name="diameter" optional="hide"/>
                     <field name="tool_included_angle" optional="hide"/>
-                    <field name="process_type"/>
+                    <field name="process_type" optional="hide"/>
                     <field name="margin_x_y"/>
                     <field name="margin_z"/>
                     <field name="finish_depth"/>
                     <field name="extension_length" string="刀具伸出长度(mm)"/>
                     <field name="shank_model"/>
                     <field name="estimated_processing_time"/>
-                    <field name="need_knife_time"/>
-                    <field name="applicant_time"/>
+                    <field name="need_knife_time" optional="hide"/>
+                    <field name="applicant_time" optional="hide"/>
                     <field name="plan_execute_status"/>
 
                     <field name="production_line_id" invisible="1"/>
@@ -332,6 +333,7 @@
                         </div>
                         <group>
                             <group>
+                                <field name="programming_no"/>
                                 <field name="cam_procedure_code"/>
                                 <field name="filename"/>
                                 <field name="production_line_id"/>
@@ -388,6 +390,7 @@
             <field name="model">sf.cam.work.order.program.knife.plan</field>
             <field name="arch" type="xml">
                 <search>
+                    <field name="programming_no"/>
                     <field name="name" string="工单编码"/>
                     <field name="cam_procedure_code"/>
                     <field name="filename"/>
@@ -1043,7 +1046,7 @@
             <field name="res_model">sf.functional.tool.dismantle</field>
             <field name="view_mode">tree,form,search</field>
             <field name="search_view_id" ref="sf_functional_tool_dismantle_search"/>
-            <field name="context">{'search_default_no_dismantle_state':1}</field>
+            <field name="context">{'search_default_no_dismantle_state':1,'is_web_request':True}</field>
         </record>
     </data>
 </odoo>