ftp文件下载适配开发环境

Merge Request: 修改计划排程

Created By: @胡嘉莹
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1381?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_frontend/views/bye_odoo.xml

@@ -5,9 +5,9 @@
 <!--         修改页面头部图标及文字 -->
         <template id="favicon_icon" inherit_id="web.layout" name="Web layout">
             <!-- change the title with reliance partner -->
-            <xpath expr="//head//title" position="before">
+            <!-- <xpath expr="//head//title" position="before">
                 <title t-esc="'JIKIMO'"/>
-            </xpath>
+            </xpath> -->
             <!-- change the default favicon icon with   -->
             <xpath expr="//head//link[@rel='shortcut icon']" position="replace">
                 <link type="image/x-icon" rel="shortcut icon" href="/jikimo_frontend/static/src/img/jikimo-logo.ico"/>
@@ -16,7 +16,7 @@
 
 <!--         hide 登录页面 powerd by odoo 及管理数据库 -->
         <template id="login_page_layout" inherit_id="web.login_layout" name="Login Page Layout">
-            <xpath expr="//div[@class='card-body']//div[last()]" position="replace"></xpath>
+            <!-- <xpath expr="//div[@class='card-body']/div[last()]" position="replace"></xpath> -->
         </template>
 
 <!--         隐藏odoo版本信息 -->

jikimo_system_order/views/yizuo_system_order_view.xml

@@ -234,7 +234,7 @@
         </record>
 
 
-        <menuitem name="系统工单" id="work_order_1_list" web_icon="jikimo_system_order,static/description/icon.png"/>
+        <menuitem name="系统工单" id="work_order_1_list" web_icon="jikimo_system_order,static/description/系统工单.png"/>
         <menuitem name="工单" id="work_order" parent="work_order_1_list" action="system_order"/>
         <menuitem name="工单模板" id="work_order_template" parent="work_order_1_list" action="work_template" groups="jikimo_system_order.group_operations_permissions_rwc"/>
         <menuitem name="工单分类" id="work_order_type" parent="work_order_1_list" action="classify" groups="jikimo_system_order.group_operations_permissions_rwc"/>

quality_control/views/quality_views.xml

@@ -1024,7 +1024,7 @@
     <menuitem
             id="menu_quality_root"
             name="Quality"
-            web_icon="quality_control,static/description/icon.svg"
+            web_icon="quality_control,static/description/质量.png"
             sequence="150"
             groups="quality.group_quality_user"/>
 

requirements.txt

@@ -1,2 +1,3 @@
 pystrich
 cpca
+pycryptodome==3.20

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

@@ -21,8 +21,9 @@ class ToolMaterialsBasicParameters(models.Model):
     neck_length = fields.Float('颈部长度(mm)')
     handle_diameter = fields.Float('柄部直径(mm)')
     handle_length = fields.Float('柄部长度(mm)')
-    blade_tip_diameter = fields.Integer('刀尖直径(mm)')
+    blade_tip_diameter = fields.Float('刀尖直径(mm)')
-    blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角度)', size=20)
+    blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
+    tip_r_size = fields.Float('刀尖R角(mm)',default=0)
     blade_tip_taper = fields.Integer('刀尖锥度(°)')
     blade_diameter = fields.Float('刃部直径(mm)')
     blade_length = fields.Float('刃部长度(mm)')
@@ -37,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/security/ir.model.access.csv

@@ -242,3 +242,8 @@ access_sf_fixture_materials_basic_parameters_group_sf_stock_manager,sf_fixture_m
 access_sf_multi_mounting_type_group_sf_stock_manager,sf_multi_mounting_type_group_sf_stock_manager,model_sf_multi_mounting_type,sf_base.group_sf_stock_manager,1,0,0,0
 access_sf_machine_brand_group_sf_stock_manager,sf_machine_brand_group_sf_stock_manager,model_sf_machine_brand,sf_base.group_sf_stock_manager,1,0,0,0
 access_sf_cutting_tool_type_group_sf_stock_manager,sf_cutting_tool_type_group_sf_stock_manager,model_sf_cutting_tool_type,sf_base.group_sf_stock_manager,1,0,0,0
+
+
+access_sf_cutting_tool_material_group_plan_dispatch,sf_cutting_tool_material_group_plan_dispatch,model_sf_cutting_tool_material,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_functional_cutting_tool_model_group_plan_dispatch,sf_functional_cutting_tool_model_group_plan_dispatch,model_sf_functional_cutting_tool_model,sf_base.group_plan_dispatch,1,0,0,0
+access_sf_cutting_tool_type_group_plan_dispatch,sf_cutting_tool_type_group_plan_dispatch,model_sf_cutting_tool_type,sf_base.group_plan_dispatch,1,0,0,0

sf_base/static/src/js/custom_barcode_handlers.js

@@ -30,6 +30,7 @@ patch(barcodeGenericHandlers, "start", {
             "O-CMD.PAGER-FIRST": () => updatePager("first"),
             "O-CMD.PAGER-LAST": () => updatePager("last"),
             "O-CMD.CONFIRM": () => customClickOnButton(".jikimo_button_confirm"),
+            "O-CMD.FLUSHED": () => customClickOnButton(".jikimo_button_flushed"),
         };
 
         barcode.bus.addEventListener("barcode_scanned", (ev) => {

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_base/views/tool_basic_param.xml

@@ -15,6 +15,7 @@
                     <field name="handle_length"/>
                     <field name="blade_tip_diameter"/>
                     <field name="blade_tip_working_size"/>
+                    <field name="tip_r_size"/>
                     <field name="blade_tip_taper"/>
                     <field name="blade_diameter"/>
                     <field name="blade_length"/>
@@ -95,6 +96,7 @@
                     <field name="handle_length"/>
                     <field name="blade_tip_diameter"/>
                     <field name="blade_tip_working_size"/>
+                    <field name="tip_r_size"/>
                     <field name="blade_tip_taper"/>
                     <field name="blade_diameter"/>
                     <field name="blade_length"/>
@@ -139,6 +141,7 @@
                             </group>
                             <group attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')]}">
                                 <field name="blade_tip_working_size"/>
+                                <field name="tip_r_size"/>
                                 <field name="blade_tip_diameter" class="diameter"/>
                                 <field name="blade_tip_taper"/>
                                 <field name="blade_helix_angle"/>

sf_base/views/tool_views.xml

@@ -222,6 +222,7 @@
                                         <field name="handle_diameter" class="diameter"/>
                                         <field name="handle_length"/>
                                         <field name="blade_tip_working_size" class="du"/>
+                                        <field name="tip_r_size"/>
                                         <field name="blade_tip_diameter" class="diameter"/>
                                         <field name="blade_tip_taper" class="du"/>
                                         <field name="blade_helix_angle" class="du"/>
@@ -577,7 +578,7 @@
         </field>
     </record>
 
-    <record model="ir.ui.view" id="view_cutting_tool_material_search">
+    <record model="ir.ui.view" id="view_cutting_tool_inventory_search">
         <field name="name">sf.tool.inventory.search</field>
         <field name="model">sf.tool.inventory</field>
         <field name="arch" type="xml">

sf_bf_connect/models/process_status.py

@@ -1,3 +1,4 @@
+import traceback
 from datetime import datetime
 import logging
 import requests
@@ -53,11 +54,13 @@ class StatusChange(models.Model):
             if not ret.get('error'):
                 logging.info('接口已经执行=============')
             else:
-                logging.error('工厂加工同步订单状态失败 {}'.format(ret))
+                traceback_error = traceback.format_exc()
-                raise UserError('工厂加工同步订单状态失败')
+                logging.error("bfm订单状态同步失败:%s" % traceback_error)
+                raise UserError('工厂加工同步订单状态到bfm失败')
         except UserError as e:
-            logging.error('工厂加工同步订单状态失败 {}'.format(e))
+            traceback_error = traceback.format_exc()
-            raise UserError('工厂加工同步订单状态失败')
+            logging.error("工厂加工同步订单状态失败:%s " % traceback_error)
+            raise UserError(e)
         return res
 
     def action_cancel(self):

sf_dlm_management/views/product_template_management_view.xml

@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
     <data>
+        <record id="mrp.product_template_action" model="ir.actions.act_window">
+            <field name="context">
+                {"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}
+            </field>
+        </record>
         <record model="ir.ui.view" id="view_sale_product_template_form_inherit_sf">
             <field name="name">product.template.form.inherit.sf</field>
             <field name="model">product.template</field>
@@ -88,7 +93,8 @@
                                 </div>
                                 <field name="model_volume" string="体积[mm³]"/>
                                 <field name="product_model_type_id" string="模型类型"/>
-                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板" readonly="1"/>
+                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"
+                                       readonly="1"/>
                                 <field name="model_machining_precision"/>
                                 <field name="model_process_parameters_ids" string="表面工艺参数"
                                        widget="many2many_tags"
@@ -103,11 +109,11 @@
                         '刀具')], 'required': True}
                     </attribute>
                 </xpath>
-<!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
+                <!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
-<!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
+                <!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
-<!--                        [('product_variant_count', '>' , 1)]}-->
+                <!--                        [('product_variant_count', '>' , 1)]}-->
-<!--                    </attribute>-->
+                <!--                    </attribute>-->
-<!--                </xpath>-->
+                <!--                </xpath>-->
             </field>
         </record>
 
@@ -185,6 +191,8 @@
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_working_size"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
+                                <field name="cutting_tool_blade_tip_r_size"
+                                       attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_diameter" string="刀尖直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_blade_tip_taper" string="刀尖锥度(°)"

sf_hr/__manifest__.py

@@ -7,9 +7,11 @@
     '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',
+        'data/cron_data.xml',
     ],
     'demo': [
     ],

sf_hr/data/cron_data.xml

@@ -0,0 +1,15 @@
+<odoo>
+    <data noupdate="1">
+        <record model="ir.cron" id="ir_cron_employee_info_sync">
+            <field name="name">员工企微id同步</field>
+            <field name="model_id" ref="hr.model_hr_employee"/>
+            <field name="state">code</field>
+            <field name="code">model._employee_info_sync()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">days</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+        </record>
+
+    </data>
+</odoo>

sf_hr/models/__init__.py

@@ -1,2 +1,4 @@
 # -*- coding: utf-8 -*-
 
+from . import hr_employee
+from . import res_config_setting

sf_hr/models/hr_employee.py

@@ -0,0 +1,28 @@
+import logging
+import requests
+from odoo import models, fields, api, _
+
+_logger = logging.getLogger(__name__)
+
+
+class JkmPracticeEmployee(models.Model):
+    _inherit = 'hr.employee'
+    _description = '员工信息'
+
+    we_id = fields.Char(string='企微ID', index=True)
+
+    def _employee_info_sync(self):
+        url = '/api/get/organization'
+        config = self.env['res.config.settings'].get_values()
+        ret = requests.post((config['ims_url'] + url), json={}, data={})
+        result = ret.json()['result']
+        if result['code'] == 200:
+            if result['employee_list']:
+                for employee_info in result['employee_list']:
+                    if employee_info['work_email']:
+                        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_hr/models/res_config_setting.py

@@ -0,0 +1,30 @@
+# -*- coding: utf-8 -*-
+import logging
+from odoo import api, fields, models
+
+_logger = logging.getLogger(__name__)
+
+
+class ResIMSConfigSettings(models.TransientModel):
+    _inherit = 'res.config.settings'
+
+    ims_url = fields.Char('综合管理系统访问地址')
+
+    @api.model
+    def get_values(self):
+        """
+        重载获取参数的方法，参数都存在系统参数中
+        :return:
+        """
+        values = super(ResIMSConfigSettings, self).get_values()
+        config = self.env['ir.config_parameter'].sudo()
+        ims_url = config.get_param('ims_url', default='')
+        values.update(
+            ims_url=ims_url,
+        )
+        return values
+
+    def set_values(self):
+        super(ResIMSConfigSettings, self).set_values()
+        ir_config = self.env['ir.config_parameter'].sudo()
+        ir_config.set_param("ims_url", self.ims_url or "")

sf_hr/views/hr_employee.xml

@@ -7,7 +7,16 @@
             <field name="inherit_id" ref="hr.view_employee_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//group//field[@name='work_email']" position="attributes">
-                   <attribute name="required">1</attribute>
+                    <attribute name="required">1</attribute>
+                </xpath>
+                <xpath expr="//page[@name='public']" position='after'>
+                    <page string="企业微信">
+                        <group col="2">
+                            <group>
+                                <field name="we_id"/>
+                            </group>
+                        </group>
+                    </page>
                 </xpath>
             </field>
         </record>

sf_hr/views/res_config_settings_views.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="res_config_settings_finance_view_form_extend" model="ir.ui.view">
+            <field name="name">res.config.settings.finance.view.form.extend</field>
+            <field name="model">res.config.settings</field>
+            <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+            <field name="arch" type="xml">
+                <xpath expr="//div[hasclass('app_settings_block')]/div" position="before">
+                    <div>
+                        <h2>综合管理系统接口配置</h2>
+                        <div class="row mt16 o_settings_container" id="jd_api">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                <div class="o_setting_right_pane">
+                                    <div class="text-muted">
+                                        <label for="ims_url"/>
+                                        <field name="ims_url"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>

sf_machine_connect/__manifest__.py

@@ -30,7 +30,6 @@
         'views/machine_info_present.xml',
         'views/delivery_record.xml',
         'views/res_config_settings_views.xml',
-        'views/maintenance_views.xml',
 
     ],
     'assets': {

sf_machine_connect/controllers/controllers.py

@@ -6,7 +6,7 @@ import base64
 import logging
 import psycopg2
 from datetime import datetime, timedelta
-from odoo import http
+from odoo import http, fields
 from odoo.http import request
 
 # 数据库连接配置
@@ -15,14 +15,18 @@ db_config = {
     "user": "postgres",
     "password": "postgres",
     "port": "5432",
-    "host": "172.16.10.98"
+    "host": "172.16.10.113"
 }
 
 
 def convert_to_seconds(time_str):
     # 修改正则表达式，使 H、M、S 部分可选
 
+    if time_str is None:
+        return 0
+
     pattern = r"(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?"
+
     match = re.match(pattern, time_str)
 
     if match:
@@ -66,7 +70,7 @@ class Sf_Dashboard_Connect(http.Controller):
 
         # 获取当前时间的时间戳
         current_timestamp = datetime.now().timestamp()
-        print(current_timestamp)
+        # print(current_timestamp)
 
         # tem_list = [
         #     "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-1", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-3",
@@ -158,11 +162,12 @@ class Sf_Dashboard_Connect(http.Controller):
                         # 关机时长：初次上线时间 - 通电时间
                         'power_off_time': power_off_time,
                         # 关机率：关机时长/初次上线时间
-                        'power_off_rate': power_off_rate,
+                        # 'power_off_rate': power_off_rate,
                         'first_online_duration': first_online_duration,
                         # 停机时间：关机时间 - 运行时间
                         # 停机时长：关机时间 - 初次上线时间
-                        'img': f'data:image/png;base64,{machine_data.machine_tool_picture.decode("utf-8")}',
+                        # 'img': f'data:image/png;base64,{machine_data.machine_tool_picture.decode("utf-8")}',
+                        'img': f'https://xt.sf.jikimo.com/equipment/get_image/{machine_data.id}',
                         'equipment_type': machine_data.category_id.name,
                     })
 
@@ -182,11 +187,11 @@ class Sf_Dashboard_Connect(http.Controller):
         """
         res = {'status': 1, 'message': '成功', 'data': {}}
         logging.info('前端请求日志数据的参数为:%s' % kw)
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        cur = conn.cursor()
 
         try:
-            # 连接数据库
-            conn = psycopg2.connect(**db_config)
-            cur = conn.cursor()
             machine_list = ast.literal_eval(kw['machine_list'])
             begin_time_str = kw['begin_time'].strip('"')
             end_time_str = kw['end_time'].strip('"')
@@ -194,7 +199,7 @@ class Sf_Dashboard_Connect(http.Controller):
             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')
 
-            print('begin_time: %s' % begin_time)
+            # print('begin_time: %s' % begin_time)
 
             for item in machine_list:
                 sql = '''
@@ -226,6 +231,100 @@ class Sf_Dashboard_Connect(http.Controller):
             res['message'] = '前端请求日志数据失败，原因:%s' % e
             return json.dumps(res)
 
+        finally:
+            if cur:
+                cur.close()
+            if conn:
+                conn.close()
+
+    @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)
+
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        cur = conn.cursor()
+        try:
+            # 获取并解析传递的参数
+            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="*")
@@ -275,7 +374,7 @@ class Sf_Dashboard_Connect(http.Controller):
             res = {'Succeed': True}
             line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
             line_list = list(map(lambda x: x.name, line_list_obj))
-            print('line_list: %s' % line_list)
+            # print('line_list: %s' % line_list)
             res['LineList'] = line_list
 
         except Exception as e:
@@ -300,21 +399,40 @@ class Sf_Dashboard_Connect(http.Controller):
 
         try:
             plan_obj = request.env['sf.production.plan'].sudo()
+            production_obj = request.env['mrp.production'].sudo()
             line_list = ast.literal_eval(kw['line_list'])
-            print('line_list: %s' % line_list)
+            # print('line_list: %s' % line_list)
             for line in line_list:
-                plan_data = plan_obj.search([('production_line_id.name', '=', line)])
+
-                # 工单总量
+                # 工单计划量
-                plan_data_total_counts = plan_obj.search_count([('production_line_id.name', '=', line)])
+                plan_data_total_counts = production_obj.search_count(
+                    [('production_line_id.name', '=', line), ('state', 'not in', ['cancel']),
+                     ('active', '=', True)])
                 # 工单完成量
                 plan_data_finish_counts = plan_obj.search_count(
                     [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
-                # 工单计划量
+                # # 工单计划量
-                plan_data_plan_counts = plan_obj.search_count(
+                # plan_data_plan_counts = plan_obj.search_count(
-                    [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
+                #     [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
-                # 工单不良累计
+
-                plan_data_fault_counts = plan_obj.search_count(
+                # 查找符合条件的生产计划记录
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['scrap', 'cancel'])])
+                plan_data = plan_obj.search([
+                    ('production_line_id.name', '=', line),
+                ])
+
+                # 过滤出那些检测结果状态为 '返工' 或 '报废' 的记录
+                faulty_plans = plan_data.filtered(lambda p: any(
+                    result.test_results in ['返工', '报废'] for result in p.production_id.detection_result_ids
+                ))
+
+                # 查找制造订单取消与归档的数量
+                cancel_order_count = production_obj.search_count(
+                    [('production_line_id.name', '=', line), ('state', 'in', ['cancel']),
+                     ('active', '=', False)])
+
+                # 计算符合条件的记录数量
+                # plan_data_fault_counts = len(faulty_plans) + cancel_order_count
+                plan_data_fault_counts = len(faulty_plans)
 
                 # 工单返工数量
 
@@ -326,17 +444,78 @@ class Sf_Dashboard_Connect(http.Controller):
                     (plan_data_finish_counts / plan_data_total_counts if plan_data_total_counts > 0 else 0), 3)
 
                 # 工单进度偏差
-                plan_data_progress_deviation = plan_data_finish_counts - plan_data_plan_counts
+                plan_data_progress_deviation = plan_data_total_counts - plan_data_finish_counts - plan_data_fault_counts
+
+                # 完成记录
+                plan_data_finish_orders = plan_obj.search(
+                    [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
+
+                # # 检测量
+                # detection_nums = 0
+                # for i in plan_data_finish_orders:
+                #     print('i: %s' % i)
+                #     if i.production_id.detection_result_ids:
+                #         detection_nums += 1
+                #
+                # print('detection_nums: %s' % detection_nums)
+
+                # 检测量
+                detection_data = len(
+                    plan_data_finish_orders.mapped('production_id.detection_result_ids').filtered(lambda r: r))
+
+                # 检测合格量
+                pass_nums = plan_data_finish_orders.filtered(lambda p: any(
+                    result.test_results in ['合格'] for result in p.production_id.detection_result_ids
+                ))
+
+                # 质量合格率
+                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) / len(plan_data_finish_orders) if len(plan_data_finish_orders) > 0 else 0), 3)
+
+                # 返工率
+                rework_rate = round(
+                    (plan_data_rework_counts / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
+
+                # 交付准时率
+                delay_num = 0
+                for plan in plan_data_finish_orders:
+                    sale_obj = request.env['sale.order'].sudo().search([('name', '=', plan.origin)])
+                    if sale_obj:
+                        if sale_obj.deadline_of_delivery and plan.actual_end_time:
+                            # 将 deadline_of_delivery 转换为字符串
+                            date_as_string = sale_obj.deadline_of_delivery.strftime('%Y-%m-%d')
+                            # 然后使用 strptime 将字符串转换为 datetime 对象
+                            date_as_datetime = datetime.strptime(date_as_string, '%Y-%m-%d')
+
+                            # 将 actual_end_time 转换为 datetime 对象
+                            datetime_value = fields.Datetime.from_string(plan.actual_end_time)
+
+                            # 给 datetime_value 加1天
+                            new_datetime_value = datetime_value + timedelta(days=1)
+
+                            # 比较 new_datetime_value 和 date_as_datetime 的大小
+                            if new_datetime_value.date() > date_as_datetime.date():
+                                delay_num += 1
+                delay_rate = round((delay_num / plan_data_finish_counts if plan_data_finish_counts > 0 else 0), 3)
+                on_time_rate = 1 - delay_rate
 
                 if plan_data:
                     data = {
                         'plan_data_total_counts': plan_data_total_counts,
                         'plan_data_finish_counts': plan_data_finish_counts,
-                        'plan_data_plan_counts': plan_data_plan_counts,
+                        'plan_data_plan_counts': plan_data_total_counts,
                         'plan_data_fault_counts': plan_data_fault_counts,
+                        'nopass_orders_counts': detection_data - len(pass_nums),
                         'finishe_rate': finishe_rate,
                         'plan_data_progress_deviation': plan_data_progress_deviation,
-                        'plan_data_rework_counts': plan_data_rework_counts
+                        'plan_data_rework_counts': plan_data_rework_counts,
+                        'on_time_rate': on_time_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
 
@@ -363,7 +542,28 @@ class Sf_Dashboard_Connect(http.Controller):
         end_time_str = kw['end_time'].strip('"')
         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')
-        print('line_list: %s' % line_list)
+        # print('line_list: %s' % line_list)
+        print('kw', kw)
+        time_unit = kw.get('time_unit', 'day').strip('"')  # 默认单位为天
+        print('time_unit: %s' % time_unit)
+
+        # 日期或小时循环生成器，根据time_unit决定是按天还是按小时
+        def get_time_intervals(start_time, end_time, time_unit):
+            intervals = []
+            current_time = start_time
+            if time_unit == 'hour':
+                delta = timedelta(hours=1)
+            else:
+                delta = timedelta(days=1)
+
+            while current_time < end_time:
+                next_time = current_time + delta
+                # 确保最后一个时间段不会超出end_time
+                if next_time > end_time:
+                    next_time = end_time
+                intervals.append((current_time, next_time))
+                current_time = next_time
+            return intervals
 
         def get_date_list(start_date, end_date):
             date_list = []
@@ -374,10 +574,36 @@ class Sf_Dashboard_Connect(http.Controller):
             return date_list
 
         for line in line_list:
-            date_list = get_date_list(begin_time, end_time)
+            date_field_name = 'actual_end_time'  # 替换为你模型中的实际字段名
             order_counts = []
 
-            date_field_name = 'actual_end_time'  # 替换为你模型中的实际字段名
+            if time_unit == 'hour':
+                time_intervals = get_time_intervals(begin_time, end_time, time_unit)
+                print('============================= %s' % time_intervals)
+
+                time_count_dict = {}
+
+                for time_interval in time_intervals:
+                    start_time, end_time = time_interval
+
+                    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)
+                # order_counts.append()
+                res['data'][line] = {
+                    'finish_order_nums': time_count_dict,
+                    'plan_order_nums': 28
+                }
+                return json.dumps(res)
+
+            date_list = get_date_list(begin_time, end_time)
 
             for date in date_list:
                 next_day = date + timedelta(days=1)
@@ -487,7 +713,7 @@ class Sf_Dashboard_Connect(http.Controller):
         end_time_str = kw['end_time'].strip('"')
         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')
-        print('line_list: %s' % line_list)
+        # print('line_list: %s' % line_list)
         not_done_data = []
         done_data = []
         final_data = {}
@@ -495,11 +721,22 @@ class Sf_Dashboard_Connect(http.Controller):
         for line in line_list:
             # 未完成订单
             not_done_orders = plan_obj.search(
-                [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
+                [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
-            print(not_done_orders)
+                 ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
+                 ])
+            # print(not_done_orders)
+
             # 完成订单
-            finish_orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
+            # 获取当前时间，并计算24小时前的时间
-            print(finish_orders)
+            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),
+                ('actual_end_time', '>=', time_24_hours_ago)
+            ])
+            # print(finish_orders)
 
             # 获取所有未完成订单的ID列表
             order_ids = [order.id for order in not_done_orders]
@@ -555,6 +792,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
@@ -575,7 +814,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)
@@ -613,27 +853,30 @@ class Sf_Dashboard_Connect(http.Controller):
                 '''
 
                 sql2 = '''
-                    SELECT DISTINCT ON (alarm_time) alarm_time, alarm_repair_time
+                    SELECT DISTINCT ON (alarm_start_time) alarm_time, alarm_start_time
                     FROM device_data
-                    WHERE device_name = %s AND alarm_time IS NOT NULL
+                    WHERE device_name = %s AND alarm_start_time IS NOT NULL
-                    ORDER BY alarm_time, time;
+                    ORDER BY alarm_start_time, time;
                     
                 '''
                 # 执行SQL命令
                 cur.execute(sql, (item,))
                 result = cur.fetchall()
-                print('result========', result)
+                # print('result========', result)
 
                 cur.execute(sql2, (item,))
                 result2 = cur.fetchall()
-                print('result2========', result2)
+                # print('result2========', result2)
                 #
                 for row in result:
                     res['data'][item] = {'idle_count': row[0]}
                 alarm_count = []
                 for row in result2:
-                    alarm_count.append(row[0])
+                    alarm_count.append(row[1])
-                    total_alarm_time += abs(float(row[0]))
+                    if row[0]:
+                        total_alarm_time += abs(float(row[0]))
+                    else:
+                        total_alarm_time += 0.0
                 if len(list(set(alarm_count))) == 1:
                     if list(set(alarm_count))[0] is None:
                         alarm_count_num = 0
@@ -659,54 +902,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 = '''
+            #     machine_data = equipment_obj.search([('code', '=', item)])
-                SELECT DISTINCT ON (alarm_time) alarm_time, alarm_message, system_date, system_time, alarm_repair_time
+            for log in maintenance_logs_obj.search([]):
-                FROM device_data
+                res['data'].append({
-                WHERE alarm_time IS NOT NULL
+                    'name': log.name,
-                ORDER BY alarm_time, time;
+                    '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}")
+            logging.error(f"An error occurred: {e}")
-            return json.dumps(res)
+
-        finally:
+        return json.dumps(res)
-            cur.close()
-            conn.close()
 
     # 设备oee
     @http.route('/api/OEE', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
@@ -830,3 +1046,275 @@ class Sf_Dashboard_Connect(http.Controller):
         # 返回数据
         res['data'] = oee_data
         return json.dumps(res)
+
+    @http.route(['/equipment/get_image/<int:record_id>'], type='http', auth="public", website=True)
+    def get_image(self, record_id, **kwargs):
+        # 获取模型中的记录
+        record = request.env['maintenance.equipment'].sudo().browse(record_id)
+
+        # 获取图片字段的数据
+        image_data_base64 = record.machine_tool_picture
+
+        if image_data_base64:
+            # 将Base64解码为二进制数据
+            image_data_binary = base64.b64decode(image_data_base64)
+
+            # 返回图片数据，并设置正确的Content-Type
+            return request.make_response(image_data_binary, headers=[('Content-Type', 'image/png')])
+        else:
+            # 如果没有图片数据，返回404
+            return request.not_found()
+
+    # 设备运行率
+    @http.route('/api/RunningTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
+    def RunningTime(self, **kw):
+        """
+        获取设备运行时长
+        """
+        res = {'status': 1, 'message': '成功', 'data': {}}
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        # 获取请求的机床数据
+        machine_list = ast.literal_eval(kw['machine_list'])
+
+        def fetch_result_as_dict(cursor):
+            """辅助函数：将查询结果转为字典"""
+            columns = [desc[0] for desc in cursor.description]
+            return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
+
+        # 初始化当天、当月和有记录以来的总时长
+        day_total_running_time = 0
+        day_total_process_time = 0
+        day_work_rate = 0
+        month_total_running_time = 0
+        month_total_process_time = 0
+        month_work_rate = 0
+        all_time_total_running_time = 0
+        all_time_total_process_time = 0
+        all_time_work_rate = 0
+
+        for item in machine_list:
+            # 获取当天第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time::date = CURRENT_DATE
+                    AND device_state != '离线'
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_today = fetch_result_as_dict(cur)
+                # print("当天第一条记录（非离线）:", first_today)
+
+            # 获取当天最新一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND time::date = CURRENT_DATE
+                    AND device_state != '离线'
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_today = fetch_result_as_dict(cur)
+                # print("当天最新一条记录（非离线）:", last_today)
+
+            # 计算当天运行时长
+            if first_today and last_today:
+                running_time = convert_to_seconds(last_today['run_time']) - convert_to_seconds(first_today['run_time'])
+                process_time = convert_to_seconds(last_today['process_time']) - convert_to_seconds(
+                    first_today['process_time'])
+                day_total_running_time += abs(running_time)
+                day_total_process_time += abs(process_time)
+
+            # 获取当月第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
+                    AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
+                    AND device_state != '离线'
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_month = fetch_result_as_dict(cur)
+                # print("当月第一条记录（非离线）:", first_month)
+
+            # 获取当月最新一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND EXTRACT(YEAR FROM time) = EXTRACT(YEAR FROM CURRENT_DATE)
+                    AND EXTRACT(MONTH FROM time) = EXTRACT(MONTH FROM CURRENT_DATE)
+                    AND device_state != '离线'
+                    ORDER BY time DESC
+                    LIMIT 1;
+                """, (item,))
+                last_month = fetch_result_as_dict(cur)
+                # print("当月最新一条记录（非离线）:", last_month)
+
+            # 计算当月运行时长
+            if first_month and last_month:
+                month_running_time = convert_to_seconds(last_month['run_time']) - convert_to_seconds(
+                    first_month['run_time'])
+                month_process_time = convert_to_seconds(last_month['process_time']) - convert_to_seconds(
+                    first_month['process_time'])
+                month_total_running_time += abs(month_running_time)
+                month_total_process_time += abs(month_process_time)
+
+            # 获取有记录以来的第一条记录（排除device_state等于‘离线’的记录）
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT * FROM device_data
+                    WHERE device_name = %s
+                    AND device_state != '离线'
+                    ORDER BY time ASC
+                    LIMIT 1;
+                """, (item,))
+                first_all_time = fetch_result_as_dict(cur)
+                # print("有记录以来的第一条记录（非离线）:", first_all_time)
+
+            # 获取有记录以来的最新一条记录（排除device_state等于‘离线’的记录）
+            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,))
+                last_all_time = fetch_result_as_dict(cur)
+                # print("有记录以来的最新一条记录（非离线）:", last_all_time)
+
+            # 计算有记录以来的运行时长
+            if first_all_time and last_all_time:
+                all_time_running_time = convert_to_seconds(last_all_time['run_time']) - convert_to_seconds(
+                    first_all_time['run_time'])
+                all_time_process_time = convert_to_seconds(last_all_time['process_time']) - convert_to_seconds(
+                    first_all_time['process_time'])
+                all_time_total_running_time += abs(all_time_running_time)
+                all_time_total_process_time += abs(all_time_process_time)
+
+        # 计算当天工作效率
+        if day_total_running_time > day_total_process_time:
+            day_work_rate = day_total_process_time / day_total_running_time if day_total_running_time != 0 else 0
+        else:
+            day_work_rate = day_total_running_time / day_total_process_time if day_total_process_time != 0 else 0
+        print("当天工作效率: %s" % day_work_rate)
+
+        # 计算当月工作效率
+        if month_total_running_time > month_total_process_time:
+            month_work_rate = month_total_process_time / month_total_running_time if month_total_running_time != 0 else 0
+        else:
+            month_work_rate = month_total_running_time / month_total_process_time if month_total_process_time != 0 else 0
+        print("当月工作效率: %s" % month_work_rate)
+
+        # 计算有记录以来的工作效率
+        if all_time_total_running_time > all_time_total_process_time:
+            all_time_work_rate = all_time_total_process_time / all_time_total_running_time if all_time_total_running_time != 0 else 0
+        else:
+            all_time_work_rate = all_time_total_running_time / all_time_total_process_time if all_time_total_process_time != 0 else 0
+        print("有记录以来的工作效率: %s" % all_time_work_rate)
+
+        conn.close()
+
+        # 返回数据
+        res['data']['day_work_rate'] = day_work_rate
+        res['data']['month_work_rate'] = month_work_rate
+        res['data']['all_time_work_rate'] = all_time_work_rate
+
+        return json.dumps(res)
+
+    # 设备运行时长
+    @http.route('/api/RunningTimeDetail', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
+    def RunningTimeDetail(self, **kw):
+        """
+        获取
+        """
+        res = {'status': 1, 'message': '成功', 'data': {}}
+        # 连接数据库
+        conn = psycopg2.connect(**db_config)
+        # 获取请求的机床数据
+        machine_list = ast.literal_eval(kw['machine_list'])
+        time_threshold = datetime.now() - timedelta(days=1)
+
+        alarm_last_24_time = 0.0
+
+        def fetch_result_as_dict(cursor):
+            """辅助函数：将查询结果转为字典"""
+            columns = [desc[0] for desc in cursor.description]
+            return dict(zip(columns, cursor.fetchone())) if cursor.rowcount != 0 else None
+
+        # 获取当前时间的时间戳
+        current_timestamp = datetime.now().timestamp()
+        for item in machine_list:
+            euipment_obj = request.env['maintenance.equipment'].sudo().search([('code', '=', item)])
+            # 机床上线时间段
+            first_online_duration = current_timestamp - euipment_obj.first_online_time.timestamp()
+            with conn.cursor() as cur:
+                cur.execute("""
+                            SELECT * FROM device_data
+                            WHERE device_name = %s
+                            AND device_state != '离线' AND process_time IS NOT NULL
+                            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 AND process_time IS NOT NULL
+                            ORDER BY time ASC
+                            LIMIT 1;
+                        """, (item, time_threshold))
+                last_24_time = fetch_result_as_dict(cur)
+
+            with conn.cursor() as cur:
+                cur.execute("""
+                    SELECT COUNT(*) 
+                    FROM (
+                    SELECT DISTINCT ON (idle_start_time) idle_start_time 
+                    FROM device_data 
+                    WHERE device_name = %s AND idle_start_time IS NOT NULL AND time >= %s
+                    ORDER BY idle_start_time, time
+                    ) subquery;
+                """, (item, time_threshold))
+                idle_count = cur.fetchone()[0]
+
+            alarm_last_24_nums = []
+            with conn.cursor() as cur:
+                cur.execute("""
+                            SELECT DISTINCT ON (alarm_start_time) alarm_time, alarm_start_time
+                            FROM device_data
+                            WHERE device_name = %s
+                            AND alarm_start_time IS NOT NULL AND time >= %s;
+                        """, (item, time_threshold))
+                results = cur.fetchall()
+                for result in results:
+                    alarm_last_24_nums.append(result[1])
+                    if result[0]:
+                        if float(result[0]) >= 1000:
+                            continue
+                        alarm_last_24_time += float(result[0])
+                    else:
+                        alarm_last_24_time += 0.0
+            # 返回数据
+            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,
+                '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,
+                'alarm_last_24_time': alarm_last_24_time,
+                'alarm_last_24_nums': len(list(set(alarm_last_24_nums))),
+                'idle_count': idle_count,
+                'first_online_time': first_online_duration,
+            }
+
+        conn.close()
+
+        return json.dumps(res)

sf_machine_connect/models/ftp_client.py

@@ -285,26 +285,6 @@ class Machine_ftp(models.Model):
     # # 开动率
     run_rate = fields.Char('开动率', readonly=True)
 
-    # 同步CNC设备到oee
-    def sync_oee(self):
-        """
-        同步CNC设备到oee
-        :return:
-        """
-        for record in self:
-            record.ensure_one()
-            cnc_oee_dict = {
-                'equipment_id': record.id,
-                'type_id': record.type_id.id,
-                'machine_tool_picture': record.machine_tool_picture,
-                'equipment_code': record.code,
-                'function_type': record.function_type,
-            }
-            if self.env['maintenance.equipment.oee.logs'].search([('equipment_id', '=', record.id)]):
-                self.env['maintenance.equipment.oee.logs'].write(cnc_oee_dict)
-            else:
-                self.env['maintenance.equipment.oee.logs'].create(cnc_oee_dict)
-
 
 class WorkCenterBarcode(models.Model):
     """

sf_machine_connect/models/res_config_setting.py

@@ -16,6 +16,7 @@ class ResBFMConfigSettings(models.TransientModel):
     #      ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
 
     bfm_url_new = fields.Char('业务平台环境路径', placeholder='请输入当前对应的业务平台环境路径')
+    get_check_file_path = fields.Char('获取检查文件路径', default='')
 
     @api.model
     def get_values(self):
@@ -26,9 +27,11 @@ class ResBFMConfigSettings(models.TransientModel):
         values = super(ResBFMConfigSettings, self).get_values()
         config = self.env['ir.config_parameter'].sudo()
         bfm_url_new = config.get_param('bfm_url_new', default='')
+        get_check_file_path = config.get_param('get_check_file_path', default='')
 
         values.update(
             bfm_url_new=bfm_url_new,
+            get_check_file_path=get_check_file_path
         )
         return values
 
@@ -36,3 +39,4 @@ class ResBFMConfigSettings(models.TransientModel):
         super(ResBFMConfigSettings, self).set_values()
         ir_config = self.env['ir.config_parameter'].sudo()
         ir_config.set_param("bfm_url_new", self.bfm_url_new or "")
+        ir_config.set_param("get_check_file_path", self.get_check_file_path or "")

sf_machine_connect/views/machine_monitor.xml

@@ -14,7 +14,7 @@
                     <group string='状态监控'>
                         <group>
 <!--                             <field name="timestamp"/> -->
-                            <field name="status"/>
+<!--                             <field name="status"/> -->
                             <field name="run_status"/>
                             <field name="run_time"/>
                             <field name="system_date"/>

sf_machine_connect/views/maintenance_views.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<odoo>
-    <!-- 修改设备列表视图-->
-    <record id="sf_machine_hr_equipment_view_tree_inherit" model="ir.ui.view">
-        <field name="name">sf.machine.hr.equipment.view.tree.inherit</field>
-        <field name="model">maintenance.equipment</field>
-        <field name="inherit_id" ref="maintenance.hr_equipment_view_tree"/>
-        <field name="arch" type="xml">
-            <xpath expr="//tree" position="inside">
-                <header>
-                    <button name="sync_oee" type="object" string="同步设备至OEE"/>
-                </header>
-            </xpath>
-        </field>
-    </record>
-
-</odoo>

sf_machine_connect/views/res_config_settings_views.xml

@@ -22,6 +22,33 @@
                             </div>
                         </div>
                     </div>
+                    <div>
+                        <h2>获取检测报告服务配置</h2>
+                        <div class="row mt16 o_settings_container" id="check_report_config">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                    <div class="o_setting_right_pane">
+                                        <div class="text-muted">
+                                            <label for="get_check_file_path" />
+                                            <field name="get_check_file_path" string="检测报告服务地址"/>
+                                        </div>
+                                    </div>
+<!--                                 </div> -->
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+                <xpath expr="//div[@id='check_report_config']/div" position="after">
+                        <div class="col-12 col-lg-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="is_get_detection_file"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <div class="text-muted">
+                                    <label for="is_get_detection_file"/>
+                                </div>
+                            </div>
+                        </div>
                 </xpath>
             </field>
         </record>

sf_maintenance/models/sf_maintenance.py

@@ -38,8 +38,7 @@ class SfMaintenanceEquipment(models.Model):
 
     crea_url = "/api/machine_tool/create"
 
-
+    # AGV运行日志
-    #AGV运行日志
     agv_logs = fields.One2many('maintenance.equipment.agv.log', 'equipment_id', string='AGV运行日志')
     # 1212修改后的字段
     number_of_axles = fields.Selection(
@@ -117,7 +116,6 @@ class SfMaintenanceEquipment(models.Model):
     #         num = "%04d" % m
     #     return num
 
-
     equipment_maintenance_standards_ids = fields.Many2many('equipment.maintenance.standards',
                                                            'sf_maintenance_equipment_ids', string='设备维保标准')
     eq_maintenance_id = fields.Many2one('equipment.maintenance.standards', string='设备保养标准',
@@ -179,7 +177,8 @@ class SfMaintenanceEquipment(models.Model):
     type_id = fields.Many2one('sf.machine_tool.type', '型号')
 
     state = fields.Selection(
-        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"), ("封存(报废)", "封存(报废)")],
+        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"),
+         ("封存(报废)", "封存(报废)")],
         default='正常', string="机床状态")
     run_time = fields.Char('总运行时长')
     # 0606新增字段
@@ -328,7 +327,7 @@ class SfMaintenanceEquipment(models.Model):
             item.tool_diameter_min = item.type_id.tool_diameter_min
             item.machine_tool_category = item.type_id.machine_tool_category.id
             item.brand_id = item.type_id.brand_id.id
-            #新增修改字段
+            # 新增修改字段
             item.taper_type_id = item.type_id.taper_type_id.id
             item.function_type = item.type_id.function_type
             item.a_axis = item.type_id.a_axis
@@ -370,7 +369,6 @@ class SfMaintenanceEquipment(models.Model):
             item.image_id = item.type_id.jg_image_id.ids
             item.image_lq_id = item.type_id.lq_image_id.ids
 
-
     # AGV小车设备参数
     AGV_L = fields.Char('AGV尺寸(长)')
     AGV_W = fields.Char('AGV尺寸(宽)')
@@ -461,18 +459,6 @@ class SfMaintenanceEquipment(models.Model):
     original_value = fields.Char('原值')
     incomplete_value = fields.Char('残值')
 
-
-
-
-
-
-
-
-
-
-
-
-
     # 注册同步机床
     def enroll_machine_tool(self):
         sf_sync_config = self.env['res.config.settings'].get_values()
@@ -763,7 +749,7 @@ class SfMaintenanceEquipment(models.Model):
     image_id = fields.Many2many('maintenance.equipment.image', 'equipment_id',
                                 domain="[('type', '=', '加工能力')]")
     image_lq_id = fields.Many2many('maintenance.equipment.image', 'equipment_lq_id', string='冷却方式',
-                                domain="[('type', '=', '冷却方式')]")
+                                   domain="[('type', '=', '冷却方式')]")
 
 
 class SfRobotAxisNum(models.Model):
@@ -777,4 +763,5 @@ class SfRobotAxisNum(models.Model):
     weight = fields.Char('最大负载(kg)')
     permissible_load_torque = fields.Char('允许负载扭矩(N-m)')
     permissible_inertial_torque = fields.Char('允许惯性扭矩(kg-m²)')
-    equipment_id = fields.Many2one('maintenance.equipment', string='机器人', domain="[('equipment_type', '=', '机器人')]")
+    equipment_id = fields.Many2one('maintenance.equipment', string='机器人',
+                                   domain="[('equipment_type', '=', '机器人')]")

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='编码')
+    code = fields.Char(string='编码', readonly=True)
-    name = fields.Char(string='名称')
+    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,46 @@
 # -*- coding: utf-8 -*-
+import re
+import json
+import datetime
+import requests
 from odoo import api, fields, models, _
+from odoo.exceptions import UserError
+
+
+def convert_to_seconds(time_str):
+    # 修改正则表达式，使 H、M、S 部分可选
+
+    if time_str is None:
+        return 0
+
+    pattern = r"(?:(\d+)H)?(?:(\d+)M)?(?:(\d+)S)?"
+
+    match = re.match(pattern, time_str)
+
+    if match:
+        # 提取各时间单位，如果某个单位缺失则默认设为0
+        hours = int(match.group(1)) if match.group(1) else 0
+        minutes = int(match.group(2)) if match.group(2) else 0
+        seconds = int(match.group(3)) if match.group(3) else 0
+
+        # 计算总秒数
+        total_seconds = hours * 3600 + minutes * 60 + seconds
+        if total_seconds == 0:
+            # return None
+            pattern = r"(?:(\d+)小时)?(?:(\d+)分钟)?(?:(\d+)秒)?"
+            match = re.match(pattern, time_str)
+            if match:
+                # 提取各时间单位，如果某个单位缺失则默认设为0
+                hours = int(match.group(1)) if match.group(1) else 0
+                minutes = int(match.group(2)) if match.group(2) else 0
+                seconds = int(match.group(3)) if match.group(3) else 0
+
+                # 计算总秒数
+                total_seconds = hours * 3600 + minutes * 60 + seconds
+                return total_seconds
+            else:
+                return None
+        return total_seconds
 
 
 class SfMaintenanceEquipmentOEE(models.Model):
@@ -9,24 +50,225 @@ 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(
         [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"),
          ("封存(报废)", "封存(报废)")],
         default='正常', string="机床状态", related='equipment_id.state')
-    run_time = fields.Float('加工时长(h)')
+
-    equipment_time = fields.Float('开机时长(h)')
+    online_time = fields.Char('开机时长(小时)', reaonly='True')
-    done_nums = fields.Integer('加工件数')
+
-    utilization_rate = fields.Char('可用率')
+    offline_time = fields.Char('关机时长(小时)', reaonly='True')
-    fault_time = fields.Float('故障时长')
+    idle_nums = fields.Integer('待机次数', reaonly='True')
-    fault_nums = fields.Integer('故障次数')
+    # 待机时长
-    # 故障率
+
-    fault_rate = fields.Char('故障率')
+    idle_time = fields.Char('待机时长(小时)', reaonly='True')
+
+    # 待机率
+    idle_rate = fields.Char('待机率(%)', reaonly='True')
+
+    work_time = fields.Char('加工时长(小时)', reaonly='True')
+    work_rate = fields.Char('可用率(%)', reaonly='True')
+    fault_time = fields.Char('故障时长(小时)', reaonly='True')
+    fault_rate = fields.Char('故障率(%)', reaonly='True')
+    fault_nums = fields.Integer('故障次数', reaonly='True')
+
     # 设备故障日志
     sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_oee_id', '设备故障日志',
                                               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):
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        print(base_url)
+        config = self.env['ir.config_parameter'].sudo()
+        # url = 'http://172.16.10.112:8069/api/logs/list'
+        # url_time = 'http://localhost:9069/api/RunningTimeDetail'
+        url = base_url + '/api/logs/list'
+        url_time = base_url + '/api/RunningTimeDetail'
+        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
+        }
+
+        data_time = {
+            "machine_list": str(machine_list)
+        }
+
+        print(data)
+
+        # 发送POST请求
+        response = requests.post(url, json={}, data=data)
+        response_time = requests.post(url_time, json={}, data=data_time)
+        # print(response.json())  # 输出服务器返回的响应
+        print(response_time.json())
+        if response_time.status_code == 200:
+            result_time = response_time.json()
+            real_dict = result_time['data'][self.equipment_code]
+            print('=', result_time)
+            if result_time['status'] == 1:
+                self.online_time = round((convert_to_seconds(real_dict['power_on_time']) - convert_to_seconds(
+                    real_dict['power_on_24_time'])) / 3600, 2)
+                self.work_time = round(
+                    (convert_to_seconds(real_dict['cut_time']) - convert_to_seconds(real_dict['cut_24_time'])) / 3600,
+                    2)
+                self.offline_time = 24 - (float(self.online_time) if self.online_time else 0)
+                self.idle_time = float(self.online_time) - float(
+                    self.work_time) if self.online_time and self.work_time else 0
+                self.idle_rate = round(
+                    float(self.idle_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
+                self.work_rate = round(
+                    float(self.work_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
+                self.fault_time = (float(real_dict['alarm_last_24_time']) if real_dict[
+                    'alarm_last_24_time'] else 0) / 3600
+                self.fault_rate = round(
+                    float(self.fault_time) / (float(self.online_time) if self.online_time else 1) * 100, 2)
+                self.fault_nums = real_dict['alarm_last_24_nums']
+                self.idle_nums = real_dict['idle_count']
+
+        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()
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        # url = 'http://172.16.10.112:8069/api/logs/list'
+        url = base_url + '/api/logs/list'
+        url_time = base_url + '/api/RunningTimeDetail'
+        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 = []
@@ -95,4 +337,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/security/ir.model.access.csv

@@ -67,6 +67,3 @@ access_sf_cutting_tool_type_admin_sf_group_equipment_user,sf_cutting_tool_type_a
 access_sf_cutting_tool_type_group_purchase_director_sf_group_equipment_user,sf_cutting_tool_type_group_purchase_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_cutting_tool_type_group_sale_director_sf_group_equipment_user,sf_cutting_tool_type_group_sale_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_cutting_tool_type_group_plan_director_sf_group_equipment_user,sf_cutting_tool_type_group_plan_director,sf_base.model_sf_cutting_tool_type,sf_maintenance.sf_group_equipment_user,1,0,0,0
-
-access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_maintenance.sf_group_equipment_manager,1,1,1,1
-access_maintenance_equipment_oee_log_detail,maintenance_equipment_oee_log_detail,model_maintenance_equipment_oee_log_detail,sf_maintenance.sf_group_equipment_manager,1,1,1,1

sf_maintenance/views/equipment_maintenance_standards_views.xml

@@ -79,6 +79,7 @@
                 <field name="name" string="日常机床保养"/>
                 <field name="created_user_id" string="创建人"/>
                 <field name="maintenance_equipment_category_id" string="设备类别"/>
+                <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
             </search>
         </field>
     </record>

sf_maintenance/views/maintenance_equipment_oee_views.xml

@@ -8,13 +8,13 @@
             <field name="arch" type="xml">
                 <tree>
                     <field name="equipment_id"/>
-                    <field name="equipment_time"/>
+                    <field name="online_time"/>
-                    <field name="run_time"/>
+                    <field name="work_time"/>
-                    <field name="done_nums"/>
+                    <field name="work_rate"/>
-                    <field name="utilization_rate"/>
                     <field name="fault_time"/>
                     <field name="fault_nums"/>
                     <field name="fault_rate"/>
+
                 </tree>
             </field>
         </record>
@@ -37,32 +37,102 @@
 
                         <group>
                             <group>
-                                <field name="type_id" readonly="1"/>
+                                <group>
-                                <field name="equipment_time"/>
+                                    <field name="equipment_id" domain="[('name','ilike','加工中心')]"/>
-                                <field name="run_time"/>
+                                    <field name="type_id"/>
-                                <field name="done_nums"/>
+                                    <field name="state"/>
-                                <field name="utilization_rate"/>
+                                    <field name="equipment_code"/>
-                                <field name="fault_time"/>
+                                </group>
-                                <field name="fault_nums"/>
                             </group>
                             <group>
-                                <field name="machine_tool_picture" widget="image" readonly="1"/>
+                                <group>
+<!--                                     <field name="state" nolabel="1"/> -->
+<!--                                     <field name="state" string=""/> -->
+                                </group>
+                                <group>
+                                    <field name="machine_tool_picture" widget="image" nolabel="1"/>
+                                </group>
+                            </group>
+                        </group>
+                        <group>
+                            <group>
+                                <group>
+                                    <field name="online_time" readonly="1"/>
+                                    <field name="offline_time" readonly="1"/>
+                                    <field name="fault_rate" readonly="1"/>
+                                </group>
+                                <group>
+                                    <field name="idle_nums" readonly="1"/>
+                                    <field name="fault_time" readonly="1"/>
+                                    <field name="fault_nums" readonly="1"/>
+                                </group>
+                            </group>
+                            <group>
+                                <group>
+                                    <field name="idle_time"/>
+                                    <field name="idle_rate"/>
+                                </group>
+                                <group>
+                                    <field name="work_time"/>
+                                    <field name="work_rate"/>
+                                </group>
                             </group>
 
                         </group>
-<!--                         <notebook> -->
+                        <notebook>
-<!--                         <page string="运行日志"> -->
+                        <page string="24H日志详情">
-<!--                             <field name="oee_logs"> -->
+                            <group>
-<!--                                 <tree create="1" edit="1" delete="1" editable="bottom"> -->
+                                <button name="get_day_logs" type="object" string="查看24H日志" t-attf-style="white-space:nowrap;"/>
-<!--                                     <field name = 'run_time'/> -->
+                            </group>
-<!--                                     <field name = 'state'/> -->
+                            <field name="day_logs_detail" readonly="1" widget="html"/>
-<!--                                     <field name = 'workorder_id'/> -->
+<!--                             <field name="page_num"/> -->
-<!--                                     <field name = 'time'/> -->
+<!--                             <group> -->
-<!--                                     <field name = 'color' widget="color"/> -->
+<!--                                 <group> -->
-<!--                                 </tree> -->
+<!--                                     <button name="previous_day_logs" type="object" string="上一页" t-attf-style="white-space:nowrap;"/> -->
-<!--                             </field> -->
+<!--                                 </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> -->
+                    </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="brand"/> -->
-                    <field name="maintenance_equipment_id"/>
+                    <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"/>
@@ -105,249 +105,6 @@
             </field>
         </record>
 
-<!--         设备运行日志 -->
-        <record id="view_maintenance_logs_run_tree" model="ir.ui.view">
-            <field name="name">maintenance.logs.run.tree</field>
-            <field name="model">maintenance.equipment.oee.logs</field>
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="equipment_id"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_maintenance_logs_run_form" model="ir.ui.view">
-            <field name="name">maintenance.logs.run.form</field>
-            <field name="model">maintenance.equipment.oee.logs</field>
-            <field name="arch" type="xml">
-<!--                 <form string="设备运行日志"> -->
-<!--                     <header> -->
-<!--                         <field name="equipment_id" readonly="1"/> -->
-<!--                     </header> -->
-<!--                     <sheet> -->
-<!--                         <div class="oe_title"> -->
-<!--                             <h1> -->
-<!--                                 <field name="start_time" readonly="1"/> -->
-<!--                             </h1> -->
-<!--                         </div> -->
-<!--                         <group> -->
-<!--                             <group> -->
-<!--                                 <field name="stop_time" readonly="1"/> -->
-<!--                                 <field name="duration" readonly="1"/> -->
-<!--                                 <field name="oee" readonly="1"/> -->
-<!--                             </group> -->
-<!--                             <group> -->
-<!--                                 <field name="note"/> -->
-<!--                             </group> -->
-
-<!--                         </group> -->
-<!--                     </sheet> -->
-<!--                 </form>                 -->
-                <form string="设备运行日志">
-<!--                     <header> -->
-<!--                         <field name="name" readonly="1"/> -->
-<!--                     </header> -->
-                    <sheet>
-                        <div class="oe_title">
-                            <h1>
-                                <field name="name"/>
-                            </h1>
-                        </div>
-                        <group>
-                            <group>
-                                <group>
-                                    <field name="equipment_id" domain="[('name','ilike','加工中心')]"/>
-                                    <field name="type_id"/>
-                                    <field name="state"/>
-                                    <field name="equipment_code"/>
-                                    <field name="function_type"/>
-                                </group>
-                            </group>
-                            <group>
-                                <group>
-<!--                                     <field name="state" nolabel="1"/> -->
-                                    <field name="state" string=""/>
-                                </group>
-                                <group>
-                                    <field name="machine_tool_picture" widget="image" nolabel="1"/>
-                                </group>
-                            </group>
-                        </group>
-                        <group>
-                            <group>
-                                <group>
-                                    <field name="online_time" readonly="1"/>
-                                    <field name="offline_time" readonly="1"/>
-                                    <field name="fault_rate" readonly="1"/>
-                                </group>
-                                <group>
-                                    <field name="offline_nums" readonly="1"/>
-                                    <field name="fault_time" readonly="1"/>
-                                    <field name="fault_nums" readonly="1"/>
-                                </group>
-                            </group>
-                            <group>
-                                <group>
-                                    <field name="idle_time"/>
-                                    <field name="idle_rate"/>
-                                </group>
-                                <group>
-                                    <field name="work_time"/>
-                                    <field name="work_rate"/>
-                                </group>
-                            </group>
-
-                        </group>
-                        <notebook>
-                        <page string="24H日志详情">
-<!--                             筛选出24小时内的日志 -->
-<!--                             <field name="detail_ids" domain="[('time','&lt;',(datetime.datetime.now() - datetime.timedelta(days=1)).strftime('%Y-%m-%d %H:%M:%S'))]"> -->
-                            <field name="detail_ids" domain="[('state','ilike','加工')]">
-                                <tree>
-<!--                                     <field name="sequence"/> -->
-                                    <field name="time"/>
-                                    <field name="state"/>
-                                    <field name="production_name"/>
-                                </tree>
-<!--                                 <form> -->
-<!--                                     <field name="sequence"/> -->
-<!--                                     <field name="time"/> -->
-<!--                                     <field name="state"/> -->
-<!--                                     <field name="production_id"/> -->
-<!--                                 </form> -->
-
-                            </field>
-                        </page>
-                        <page string="历史日志详情">
-                            <field name="detail_ids">
-                                <tree>
-<!--                                     <field name="sequence"/> -->
-                                    <field name="time"/>
-                                    <field name="state"/>
-                                    <field name="production_name"/>
-                                </tree>
-<!--                                 <form> -->
-<!--                                     <field name="sequence"/> -->
-<!--                                     <field name="time"/> -->
-<!--                                     <field name="state"/> -->
-<!--                                     <field name="production_id"/> -->
-<!--                                 </form> -->
-
-                            </field>
-                        </page>
-                    </notebook>
-                    </sheet>
-
-                </form>
-            </field>
-        </record>
-
-
-<!--         <record id="view_maintenance_logs_run_search" model="ir.ui.view"> -->
-<!--             <field name="name">maintenance.logs.run.search</field> -->
-<!--             <field name="model">maintenance.equipment.oee.logs</field> -->
-<!--             <field name="arch" type="xml"> -->
-<!--                 <search> -->
-<!--                     <field name="equipment_id"/> -->
-<!--                     <field name="start_time"/> -->
-<!--                     <field name="stop_time"/> -->
-<!--                     <field name="duration"/> -->
-<!--                     <field name="oee"/> -->
-<!--                     <field name="note"/> -->
-<!--                 </search> -->
-
-<!--             </field> -->
-<!--         </record> -->
-
-<!--         设备运行日志详情 -->
-         <record id="view_maintenance_logs_run_detail_tree" model="ir.ui.view">
-            <field name="name">maintenance.logs.run.detail.tree</field>
-            <field name="model">maintenance.equipment.oee.log.detail</field>
-            <field name="arch" type="xml">
-                <tree>
-<!--                     <field name="sequence"/> -->
-                    <field name="time"/>
-                    <field name="state"/>
-                    <field name="production_name"/>
-                </tree>
-            </field>
-        </record>
-
-        <record id="view_maintenance_logs_run_detail_form" model="ir.ui.view">
-            <field name="name">maintenance.logs.run.detail.form</field>
-            <field name="model">maintenance.equipment.oee.log.detail</field>
-            <field name="arch" type="xml">
-                <form string="设备运行日志详情">
-                    <sheet>
-                        <group>
-                            <group>
-                                <field name="state"/>
-<!--                                 <field name="production_id"/> -->
-                            </group>
-                            <group>
-<!--                                 <field name="sequence"/> -->
-                                <field name="time"/>
-                            </group>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-<!--         <record id="view_maintenance_logs_run_detail_search" model="ir.ui.view"> -->
-<!--             <field name="name">maintenance.logs.run.detail.search</field> -->
-<!--             <field name="model">maintenance.equipment.oee.logs.detail</field> -->
-<!--             <field name="arch" type="xml"> -->
-<!--                 <search> -->
-<!--                     <field name="equipment_id"/> -->
-<!--                     <field name="start_time"/> -->
-<!--                     <field name="stop_time"/> -->
-<!--                     <field name="duration"/> -->
-<!--                     <field name="oee"/> -->
-<!--                     <field name="note"/> -->
-<!--                 </search> -->
-<!--             </field> -->
-<!--         </record> -->
-
-<!--         设备运行日志详情action -->
-<!--         <record id="action_maintenance_logs_run_detail" model="ir.actions.act_window"> -->
-<!--             <field name="name">设备运行日志详情</field> -->
-<!--             <field name="type">ir.actions.act_window</field> -->
-<!--             <field name="res_model">maintenance.equipment.oee.logs.detail</field> -->
-<!--             <field name="view_mode">tree,form</field> -->
-<!--             <field name="view_id" ref="view_maintenance_logs_run_detail_tree"/> -->
-<!--             <field name="help" type="html"> -->
-<!--                 <p class="oe_view_nocontent_create"> -->
-<!--                     设备运行日志详情 -->
-<!--                 </p> -->
-<!--             </field> -->
-<!--                  -->
-<!--         </record> -->
-
-
-
-
-
-        <record id="action_maintenance_logs_run" model="ir.actions.act_window">
-            <field name="name">设备运行日志</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">maintenance.equipment.oee.logs</field>
-<!--             <field name="search_view_id" ref="view_maintenance_logs_run_search"/> -->
-            <field name="view_mode">tree,form</field>
-<!--             <field name="view_mode">form</field> -->
-            <field name="view_id" ref="view_maintenance_logs_run_tree"/>
-            <field name="help" type="html">
-                <p class="oe_view_nocontent_create">
-                    设备运行日志
-                </p>
-            </field>
-        </record>
-
-
-        <menuitem name="设备运行日志" id="menu_maintenance_logs_run" parent="maintenance.menu_m_request"
-                  sequence="10" action="action_maintenance_logs_run"/>
-
-
         <!-- Action -->
 
         <record id="action_maintenance_logs" model="ir.actions.act_window">

sf_maintenance/views/maintenance_views.xml

@@ -1230,5 +1230,9 @@
             action="hr_equipment_action1"
             sequence="0"/>
 
+    <menuitem
+            id="maintenance.menu_maintenance_title"
+            web_icon="sf_maintenance,static/description/维护.png"/>
+
 
 </odoo>

sf_manufacturing/__manifest__.py

@@ -45,7 +45,6 @@
             'sf_manufacturing/static/src/scss/kanban_change.scss',
             'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
             'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
-            'sf_manufacturing/static/src/js/custom_barcode_handlers.js',
         ]
 
     },

sf_manufacturing/models/agv_scheduling.py

@@ -1,10 +1,10 @@
+
+import logging
 import requests
 
 from odoo import models, fields, api, _
 from odoo.exceptions import UserError
 
-import logging
-
 _logger = logging.getLogger(__name__)
 
 
@@ -54,7 +54,7 @@ class AgvScheduling(models.Model):
     def web_search_read(self, domain=None, fields=None, offset=0, limit=None, order=None, count_limit=None):
         domain = domain or []
         new_domain = []
-        for index, item in enumerate(domain):
+        for item in domain:
             if isinstance(item, list):
                 if item[0] == 'delivery_workpieces':
                     new_domain.append('&')
@@ -63,7 +63,7 @@ class AgvScheduling(models.Model):
                     continue
             new_domain.append(item)
 
-        return super(AgvScheduling, self).web_search_read(new_domain, fields, limit=limit, offset=offset)
+        return super(AgvScheduling, self).web_search_read(new_domain, fields, offset, limit, order, count_limit)
 
     @api.depends('task_completion_time', 'task_delivery_time')
     def _compute_task_duration(self):
@@ -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(
+            for agv_scheduling in agv_schedulings:
-                lambda r: r.start_site_id == agv_scheduling.start_site_id and r.start_site_id == agv_scheduling.start_site_id
+                # 找到所有起点接驳站匹配的路线
-            )
+                start_matched_task_routes = task_routes.filtered(
-            if task_route:
+                    lambda r: r.start_site_id == agv_scheduling.start_site_id
-                # 下发AGV调度任务并修改接驳站状态为占用
+                )
-                agv_scheduling.dispatch_scheduling(task_route)
+                # 如果调度任务有终点接驳站，找到终点接驳站匹配的路线
+                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

@@ -318,8 +318,10 @@ class MrpProduction(models.Model):
     # cnc程序获取
     def fetchCNC(self, production_names):
         cnc = self.env['mrp.production'].search([('id', '=', self.id)])
-        quick_order = self.env['quick.easy.order'].search(
+        quick_order = False
-            [('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])])
+        if cnc.product_id.default_code:
+            quick_order = self.env['quick.easy.order'].search(
+                [('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])])
         programme_way = False
         if cnc.manual_quotation is True:
             programme_way = 'manual operation'
@@ -804,6 +806,10 @@ class MrpProduction(models.Model):
         backorders = backorders - productions_to_backorder
 
         productions_not_to_backorder._post_inventory(cancel_backorder=True)
+        # if self.workorder_ids.filtered(lambda w: w.routing_type in ['表面工艺']):
+        #     move_finish = self.env['stock.move'].search([('created_production_id', '=', self.id)])
+        #     if move_finish:
+        #         move_finish._action_assign()
         productions_to_backorder._post_inventory(cancel_backorder=True)
 
         # if completed products make other confirmed/partially_available moves available, assign them
@@ -984,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(
+                                # self.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
-                                    production)
+                                #     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_workcenter.py

@@ -1,4 +1,5 @@
 import datetime
+import logging
 from datetime import timedelta, time
 from collections import defaultdict
 from odoo import fields, models, api
@@ -6,6 +7,8 @@ from odoo.addons.resource.models.resource import Intervals
 from odoo.exceptions import UserError, ValidationError
 import math
 
+_logger = logging.getLogger(__name__)
+
 
 class ResWorkcenter(models.Model):
     _name = "mrp.workcenter"
@@ -163,6 +166,19 @@ class ResWorkcenter(models.Model):
             else:
                 record.effective_working_hours_day = 0
 
+    # 计算传入时间日有效工作时长
+    def _compute_effective_working_hours_day1(self, date):
+        effective_working_hours_day = 0
+        for record in self:
+            attendance_ids = [p for p in record.resource_calendar_id.attendance_ids if
+                              p.dayofweek == self.get_current_day_of_week(date)]
+            if attendance_ids:
+                for attendance_id in attendance_ids:
+                    if attendance_id.hour_from and attendance_id.hour_to:
+                        effective_working_hours_day += attendance_id.hour_to - attendance_id.hour_from
+
+        return effective_working_hours_day
+
     # 获取传入时间是星期几
     def get_current_day_of_week(self, datetime):
         day_num = datetime.weekday()
@@ -211,7 +227,12 @@ class ResWorkcenter(models.Model):
                                                                  ('state', 'not in', ['draft', 'cancel'])])
         if plan_ids:
             sum_qty = sum([p.product_qty for p in plan_ids])
-            if sum_qty >= self.default_capacity:
+            date_planned_working_hours = self._compute_effective_working_hours_day1(date_planned)
+            default_capacity = round(
+                self.production_line_hour_capacity * date_planned_working_hours, 2)
+            _logger.info('排程日期:%s,计划数量:%s,日产能:%s,日工时:%s' % (
+            date_planned, sum_qty, default_capacity, date_planned_working_hours))
+            if sum_qty >= default_capacity:
                 return False
         return True
 

sf_manufacturing/models/mrp_workorder.py

@@ -1,5 +1,5 @@
 import re
-import json
+import json, tempfile
 import logging
 import base64
 import urllib.parse
@@ -144,6 +144,8 @@ class ResMrpWorkOrder(models.Model):
     # 是否绑定托盘
     is_trayed = fields.Boolean(string='是否绑定托盘', default=False)
 
+    tag_type = fields.Selection([("重新加工", "重新加工")], string="标签", tracking=True)
+
     @api.depends('name', 'production_id.name')
     def _compute_surface_technics_picking_ids(self):
         for workorder in self:
@@ -222,7 +224,7 @@ class ResMrpWorkOrder(models.Model):
     material_width = fields.Float(string='宽')
     material_height = fields.Float(string='高')
     # 零件图号
-    part_number = fields.Char(string='零件图号')
+    part_number = fields.Char(related='production_id.part_number', string='零件图号')
     # 工序状态
     process_state = fields.Selection([
         ('待装夹', '待装夹'),
@@ -414,12 +416,10 @@ class ResMrpWorkOrder(models.Model):
 
     # 获取三次元检测点数据
     def get_three_check_datas(self):
-        factory_nick_name = 'XT'
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']),
                             ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])
-        # ftp.connect()
 
         local_dir_path = '/ftp/before'
         os.makedirs(local_dir_path, exist_ok=True)
@@ -428,6 +428,18 @@ class ResMrpWorkOrder(models.Model):
         logging.info('local_file_path:%s' % local_file_path)
         remote_path = '/home/ftp/ftp_root/ThreeTest/XT/Before/' + local_filename
         logging.info('remote_path:%s' % remote_path)
+        is_get_detection_file = self.env['ir.config_parameter'].sudo().get_param('is_get_detection_file')
+        if not is_get_detection_file:
+            paload_data = {
+                "filename": local_filename
+            }
+            if not ftp_resconfig['get_check_file_path']:
+                raise UserError('请先配置获取检测报告地址')
+            url = ftp_resconfig['get_check_file_path'] + '/get/check/report'
+            response = requests.post(url, json=paload_data)
+            logging.info('response:%s' % response.json())
+            if response.json().get('detail'):
+                raise UserError(response.json().get('detail'))
 
         if not ftp.file_exists(remote_path):
             raise UserError(f"文件不存在: {remote_path}")
@@ -540,6 +552,7 @@ class ResMrpWorkOrder(models.Model):
             raise UserError('PT10点未测或数据错误')
 
         self.data_state = True
+        self.getcenter()
 
         return True
 
@@ -593,6 +606,8 @@ class ResMrpWorkOrder(models.Model):
             print("(%.2f,%.2f)" % (x, y))
             self.material_center_point = ("(%.2f,%.2f,%.2f)" % (x, y, z))
             self.X_deviation_angle = jdz
+            logging.info("坯料中心点坐标：(%.2f,%.2f)" % (x, y))
+            logging.info("X轴偏差度数:%.2f" % jdz)
             # 将补偿值写入CNC加工工单
             workorder = self.env['mrp.workorder'].browse(self.ids)
             work = workorder.production_id.workorder_ids
@@ -695,6 +710,7 @@ class ResMrpWorkOrder(models.Model):
             'date_planned_finished': datetime.now() + timedelta(days=1),
             'duration_expected': duration_expected,
             'duration': 0,
+            'tag_type': '重新加工' if item is False else False,
             'cnc_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cnc.processing']._json_cnc_processing(
                 k, item),
             'cmm_ids': False if route.routing_type != 'CNC加工' else self.env['sf.cmm.program']._json_cmm_program(k,
@@ -1015,16 +1031,20 @@ class ResMrpWorkOrder(models.Model):
                                     # 查询工序最小的非完工、非返工的装夹预调工单
                                     work_id = self.search(
                                         [('production_id', '=', workorder.production_id.id),
-                                         ('routing_type', '=', '装夹预调'),
                                          ('state', 'not in', ['rework', 'done', 'cancel'])],
                                         limit=1,
                                         order="sequence")
-                                    if workorder == work_id:
+                                    if work_id.routing_type == '装夹预调':
-                                        if workorder.production_id.reservation_state == 'assigned':
+                                        if workorder == work_id:
-                                            workorder.state = 'ready'
+                                            if workorder.production_id.reservation_state == 'assigned':
-                                        elif workorder.production_id.reservation_state != 'assigned':
+                                                workorder.state = 'ready'
-                                            workorder.state = 'waiting'
+                                            elif workorder.production_id.reservation_state != 'assigned':
-                                            continue
+                                                workorder.state = 'waiting'
+                                                continue
+                                        elif (workorder.name == '装夹预调' and
+                                              workorder.state not in ['rework', 'done', 'cancel']):
+                                            if workorder.state != 'pending':
+                                                workorder.state = 'pending'
                     if workorder.production_id.tool_state in ['1', '2'] and workorder.state == 'ready':
                         workorder.state = 'waiting'
                         continue
@@ -1062,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
@@ -1169,8 +1195,10 @@ class ResMrpWorkOrder(models.Model):
                 if not record.rfid_code and record.is_rework is False:
                     raise UserError("请扫RFID码进行绑定")
                 if record.is_rework is False:
-                    if not record.material_center_point and record.X_deviation_angle > 0:
+                    if not record.material_center_point:
-                        raise UserError("坯料中心点为空或X偏差角度小于等于0")
+                        raise UserError("坯料中心点为空，请检查")
+                    if record.X_deviation_angle <= 0:
+                        raise UserError("X偏差角度小于等于0，请检查！本次计算的X偏差角度为：%s" % record.X_deviation_angle)
                 record.process_state = '待加工'
                 # record.write({'process_state': '待加工'})
                 record.production_id.process_state = '待加工'
@@ -1328,6 +1356,7 @@ class ResMrpWorkOrder(models.Model):
                 arch = etree.fromstring(tree_view['arch'])
                 # 查找 tree 标签
                 tree_element = arch.xpath("//tree")[0]
+                tree_element.set('js_class', 'remove_focus_list_view')
 
                 # 查找或创建 header 标签
                 header_element = tree_element.find('header')
@@ -1498,7 +1527,8 @@ class CNCprocessing(models.Model):
     # 将FTP的多面的程序单文件下载到临时目录
     def download_file_tmp(self, production_no, processing_panel):
         remotepath = os.path.join('/home/ftp/ftp_root/NC', production_no, 'return', processing_panel)
-        serverdir = os.path.join('/tmp', production_no, 'return', processing_panel)
+        tmp_path = tempfile.gettempdir()
+        serverdir = os.path.join(tmp_path, production_no, 'return', processing_panel)
         ftp_resconfig = self.env['res.config.settings'].get_values()
         ftp = FtpController(str(ftp_resconfig['ftp_host']), int(ftp_resconfig['ftp_port']), ftp_resconfig['ftp_user'],
                             ftp_resconfig['ftp_password'])
@@ -1550,6 +1580,8 @@ class SfWorkOrderBarcodes(models.Model):
 
     def on_barcode_scanned(self, barcode):
         logging.info('Rfid:%s' % barcode)
+        if 'O-CMD' in barcode:
+            return None
         workorder = self.env['mrp.workorder'].browse(self.ids)
         # workorder_preset = self.env['mrp.workorder'].search(
         #     [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
@@ -1557,8 +1589,11 @@ class SfWorkOrderBarcodes(models.Model):
             [('routing_type', '=', '装夹预调'), ('rfid_code', '=', barcode)])
         if workorder_olds:
             name = ''
+            tem_list = []
             for workorder in workorder_olds:
-                name = '%s  %s' % (name, workorder.production_id.name)
+                tem_list.append(workorder.production_id.name)
+            for i in list(set(tem_list)):
+                name = '%s  %s' % (name, i)
             raise UserError('该托盘已绑定【%s】制造订单，请先解除绑定！！！' % name)
         if workorder:
             if workorder.routing_type == '装夹预调':
@@ -1793,6 +1828,11 @@ class WorkPieceDelivery(models.Model):
             else:
                 raise UserError("接驳站暂未反馈站点实时状态，请稍后再试")
             
+    def delivery_avg(self):
+        is_agv_task_dispatch = self.env['ir.config_parameter'].sudo().get_param('is_agv_task_dispatch')
+        if is_agv_task_dispatch:
+            self._delivery_avg()
+
     # 配送至avg小车
     def _delivery_avg(self):
         config = self.env['res.config.settings'].get_values()
@@ -1852,7 +1892,7 @@ class WorkPieceDelivery(models.Model):
                             logging.info('delivery_item-name:%s' % delivery_item.name)
                             delivery_item.write({
                                 'task_delivery_time': fields.Datetime.now(),
-                                'status': '待配送'
+                                'status': '已下发'
                             })
                             if delivery_item.type == "上产线":
                                 delivery_item.workorder_id.write({'is_delivery': True})

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,40 +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)]")
-
+    # cutting_tool_type_id = fields.Many2one(related='cutting_tool_model_id.cutting_tool_type_id', string='类型',
-    brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    #                                        domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
-
+    # brand_id = fields.Many2one('sf.machine.brand', '品牌')
-    tool_length = fields.Float('长度(mm)')
+    brand_id = fields.Many2one(related='cutting_tool_model_id.brand_id', string='品牌')
-    tool_width = fields.Float('宽度(mm)')
+    # 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_thickness = fields.Float('厚度(mm)')
-    tool_weight = fields.Float('重量(kg)')
+    tool_thickness = fields.Float(related='specification_id.thickness', string='厚度(mm)')
-    tool_hardness = fields.Integer('硬度(hrc)')
+    # specification_id.thickness
-    coating_material = fields.Char('涂层材质')
+    # 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_total_length = fields.Float('总长度(mm)', digits=(6, 1))
-    cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
+    cutting_tool_total_length = fields.Float(related='specification_id.total_length', string='总长度(mm)', digits=(6, 1))
-    cutting_tool_blade_length = fields.Float('刃部长度(mm)')
+    # specification_id.total_length
-    cutting_tool_blade_number = fields.Selection(
+    # cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
-        [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
+    cutting_tool_shank_length = fields.Float(related='specification_id.handle_length', string='柄部长度(mm)',
-        string='刃数(个)', default='0')
+                                             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_length = fields.Float('颈部长度(mm)', digits=(6, 1))
-    cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
+    cutting_tool_neck_length = fields.Float(related='specification_id.neck_length', string='颈部长度(mm)', digits=(6, 1))
-    cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
+    # specification_id.neck_length
-    cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
+    # cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
-    cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
+    cutting_tool_neck_diameter = fields.Float(related='specification_id.neck_diameter', string='颈部直径(mm)',
-    cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
+                                               digits=(6, 1))
-    cutting_tool_blade_type = fields.Char('刃部类型')
+    # specification_id.neck_diameter
-    cutting_tool_pitch = fields.Float('牙距(mm)')
+    # cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
-    cutting_tool_blade_width = fields.Float('刃部宽度(mm)')
+    cutting_tool_shank_diameter = fields.Float(related='specification_id.handle_diameter', string='柄部直径(mm)', digits=(6, 1))
-    cutting_tool_blade_depth = fields.Float('刃部深度(mm)')
+    # 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_cut_depth_max = fields.Float('最大切削深度(mm)')
-    cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
+    cutting_tool_cut_depth_max = fields.Float(related='specification_id.cut_depth_max', string='最大切削深度(mm)')
-    cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
+    # specification_id.cut_depth_max
-    cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
+    # cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
-    cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
+    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',
@@ -237,6 +300,7 @@ class ResProductMo(models.Model):
                 self.cutting_tool_blade_tip_taper = self.specification_id.blade_tip_taper
                 self.cutting_tool_blade_helix_angle = self.specification_id.blade_helix_angle
                 self.cutting_tool_blade_tip_working_size = self.specification_id.blade_tip_working_size
+                self.cutting_tool_blade_tip_r_size = self.specification_id.tip_r_size
                 self.cutting_tool_pitch = self.specification_id.pitch
                 self.cutting_tool_blade_width = self.specification_id.blade_width
                 self.cutting_tool_blade_depth = self.specification_id.blade_depth
@@ -427,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_rear_angle = fields.Integer('后角(°)')
-    cutting_tool_main_included_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_cut_blade_length = fields.Float('切削刃长(mm)')
-    cutting_tool_blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
+    cutting_tool_cut_blade_length = fields.Float(related='specification_id.cutting_blade_length',
-    cutting_tool_top_angle = fields.Integer('顶角(°)')
+                                        string='切削刃长(mm)')
-    cutting_tool_inscribed_circle_diameter = fields.Float('内接圆直径(mm)')
+    # specification_id.cutting_blade_length
-    cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
+    # cutting_tool_blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
-    cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
+    cutting_tool_blade_tip_circular_arc_radius = fields.Char(related='specification_id.blade_tip_circular_arc_radius',
-                                                        string='有无断屑槽')
+                                                    string='刀尖圆弧半径(mm)')
-    cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号')
+    # specification_id.blade_tip_circular_arc_radius
-    cutting_tool_bladed_teeth_model = fields.Selection(
+    # cutting_tool_top_angle = fields.Integer('顶角(°)')
-        [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
+    cutting_tool_top_angle = fields.Integer(related='specification_id.top_angle',
-         ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
+                                                      string='顶角(°)')
-         ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
+    # specification_id.top_angle
-         ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
+    # cutting_tool_inscribed_circle_diameter = fields.Float('内接圆直径(mm)')
-         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无')
+    cutting_tool_inscribed_circle_diameter = fields.Float(related='specification_id.inscribed_circle_diameter',
-    cutting_tool_blade_blade_number = fields.Selection(
+                                                             string='内接圆直径(mm)')
-        [('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'),
+    # specification_id.inscribed_circle_diameter
-         ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
+    # cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
-        string='刀片的刃数(个)')
+    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([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
+    # cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
-                                                 string='螺纹类型')
+    #                                              string='螺纹类型')
-    cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
+    cutting_tool_thread_model = fields.Selection(related='specification_id.thread_model',
-    cutting_tool_blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
+                                                          string='螺纹类型')
-    cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
+    # specification_id.thread_model
-    cutting_tool_thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
+    # cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
-
+    cutting_tool_thread_num = fields.Float(related='specification_id.thread_num',
-    cutting_tool_jump_accuracy = fields.Char('径跳精度(mm)')
+                                                 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',
@@ -483,55 +600,153 @@ class ResProductMo(models.Model):
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
     # 刀杆/参数
-    cutting_tool_knife_head_height = fields.Float('刀头高度(mm)')
+    # cutting_tool_knife_head_height = fields.Float('刀头高度(mm)')
-    cutting_tool_knife_head_width = fields.Float('刀头宽度(mm)')
+    cutting_tool_knife_head_height = fields.Float(related='specification_id.knife_head_height',
-    cutting_tool_knife_head_length = fields.Float('刀头长度(mm)')
+                                               string='刀头高度(mm)')
-    cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
+    # specification_id.knife_head_height
-    cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)')
+    # cutting_tool_knife_head_width = fields.Float('刀头宽度(mm)')
-    cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
+    cutting_tool_knife_head_width = fields.Float(related='specification_id.knife_head_width',
-    cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)')
+                                                  string='刀头宽度(mm)')
-    cutting_tool_installing_structure = fields.Char('安装结构', size=20)
+    # 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_blade_id = fields.Many2one(related='specification_id.blade_id',
-    cutting_tool_cotter_pin = fields.Char('适配销钉型号', size=50)
+    #                                         domain="[('cutting_tool_type', '=', '刀片')]",
-    cutting_tool_pressing_plate = fields.Char('适配压板型号', size=50)
+    #                                  string='适用刀片型号')
-    cutting_tool_screw = fields.Char('适配螺钉型号', size=50)
+    # specification_id.blade_id
-    cutting_tool_wrench = fields.Char('适配扳手型号')
+    # cutting_tool_tool_shim = fields.Char('适配刀垫型号', size=50)
-    cutting_tool_is_cooling_hole = fields.Boolean('有无冷却孔', default=False)
+    cutting_tool_tool_shim = fields.Char(related='specification_id.tool_shim',
-    cutting_tool_locating_slot_code = fields.Char('定位槽代号', size=20)
+                                     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_cutter_head_diameter = fields.Float('刀盘直径(mm)')
-    cutting_tool_interface_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_max = fields.Float('最大夹持直径')
-    cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
+    cutting_tool_clamping_diameter_max = fields.Float(related='specification_id.max_clamping_diameter',
-    cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
+                                                      string='最大夹持直径')
-    cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
+    # specification_id.max_clamping_diameter
-    cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False)
+    # cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
-    cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
+    cutting_tool_clamping_diameter_min = fields.Float(related='specification_id.min_clamping_diameter',
-    cutting_tool_change_time = fields.Integer('换刀时间(s)')
+                                               string='最小夹持直径')
-    cutting_tool_clamping_way = fields.Char('夹持方式')
+    # specification_id.min_clamping_diameter
-    cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸')
+    # cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
-    cutting_tool_taper_shank_model = fields.Char('锥柄型号')
+    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_taper = fields.Integer('锥度(°)')
-    cutting_tool_top_diameter = fields.Float('顶部直径')
+    cutting_tool_taper = fields.Integer(related='specification_id.taper',
-    cutting_tool_outer_diameter = fields.Float('外径(mm)')
+                                               string='锥度(°)')
-    cutting_tool_inner_diameter = fields.Float('内径(mm)')
+    # specification_id.taper
-    cooling_suit_type_ids = fields.Char('适用冷却套型号')
+    # cutting_tool_top_diameter = fields.Float('顶部直径')
-    cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
+    cutting_tool_top_diameter = fields.Float(related='specification_id.top_diameter',
-    cutting_tool_er_size_model = fields.Char('尺寸型号')
+                                        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',
@@ -546,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/models/res_config_setting.py

@@ -4,19 +4,39 @@ from odoo import models, fields, api
 class ResConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
+    agv_rcs_url = fields.Char(string='avg_rcs访问地址',
+                              default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
+    wbcode = fields.Char('地码')
+    agv_code = fields.Char(string='agv编号')
+    task_type_no = fields.Char('任务单类型编号')
+
     is_agv_task_dispatch = fields.Boolean('是否下发AGV任务', default=False)
+    # 是否重新获取检测文件
+    is_get_detection_file = fields.Boolean(string='重新获取检测文件', default=False)
 
     @api.model
     def get_values(self):
         values = super(ResConfigSettings, self).get_values()
         config = self.env['ir.config_parameter'].sudo()
+        agv_rcs_url = config.get_param('agv_rcs_url', default='')
+        wbcode = config.get_param('wbcode', default='')
+        agv_code = config.get_param('agv_code', default='')
         is_agv_task_dispatch = config.get_param('is_agv_task_dispatch')
+        is_get_detection_file = config.get_param('is_get_detection_file')
         values.update(
+            agv_rcs_url=agv_rcs_url,
+            wbcode=wbcode,
+            agv_code=agv_code,
             is_agv_task_dispatch=is_agv_task_dispatch,
+            is_get_detection_file=is_get_detection_file
         )
         return values
 
     def set_values(self):
         super(ResConfigSettings, self).set_values()
         config = self.env['ir.config_parameter'].sudo()
+        config.set_param("agv_rcs_url", self.agv_rcs_url or "")
+        config.set_param("wbcode", self.wbcode or "")
+        config.set_param("agv_code", self.agv_code or "")
         config.set_param("is_agv_task_dispatch", self.is_agv_task_dispatch or False)
+        config.set_param("is_get_detection_file", self.is_get_detection_file or False)

sf_manufacturing/models/stock.py

@@ -267,6 +267,11 @@ class StockRule(models.Model):
                     workorder_duration += workorder.duration_expected
 
                 sale_order = self.env['sale.order'].sudo().search([('name', '=', production.origin)])
+                # 根据销售订单号查询快速订单
+                quick_easy_order = self.env['quick.easy.order'].sudo().search([('sale_order_id', '=', sale_order.id)])
+                if quick_easy_order:
+                    production.write({'part_number': quick_easy_order.part_drawing_number,
+                                      'part_drawing': quick_easy_order.machining_drawings})
                 if sale_order:
                     # sale_order.write({'schedule_status': 'to schedule'})
                     self.env['sf.production.plan'].sudo().with_company(company_id).create({
@@ -288,6 +293,7 @@ class StockRule(models.Model):
                 # 为同一个product_id创建一个生产订单名称列表
                 product_id_to_production_names[product_id] = [production.name for production in all_production]
             for production_item in productions:
+
                 production_programming = self.env['mrp.production'].search(
                     [('product_id.id', '=', production_item.product_id.id),
                      ('origin', '=', production_item.origin)],

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_workcenter_views.xml

@@ -43,7 +43,7 @@
                 <label for="default_capacity"/>
                 <div class="o_row">
                     <field name="default_capacity" string="产线日产能"/>
-                    台
+                    件
                 </div>
             </xpath>
             <xpath expr="//field[@name='default_capacity'][last()]" position="before">

sf_manufacturing/views/mrp_workorder_view.xml

@@ -32,6 +32,8 @@
             </field>
             <xpath expr="//field[@name='qty_remaining']" position="after">
                 <field name="manual_quotation" optional="show"/>
+                <field name='tag_type' widget="badge"
+                       decoration-danger="tag_type == '重新加工'"/>
             </xpath>
             <xpath expr="//field[@name='date_planned_start']" position="replace">
                 <field name="date_planned_start" string="计划开始日期" optional="show"/>
@@ -43,11 +45,11 @@
                 <field name="date_planned_finished" string="计划结束日期" optional="hide"/>
             </xpath>
             <xpath expr="//button[@name='button_start']" position="attributes">
-<!--                <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',-->
+                <!--                <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',-->
-<!--                    'done',-->
+                <!--                    'done',-->
-<!--                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),-->
+                <!--                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),-->
-<!--                    ('is_user_working', '!=', False),("user_permissions","=",False),("name","=","CNC加工")]}-->
+                <!--                    ('is_user_working', '!=', False),("user_permissions","=",False),("name","=","CNC加工")]}-->
-<!--                </attribute>-->
+                <!--                </attribute>-->
                 <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',
                     'done',
                     'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
@@ -165,8 +167,8 @@
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'not in', ('pending_processing', 'pending_cam', 'pending_era_cam')), ('state','!=','progress'), ('routing_type', 'not in', ('装夹预调', 'CNC加工', '解除装夹'))]}" -->
                 <!--                         groups="sf_base.group_sf_mrp_user" confirm="是否确认完工"/> -->
 
-<!--                <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"-->
+                <!--                <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"-->
-<!--                        attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>-->
+                <!--                        attrs="{'invisible': ['|', '|', '|', ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>-->
                 <button name="button_start" type="object" string="开始" class="btn-success" confirm="是否确认开始"
                         attrs="{'invisible': ['|', '|', '|', '|', '|', ('routing_type', '=', '装夹预调'), ('routing_type', '=', '解除装夹'), ('production_state','in', ('draft', 'done', 'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel','to be detected')), ('is_user_working', '!=', False)]}"/>
                 <button name="button_start" type="object" string="开始" class="btn-success"
@@ -191,8 +193,8 @@
                 <!--                         context="{'default_workcenter_id': workcenter_id}" class="btn-danger" -->
                 <!--                         groups="sf_base.group_sf_mrp_user" -->
                 <!--                         attrs="{'invisible': ['|', '|', ('production_state', 'in', ('draft', 'done', 'cancel')), ('working_state', '!=', 'blocked'),('state','=','done')]}"/> -->
-<!--                <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"-->
+                <!--                <button name="button_workpiece_delivery" type="object" string="工件配送" class="btn-primary"-->
-<!--                        attrs="{'invisible': ['|','|','|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done'),('is_rework','=',True),'&amp;',('rfid_code','in',['',False]),('state','=','done')]}"/>-->
+                <!--                        attrs="{'invisible': ['|','|','|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done'),('is_rework','=',True),'&amp;',('rfid_code','in',['',False]),('state','=','done')]}"/>-->
                 <button name="button_rework_pre" type="object" string="返工"
                         class="btn-primary"
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('state','!=','progress'),('is_rework','=',True)]}"/>
@@ -221,9 +223,12 @@
             <xpath expr="//label[1]" position="before">
                 <field name='routing_type' readonly="1"/>
                 <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
+                <field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}'
+                       decoration-danger="tag_type == '重新加工'"/>
                 <field name="rfid_code" force_save="1" readonly="1" cache="True"
                        attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
+
             </xpath>
             <xpath expr="//label[1]" position="attributes">
                 <attribute name="string">计划加工时间</attribute>
@@ -479,10 +484,10 @@
 
                     <div class="col-12 col-lg-6 o_setting_box">
                         <field name="data_state" invisible="1"/>
-                        <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据"
+                        <!--                         <button type="object" class="oe_highlight" name="get_three_check_datas" string="获取数据" -->
-                                attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/>
+                        <!--                                 attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/> -->
-                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位"
+                        <!--                         <button type="object" class="oe_highlight" name="getcenter" string="计算定位" -->
-                                attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/>
+                        <!--                                 attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/> -->
                     </div>
 
                     <group>
@@ -513,6 +518,11 @@
 
             </xpath>
 
+            <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","!=","装夹预调")]}'/>
+            </xpath>
+
 
             <xpath expr="//page[1]" position="before">
                 <field name="results" invisible="1"/>
@@ -661,7 +671,8 @@
         <field name="arch" type="xml">
             <tree string="工件配送" class="center" create="0" delete="0" js_class="remove_focus_list_view">
                 <header>
-                    <button name="button_delivery" type="object" string="工件配送" class="btn-primary jikimo_button_confirm" attrs="{'force_show':1}"/>
+                    <button name="button_delivery" type="object" string="工件配送"
+                            class="btn-primary jikimo_button_confirm" attrs="{'force_show':1}"/>
                 </header>
                 <field name="status" widget="badge"
                        decoration-success="status == '已配送'"
@@ -673,15 +684,15 @@
                 <field name="production_id"/>
                 <field name="type" readonly="1"/>
                 <field name="production_line_id" options="{'no_create': True}" readonly="1"/>
-<!--                <field name="route_id" options="{'no_create': True}"-->
+                <!--                <field name="route_id" options="{'no_create': True}"-->
-<!--                       domain="[('route_type','in',['上产线','下产线'])]"/>-->
+                <!--                       domain="[('route_type','in',['上产线','下产线'])]"/>-->
                 <field name="feeder_station_start_id" readonly="1" force_save="1"/>
-<!--                <field name="feeder_station_destination_id" readonly="1" force_save="1"/>-->
+                <!--                <field name="feeder_station_destination_id" readonly="1" force_save="1"/>-->
                 <field name="is_cnc_program_down" readonly="1"/>
                 <!--                <field name="rfid_code"/>-->
-<!--                <field name="task_delivery_time" readonly="1"/>-->
+                <!--                <field name="task_delivery_time" readonly="1"/>-->
-<!--                <field name="task_completion_time" readonly="1"/>-->
+                <!--                <field name="task_completion_time" readonly="1"/>-->
-<!--                <field name="delivery_duration" widget="float_time"/>-->
+                <!--                <field name="delivery_duration" widget="float_time"/>-->
             </tree>
         </field>
     </record>
@@ -786,7 +797,7 @@
                 <field name="feeder_station_start_id" readonly="1" force_save="1"/>
                 <!--                <field name="type" readonly="1"/>-->
                 <field name="feeder_station_destination_id" readonly="1" force_save="1"/>
-                <button name="button_delivery" type="object" string="配送" class="oe_highlight"/>
+                <button name="delivery_avg" type="object" string="配送" class="oe_highlight"/>
                 <button name="action_delivery_history" type="object" class="btn btn-link text-info" icon="fa-history"
                         string="历史"/>
             </tree>
@@ -848,10 +859,10 @@
         <field name="domain">[('type','in',['运送空料架']),('name','not ilike','WDO')]</field>
     </record>
 
-     <menuitem id="mrp.menu_mrp_manufacturing"
+    <menuitem id="mrp.menu_mrp_manufacturing"
-            name="Operations"
+              name="Operations"
-            sequence="10"
+              sequence="10"
-            parent="mrp.menu_mrp_root"
+              parent="mrp.menu_mrp_root"
-            groups="sf_base.group_sf_order_user,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user"/>
+              groups="sf_base.group_sf_order_user,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user"/>
 </odoo>
 

sf_manufacturing/views/res_config_settings_views.xml

@@ -6,6 +6,32 @@
             <field name="model">res.config.settings</field>
             <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
             <field name="arch" type="xml">
+                <xpath expr="//div[hasclass('app_settings_block')]/div" position="before">
+                    <div>
+                        <h2>AGV参数配置</h2>
+                        <div class="row mt16 o_settings_container" id="agv_config">
+                            <div class="col-12 col-lg-6 o_setting_box">
+                                <div class="o_setting_left_pane"/>
+                                <div class="o_setting_right_pane">
+                                    <div class="text-muted">
+                                        <label for="agv_rcs_url" string="访问地址"/>
+                                        <field name="agv_rcs_url"/>
+                                    </div>
+                                    <div class="text-muted">
+                                        <label for="agv_code" string="车辆编号"/>
+                                        <field name="agv_code"/>
+                                    </div>
+                                    <div class="text-muted">
+                                        <label for="wbcode"/>
+                                        <field name="wbcode"/>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </xpath>
+
+
                 <xpath expr="//div[@id='agv_config']/div" position="after">
                         <div class="col-12 col-lg-6 o_setting_box">
                             <div class="o_setting_left_pane">

sf_manufacturing/wizard/workpiece_delivery_views.xml

@@ -14,7 +14,7 @@
                     <group col="1">
                         <field name="production_ids" readonly="1" widget="many2many_tags" string="制造订单号"/>
                         <field name="delivery_type" readonly="1"/>
-                        <field name="feeder_station_start_id" options="{'no_create': True}" required="1"/>
+                        <field name="feeder_station_start_id" string="当前接驳站" options="{'no_create': True}" required="1"/>
                         <field name="workcenter_id" options="{'no_create': True}"/>
                     </group>
                     <footer>

sf_manufacturing/wizard/workpiece_delivery_wizard.py

@@ -179,18 +179,15 @@ class WorkpieceDeliveryWizard(models.TransientModel):
             self.feeder_station_destination_id = self.route_id.end_site_id.id
 
     def on_barcode_scanned(self, barcode):
+        delivery_type = self.env.context.get('default_delivery_type')
         # 判断barcode是否是数字
         if not barcode.isdigit():
             # 判断是否是AGV接驳站名称
             agv_site = self.env['sf.agv.site'].search([('name', '=', barcode)])
             if agv_site:
-                if not self.feeder_station_start_id:
+                self.feeder_station_start_id = agv_site.id   # 修正：移除 .id
-                    self.feeder_station_start_id = agv_site.id
-                else:
-                    if self.feeder_station_start_id.id != agv_site.id:
-                        raise UserError('起点接驳站不匹配！')
             return
-        delivery_type = self.env.context.get('default_delivery_type')
+        
         if delivery_type == '上产线':
             workorder = self.env['mrp.workorder'].search(
                 [('production_line_state', '=', '待上产线'), ('rfid_code', '=', barcode),
@@ -210,11 +207,14 @@ class WorkpieceDeliveryWizard(models.TransientModel):
                     workorder.production_line_id.id != self.production_ids[0].production_line_id.id):
                 raise UserError(f'该rfid对应的制造订单号为{workorder.production_id.name}的目的生产线不一致')
 
+            # 调用打印成品条码方法
+            workorder.print_method()
+
             # 将对象添加到对应的同模型且是多对多类型里
             self.production_ids |= workorder.production_id
             self.workorder_ids |= workorder
 
-            down_product_agv_scheduling = self.get_down_product_agv_scheduling()
+            down_product_agv_scheduling = workorder.get_down_product_agv_scheduling()
             if down_product_agv_scheduling:
                 if not self.feeder_station_start_id:
                     self.feeder_station_start_id = down_product_agv_scheduling.end_site_id.id
@@ -226,4 +226,11 @@ class WorkpieceDeliveryWizard(models.TransientModel):
             raise UserError('该rfid码对应的工单不存在')
         return
 
+    @api.onchange('feeder_station_start_id')
+    def on_start_id_change(self):
+        if self.delivery_type == '运送空料架' and len(self.workorder_ids) > 0:
+            down_product_agv_scheduling = self.workorder_ids[0].get_down_product_agv_scheduling()
+            if down_product_agv_scheduling and self.feeder_station_start_id \
+                and down_product_agv_scheduling.end_site_id.id != self.feeder_station_start_id.id:
+                raise UserError('当前接驳站不匹配！')
 

sf_message/__init__.py

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

sf_message/__manifest__.py

@@ -0,0 +1,27 @@
+# -*- 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': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock'],
+    'data': [
+        'data/bussiness_node.xml',
+        # 'data/cron_data.xml',
+        'data/template_data.xml',
+
+    ],
+    'test': [
+    ],
+    'license': 'LGPL-3',
+    'installable': True,
+    'auto_install': False,
+    'application': False,
+}

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

@@ -0,0 +1,89 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data noupdate="1">
+        <!--销售订单-->
+        <record id="bussiness_pending_order" model="jikimo.message.bussiness.node">
+            <field name="name">待接单</field>
+            <field name="model">sale.order</field>
+        </record>
+
+        <record id="bussiness_to_be_confirm" model="jikimo.message.bussiness.node">
+            <field name="name">确认接单</field>
+            <field name="model">sale.order</field>
+        </record>
+
+<!--        <record id="bussiness_sale_order_overdue_warning" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">销售订单逾期预警</field>-->
+<!--            <field name="model">sale.order</field>-->
+<!--        </record>-->
+
+<!--        <record id="bussiness_sale_order_overdue" model="jikimo.message.bussiness.node">-->
+<!--            <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>
+<!--         <record id="bussiness_mrp_workorder_pre_overdue_warning" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">装夹预调工单逾期预警</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+<!--        <record id="bussiness_mrp_workorder_pre_overdue" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">装夹预调工单已逾期</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+
+<!--         <record id="bussiness_mrp_workorder_cnc_overdue_warning" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">CNC工单逾期预警</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+<!--        <record id="bussiness_mrp_workorder_cnc_overdue" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">CNC工单已逾期</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+
+<!--        <record id="bussiness_mrp_workorder_unclamp_overdue_warning" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">解除装夹工单逾期预警</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+
+<!--        <record id="bussiness_mrp_workorder_unclamp_overdue" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">解除装夹工单已逾期</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+
+<!--         <record id="bussiness_mrp_workorder_surface_overdue_warning" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">表面工艺工单逾期预警</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+
+<!--        <record id="bussiness_mrp_workorder_surface_overdue" model="jikimo.message.bussiness.node">-->
+<!--            <field name="name">表面工艺工单已逾期</field>-->
+<!--            <field name="model">mrp.workorder</field>-->
+<!--        </record>-->
+    </data>
+</odoo>

sf_message/data/cron_data.xml

@@ -0,0 +1,160 @@
+<odoo>
+    <data noupdate="1">
+        <record model="ir.cron" id="ir_cron_sale_order_overdue_warning">
+            <field name="name">销售订单逾期预警</field>
+            <field name="model_id" ref="model_sale_order"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_warning_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+
+         <record model="ir.cron" id="ir_cron_sale_order_overdue">
+            <field name="name">销售订单已逾期</field>
+            <field name="model_id" ref="model_sale_order"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+
+        <record model="ir.cron" id="ir_cron_mrp_workorder_overdue_warning">
+            <field name="name">装夹预调工单逾期预警</field>
+            <field name="model_id" ref="model_mrp_workorder"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_warning_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+
+         <record model="ir.cron" id="ir_cron_mrp_workorder_overdue">
+            <field name="name">工单已逾期</field>
+            <field name="model_id" ref="model_mrp_workorder"/>
+            <field name="state">code</field>
+            <field name="code">model._overdue_func()</field>
+            <field name="interval_number">1</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="doall" eval="False"/>
+            <field name="user_id" ref="base.user_root"/>
+            <field name="active" eval="True"/>
+        </record>
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+<!--        -->
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+<!--        -->
+<!--          <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue_warning">-->
+<!--            <field name="name">工单逾期预警</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_warning_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+
+<!--         <record model="ir.cron" id="ir_cron_mrp_workorder_pre_overdue">-->
+<!--            <field name="name">工单已逾期</field>-->
+<!--            <field name="model_id" ref="model_mrp_workorder"/>-->
+<!--            <field name="state">code</field>-->
+<!--            <field name="code">model._overdue_func()</field>-->
+<!--            <field name="interval_number">1</field>-->
+<!--            <field name="interval_type">minutes</field>-->
+<!--            <field name="numbercall">-1</field>-->
+<!--            <field name="doall" eval="False"/>-->
+<!--            <field name="user_id" ref="base.user_root"/>-->
+<!--            <field name="active" eval="True"/>-->
+<!--        </record>-->
+    </data>
+</odoo>

sf_message/data/template_data.xml

@@ -0,0 +1,110 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data noupdate="1">
+
+                <record id="template_pending_order" model="jikimo.message.template">
+            <field name="name">待接单</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="model">sale.order</field>
+            <field name="bussiness_node_id" ref="bussiness_pending_order"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 待接单提醒：
+单号：销售订单[{{name}}]({{url}})
+事项：请确认是否接单。
+            </field>
+        </record>
+
+        <record id="template_to_be_confirm" model="jikimo.message.template">
+            <field name="name">确认接单</field>
+            <field name="model_id" ref="sale.model_sale_order"/>
+            <field name="model">sale.order</field>
+            <field name="bussiness_node_id" ref="bussiness_to_be_confirm"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">normal</field>
+            <field name="content">### 待排程提醒：
+单号：产品[{{product_id}}]({{url}})
+事项：{{mrp_production_count}}个制造订单待计划排程
+            </field>
+        </record>
+        <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

@@ -0,0 +1,9 @@
+from . import sf_message_template
+from . import sf_message_sale
+from . import sf_message_plan
+from . import sf_message_stock_picking
+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_cam_program.py

@@ -0,0 +1,6 @@
+from odoo import models, fields, api, _
+
+
+class SFMessageCamProgram(models.Model):
+    _name = 'sf.cam.work.order.program.knife.plan'
+    _inherit = ['sf.cam.work.order.program.knife.plan',  'jikimo.message.dispatch']

sf_message/models/sf_message_functional_tool_assembly.py

@@ -0,0 +1,15 @@
+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_plan.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api, _
+
+
+class SFMessagePlan(models.Model):
+    _name = 'sf.production.plan'
+    _inherit = ['sf.production.plan',  'jikimo.message.dispatch']
+
+    # def create(self, vals_list):
+    #     res = super(SFMessagePlan, self).create(vals_list)
+    #     if res:
+    #         try:
+    #             res.add_queue('待排程')
+    #         except Exception as e:
+    #             logging.info('add_queue error:%s' % e)
+    #     return res
+    #
+    # def _get_message(self):
+    #     res = super(SFMessagePlan, self)._get_message()
+    #     if res:
+    #         try:
+    #             res.add_queue('待排程')
+    #         except Exception as e:
+    #             logging.info('_get_message error:%s' % e)
+    #     return res

sf_message/models/sf_message_purchase.py

@@ -0,0 +1,33 @@
+from odoo import models, fields, api, _
+from urllib.parse import urlencode
+
+
+class SFMessagePurchase(models.Model):
+    _name = 'purchase.order'
+    _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):
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        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 = url + "/web#" + query_string
+        return full_url

sf_message/models/sf_message_sale.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+import logging
+from odoo import models, fields, api, _
+
+
+class SFMessageSale(models.Model):
+    _name = 'sale.order'
+    _inherit = ['sale.order', 'jikimo.message.dispatch']
+
+    def create(self, vals_list):
+        res = super(SFMessageSale, self).create(vals_list)
+        if res:
+            try:
+                res.add_queue('待接单')
+            except Exception as e:
+                logging.info('add_queue error:%s' % e)
+        return res
+
+    # 确认接单
+    def action_confirm(self):
+        res = super(SFMessageSale, self).action_confirm()
+        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
+
+    # 继承并重写jikimo.message.dispatch的_get_message()
+    def _get_message(self, message_queue_ids):
+        contents = []
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        for item in message_queue_ids:
+            # 待接单的处理
+            if item.message_template_id.bussiness_node_id.name == '待接单':
+                content = super(SFMessageSale, self)._get_message(item)
+                action_id = self.env.ref('sale.action_quotations_with_onboarding').id
+                url = f"{url}/web#id={item.res_id}&view_type=form&action={action_id}"
+                content = content[0].replace('{{url}}', url)
+                contents.append(content)
+            # 确认接单的处理
+            elif item.message_template_id.bussiness_node_id.name == '确认接单':
+                content = super(SFMessageSale, self)._get_message(item)
+                sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(item.res_id))])
+                product = sale_order_line[0].product_id.name if len(sale_order_line) == 1 else '%s...' % \
+                                                                                               sale_order_line[
+                                                                                                   0].product_id.name
+                action_id = self.env.ref('sf_plan.sf_production_plan_action1').id
+                url = f"{url}/web#view_type=list&action={action_id}"
+                content = content[0].replace('{{product_id}}', product).replace('{{url}}', url)
+                contents.append(content)
+        return contents
+
+        # # 销售订单逾期预警
+    # def _overdue_warning_func(self):
+    #     sale_order_
+    #     return 1
+    #
+    # # 销售订单已逾期
+    # def _overdue_func(self):
+    #     return 1

sf_message/models/sf_message_stock_picking.py

@@ -0,0 +1,65 @@
+import re
+from odoo import models, fields, api, _
+from urllib.parse import urlencode
+
+
+class SFMessageStockPicking(models.Model):
+    _name = 'stock.picking'
+    _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):
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        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 = url + "/web#" + query_string
+        return full_url

sf_message/models/sf_message_template.py

@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from odoo import models, fields, api
+from abc import ABC, abstractmethod
+
+
+class SfMessageTemplate(models.Model):
+    _inherit = "jikimo.message.template"
+
+    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

@@ -0,0 +1,54 @@
+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']
+
+    @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):
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        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 = url + "/web#" + query_string
+        return full_url
+

sf_message/security/group_security.xml

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

sf_message/security/ir.model.access.csv

@@ -0,0 +1,29 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+
+access_jikimo_message_template_group_sale_salemanager,jikimo_message_template,model_jikimo_message_template,sf_base.group_sale_salemanager,1,1,1,0
+access_jikimo_message_template_group_purchase,jikimo_message_template,model_jikimo_message_template,sf_base.group_purchase,1,1,1,0
+access_jikimo_message_template_group_sf_stock_user,jikimo_message_template,model_jikimo_message_template,sf_base.group_sf_stock_user,1,1,1,0
+access_jikimo_message_template_group_sf_order_user,jikimo_message_template,model_jikimo_message_template,sf_base.group_sf_order_user,1,1,1,0
+access_jikimo_message_template_group_sf_tool_user,jikimo_message_template,model_jikimo_message_template,sf_base.group_sf_tool_user,1,1,1,0
+
+access_jikimo_message_bussiness_node_group_sale_salemanager,jikimo_message_bussiness_node,model_jikimo_message_bussiness_node,sf_base.group_sale_salemanager,1,1,1,0
+access_jikimo_message_bussiness_node_group_purchase,jikimo_message_bussiness_node,model_jikimo_message_bussiness_node,sf_base.group_purchase,1,1,1,0
+access_jikimo_message_bussiness_node_group_sf_stock_user,jikimo_message_bussiness_node,model_jikimo_message_bussiness_node,sf_base.group_sf_stock_user,1,1,1,0
+access_jikimo_message_bussiness_node_group_sf_order_user,jikimo_message_bussiness_node,model_jikimo_message_bussiness_node,sf_base.group_sf_order_user,1,1,1,0
+access_jikimo_message_bussiness_node_group_sf_tool_user,jikimo_message_bussiness_node,model_jikimo_message_bussiness_node,sf_base.group_sf_tool_user,1,1,1,0
+
+access_jikimo_message_queue_group_sale_salemanager,jikimo_message_queue,model_jikimo_message_queue,sf_base.group_sale_salemanager,1,1,1,0
+access_jikimo_message_queue_group_purchase,jikimo_message_queue,model_jikimo_message_queue,sf_base.group_purchase,1,1,1,0
+access_jikimo_message_queue_group_sf_stock_user,jikimo_message_queue,model_jikimo_message_queue,sf_base.group_sf_stock_user,1,1,1,0
+access_jikimo_message_queue_group_sf_order_user,jikimo_message_queue,model_jikimo_message_queue,sf_base.group_sf_order_user,1,1,1,0
+access_jikimo_message_queue_group_sf_tool_user,jikimo_message_queue,model_jikimo_message_queue,sf_base.group_sf_tool_user,1,1,1,0
+
+
+
+
+
+
+
+
+
+

sf_message/views/sf_message_template_view.xml

@@ -0,0 +1,76 @@
+<?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_mrs_connect/__manifest__.py

@@ -10,11 +10,12 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.cs.jikimo.com',
-    'depends': ['sf_base', 'base_setup'],
+    'depends': ['sf_base', 'base_setup','sf_bf_connect'],
     'data': [
         'data/ir_cron_data.xml',
         'security/ir.model.access.csv',
-        'views/res_config_settings_views.xml'
+        'views/res_config_settings_views.xml',
+        'views/order_price.xml',
     ],
     'demo': [
     ],

sf_mrs_connect/controllers/controllers.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 import logging
 import os
+import tempfile
 import json
 import base64
 from odoo import http
@@ -23,6 +24,7 @@ class Sf_Mrs_Connect(http.Controller):
             datas = request.httprequest.data
             ret = json.loads(datas)
             ret = json.loads(ret['result'])
+            tmp_path = tempfile.gettempdir()
             logging.info('下发编程单:%s' % ret)
             domain = [('programming_no', '=', ret['programming_no'])]
             if ret['manufacturing_type'] == 'scrap':
@@ -32,7 +34,7 @@ class Sf_Mrs_Connect(http.Controller):
             if productions:
                 # 拉取所有加工面的程序文件
                 for r in ret['processing_panel'].split(','):
-                    program_path_tmp_r = os.path.join('/tmp', ret['folder_name'], 'return', r)
+                    program_path_tmp_r = os.path.join(tmp_path, ret['folder_name'], 'return', r)
                     if os.path.exists(program_path_tmp_r):
                         files_r = os.listdir(program_path_tmp_r)
                         if files_r:
@@ -62,8 +64,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(
+                                    # request.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
-                                        production)
+                                    #     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)})
@@ -75,7 +77,7 @@ class Sf_Mrs_Connect(http.Controller):
                     if cnc_workorder:
                         # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
                         #                                       panel)
-                        program_path_tmp_panel = os.path.join('/tmp', ret['folder_name'], 'return', panel)
+                        program_path_tmp_panel = os.path.join(tmp_path, ret['folder_name'], 'return', panel)
                         logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
                         files_panel = os.listdir(program_path_tmp_panel)
                         if files_panel:
@@ -93,6 +95,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/__init__.py

@@ -1,3 +1,4 @@
 from . import ftp_operate
 from . import res_config_setting
 from . import sync_common
+from . import order_price

sf_mrs_connect/models/order_price.py

@@ -0,0 +1,29 @@
+from odoo import fields, models, api
+
+
+class OrderPrice(models.Model):
+    _name = 'order.price'
+    _description = '订单价格对比'
+    sale_order_id = fields.Many2one('sale.order', '销售订单')
+    bfm_order_name = fields.Char(related="sale_order_id.default_code", string='bfm订单号')
+    sale_order_name = fields.Char(related="sale_order_id.name", string='销售订单号')
+    currency_id = fields.Many2one(
+        related='sale_order_id.currency_id', string='货币', store=True)
+    sale_order_amount_total = fields.Monetary(related="sale_order_id.amount_total", tracking=4, string='销售订单金额')
+    bfm_amount_total = fields.Float(string='价格合计', compute='_compute_bfm_amount_total', store=True)
+
+    def is_float(self,value):
+        try:
+            float(value)
+            return True
+        except ValueError:
+            return False
+    @api.depends('sale_order_id.order_line.remark')
+    def _compute_bfm_amount_total(self):
+        for record in self:
+            amount_total = 0
+            for line in record.sale_order_id.order_line:
+                # 判断remark是否存在并且是否是数字
+                if line.remark and self.is_float(line.remark):
+                    amount_total += float(line.remark)
+            record.bfm_amount_total = amount_total

sf_mrs_connect/models/res_config_setting.py

@@ -16,13 +16,10 @@ class ResConfigSettings(models.TransientModel):
     token = fields.Char(string='TOKEN', default='b811ac06-3f00-11ed-9aed-0242ac110003')
     sf_secret_key = fields.Char(string='密钥', default='wBmxej38OkErKhD6')
     sf_url = fields.Char(string='访问地址', default='https://sf.cs.jikimo.com')
-    agv_rcs_url = fields.Char(string='avg_rcs访问地址',
-                              default='http://172.16.10.114:8182/rcms/services/rest/hikRpcService/genAgvSchedulingTask')
     center_control_url = fields.Char(string='中控访问地址',
                                      default='http://172.16.21.50:8001')
     center_control_Authorization = fields.Char(string='中控访问认证')
-    wbcode = fields.Char('地码')
+
-    agv_code = fields.Char(string='agv编号')
     task_type_no = fields.Char('任务单类型编号')
     model_parser_url = fields.Char('特征识别路径')
     ftp_host = fields.Char(string='FTP的ip')
@@ -103,9 +100,7 @@ class ResConfigSettings(models.TransientModel):
         token = config.get_param('token', default='')
         sf_secret_key = config.get_param('sf_secret_key', default='')
         sf_url = config.get_param('sf_url', default='')
-        agv_rcs_url = config.get_param('agv_rcs_url', default='')
+
-        wbcode = config.get_param('wbcode', default='')
-        agv_code = config.get_param('agv_code', default='')
         center_control_url = config.get_param('center_control_url', default='')
         center_control_Authorization = config.get_param('center_control_Authorization', default='')
         ftp_host = config.get_param('ftp_host', default='')
@@ -118,9 +113,7 @@ class ResConfigSettings(models.TransientModel):
             token=token,
             sf_secret_key=sf_secret_key,
             sf_url=sf_url,
-            agv_rcs_url=agv_rcs_url,
+
-            wbcode=wbcode,
-            agv_code=agv_code,
             center_control_url=center_control_url,
             center_control_Authorization=center_control_Authorization,
             ftp_host=ftp_host,
@@ -137,9 +130,7 @@ class ResConfigSettings(models.TransientModel):
         ir_config.set_param("token", self.token or "")
         ir_config.set_param("sf_secret_key", self.sf_secret_key or "")
         ir_config.set_param("sf_url", self.sf_url or "")
-        ir_config.set_param("agv_rcs_url", self.agv_rcs_url or "")
+
-        ir_config.set_param("wbcode", self.wbcode or "")
-        ir_config.set_param("agv_code", self.agv_code or "")
         ir_config.set_param("center_control_url", self.center_control_url or "")
         ir_config.set_param("center_control_Authorization", self.center_control_Authorization or "")
         ir_config.set_param("ftp_host", self.ftp_host or "")
@@ -184,7 +175,10 @@ class ResConfigSettings(models.TransientModel):
                         new_price = res_order_lines_map.get(str(index))
                         if order_line:
                             # 修改单价
-                            order_line.write({'remark': new_price})
+                            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})
             else:
                 logging.error('同步销售订单价格失败 {}'.format(response.text))
                 raise UserError('同步销售订单价格失败')

sf_mrs_connect/models/sync_common.py

@@ -2438,6 +2438,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2459,6 +2460,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2674,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[
@@ -2696,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[
@@ -2789,6 +2793,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -2810,6 +2815,7 @@ class CuttingToolBasicParameters(models.Model):
                                     'handle_length': integral_tool_item['shank_length'],
                                     'blade_tip_diameter': integral_tool_item['tip_diameter'],
                                     'blade_tip_working_size': integral_tool_item['tip_handling_size'],
+                                    'tip_r_size': integral_tool_item['tip_r_size'],
                                     'blade_tip_taper': integral_tool_item['knife_tip_taper'],
                                     'blade_helix_angle': integral_tool_item['blade_helix_angle'],
                                     'blade_width': integral_tool_item['blade_width'],
@@ -3007,8 +3013,7 @@ class CuttingToolBasicParameters(models.Model):
                                 })
             if 'basic_parameters_cutter_head' in result['cutting_tool_basic_parameters_yesterday_list']:
                 if result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_cutter_head']:
-                    basic_parameters_cutter_head_list = json.loads(
+                    basic_parameters_cutter_head_list = result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_cutter_head']
-                        result['cutting_tool_basic_parameters_yesterday_list']['basic_parameters_cutter_head'])
                     if basic_parameters_cutter_head_list:
                         for cutter_head_item in basic_parameters_cutter_head_list:
                             cutter_head = self.search(
@@ -3027,7 +3032,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[
@@ -3049,7 +3055,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,sf_base.group_sale_director,1,1,1,1
-
-
-

sf_mrs_connect/views/order_price.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <record model="ir.actions.act_window" id="order_price_tree_act">
+        <field name="name">bfm订单价格对比</field>
+        <field name="res_model">order.price</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+    <menuitem sequence="22" name="销售订单bfm对比" id="menu_sale_order_bfm_price"
+              action="order_price_tree_act"
+              parent="sale.sale_order_menu"
+              groups="sf_base.group_sale_director"
+    />
+
+    <record id="view_order_price_tree" model="ir.ui.view">
+        <field name="name">order.price.list</field>
+        <field name="model">order.price</field>
+        <field name="arch" type="xml">
+            <tree string="订单计划">
+                <field name="bfm_order_name"/>
+                <field name="sale_order_name"/>
+                <field name="sale_order_amount_total"/>
+                <field name="bfm_amount_total"/>
+            </tree>
+        </field>
+    </record>
+
+</odoo>

sf_mrs_connect/views/res_config_settings_views.xml

@@ -74,28 +74,7 @@
                             </div>
                         </div>
                     </div>
-                    <div>
+
-                        <h2>AGV参数配置</h2>
-                        <div class="row mt16 o_settings_container" id="agv_config">
-                            <div class="col-12 col-lg-6 o_setting_box">
-                                <div class="o_setting_left_pane"/>
-                                <div class="o_setting_right_pane">
-                                    <div class="text-muted">
-                                        <label for="agv_rcs_url" string="访问地址"/>
-                                        <field name="agv_rcs_url"/>
-                                    </div>
-                                    <div class="text-muted">
-                                        <label for="agv_code" string="车辆编号"/>
-                                        <field name="agv_code"/>
-                                    </div>
-                                    <div class="text-muted">
-                                        <label for="wbcode"/>
-                                        <field name="wbcode"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
                     <div>
                         <h2>中控参数配置</h2>
                         <div class="row mt16 o_settings_container">

sf_plan/models/custom_plan.py

@@ -18,7 +18,8 @@ class sf_production_plan(models.Model):
         ('draft', '待排程'),
         ('done', '已排程'),
         ('processing', '加工中'),
-        ('finished', '已完成')
+        ('finished', '已完成'),
+        ('cancel', '已取消')
     ], string='状态', tracking=True)
 
     state_order = fields.Integer(compute='_compute_state_order', store=True)
@@ -37,7 +38,7 @@ class sf_production_plan(models.Model):
     _order = 'state_order asc, write_date desc'
 
     name = fields.Char(string='制造订单')
-    # active = fields.Boolean(string='已归档', default=True)
+    active = fields.Boolean(string='已归档', default=True)
     # selected = fields.Boolean(default=False)
     # order_number = fields.Char(string='订单号')
     order_deadline = fields.Datetime(string='订单交期')
@@ -69,6 +70,32 @@ class sf_production_plan(models.Model):
     sequence = fields.Integer(string='序号', copy=False, readonly=True, index=True)
     current_operation_name = fields.Char(string='当前工序名称', size=64, default='生产计划')
 
+    @api.onchange('date_planned_start')
+    def date_planned_start_onchange(self):
+        if self.date_planned_start:
+            self.date_planned_finished = self.date_planned_start + timedelta(hours=1)
+
+    #处理计划状态非待排程，计划结束时间为空的数据处理
+    def deal_no_date_planned_finished(self):
+        plans = self.env['sf.production.plan'].search(
+            [('date_planned_finished', '=', False), ('state', 'in', ['processing', 'done', 'finished'])])
+        for item in plans:
+            if item.date_planned_start:
+                item.date_planned_finished = item.date_planned_start + timedelta(hours=1)
+
+    # 处理计划订单截止时间为空的数据
+    def deal_no_order_deadline(self):
+        plans = self.env['sf.production.plan'].sudo().search(
+            [('order_deadline', '=', False)])
+        for item in plans:
+            if item.date_planned_start:
+                item.order_deadline = item.date_planned_start + timedelta(days=7)
+    @api.model
+    def search_read(self, domain=None, fields=None, offset=0, limit=None, order=None):
+
+        info = super(sf_production_plan, self).search_read(domain, fields, offset, limit, order)
+        return info
+
     # 计算实际加工时长
     @api.depends('actual_start_time', 'actual_end_time')
     def _compute_actual_process_time(self):
@@ -191,7 +218,7 @@ class sf_production_plan(models.Model):
 
         return num
 
-    def do_production_schedule(self, date_planned_start):
+    def do_production_schedule(self):
         """
         排程方法
         """
@@ -199,8 +226,7 @@ class sf_production_plan(models.Model):
             if not record.production_line_id:
                 raise ValidationError("未选择生产线")
             else:
-
+                is_schedule = self.deal_processing_schedule(record.date_planned_start)
-                is_schedule = self.deal_processing_schedule(date_planned_start)
                 if not is_schedule:
                     raise ValidationError("排程失败")
                 workorder_id_list = record.production_id.workorder_ids.ids
@@ -209,7 +235,6 @@ class sf_production_plan(models.Model):
                         for item in record.production_id.workorder_ids:
                             if item.name == 'CNC加工':
                                 item.date_planned_finished = datetime.now() + timedelta(days=100)
-                                # item.date_planned_start = record.date_planned_start
                                 item.date_planned_start = self.date_planned_start if self.date_planned_start else datetime.now()
                                 record.sudo().production_id.plan_start_processing_time = item.date_planned_start
                                 item.date_planned_finished = item.date_planned_start + timedelta(
@@ -222,6 +247,8 @@ class sf_production_plan(models.Model):
                                 record.date_planned_start, record.date_planned_finished = \
                                     item.date_planned_start, item.date_planned_finished
                     record.state = 'done'
+                    record.date_planned_finished = record.date_planned_start + timedelta(
+                        minutes=60) if not record.date_planned_finished else record.date_planned_finished
                     # record.production_id.schedule_state = '已排'
                     record.sudo().production_id.schedule_state = '已排'
                     record.sudo().production_id.process_state = '待装夹'
@@ -385,3 +412,23 @@ class machine_work_schedule(models.Model):
     _description = '机台作业计划'
 
     name = fields.Char(string='机台名')
+
+
+class MrpProductionInheritForPlan(models.Model):
+    _inherit = 'mrp.production'
+
+    def button_cancel(self):
+        # 调用父类的取消操作
+        res = super(MrpProductionInheritForPlan, self).button_cancel()
+        # 更新 sf.production.plan 模型的 state 为 'cancel'
+        self.env['sf.production.plan'].search([('production_id', '=', self.id)]).write({'state': 'cancel'})
+        return res
+
+    def toggle_active(self):
+        # 调用父类方法切换 active 状态
+        res = super(MrpProductionInheritForPlan, self).toggle_active()
+        self.env['sf.production.plan'].search(
+            [('production_id', '=', self.id), '|', ('active', '=', False), ('active', '=', True)]).write(
+            {'active': self.active})
+
+        return res

sf_plan/views/view.xml

@@ -88,8 +88,8 @@
 
                             <group string="加工信息">
 
-                                <field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程"/>
+                                <field name="date_planned_start" placeholder="如果不选择计划开始时间，会取当前时间来做排程" required="1"/>
-                                <field name="date_planned_finished"/>
+                                <field name="date_planned_finished" required="1"/>
                                 <field name="actual_process_time"/>
                                 <field name="actual_start_time"/>
                                 <field name="actual_end_time"/>
@@ -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"> -->
@@ -338,7 +339,7 @@
                 name="空料架配送"
                 sequence="11"
                 action="sf_manufacturing.sf_workpiece_delivery_empty_racks_act"
-                groups="base.group_system"
+                groups="sf_base.group_sf_order_user,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user"
                 parent="mrp.menu_mrp_manufacturing"
         />
         <!--         <menuitem -->

sf_plan/wizard/action_plan_some.py

@@ -6,6 +6,7 @@ from datetime import datetime
 from odoo import fields, models
 # from odoo.exceptions import ValidationError
 from odoo.exceptions import UserError
+from datetime import datetime, timedelta
 
 _logger = logging.getLogger(__name__)
 
@@ -14,10 +15,15 @@ class Action_Plan_All_Wizard(models.TransientModel):
     _name = 'sf.action.plan.all.wizard'
     _description = u'排程向导'
 
+    def _get_date_planned_start(self):
+        planned_start_date = datetime.now() + timedelta(minutes=10)
+        logging.info('计划开始时间: %s', planned_start_date)
+        return planned_start_date
+
     # 选择生产线
     production_line_id = fields.Many2one('sf.production.line', string=u'生产线', required=True)
     date_planned_start = fields.Datetime(string='计划开始时间', index=True, copy=False,
-                                         default=fields.Datetime.now)
+                                         default=_get_date_planned_start)
 
     # 接收传递过来的计划ID
     plan_ids = fields.Many2many('sf.production.plan', string=u'计划ID')
@@ -36,7 +42,7 @@ class Action_Plan_All_Wizard(models.TransientModel):
             plan_obj = self.env['sf.production.plan'].browse(plan.id)
             plan_obj.production_line_id = self.production_line_id.id
             plan.date_planned_start = self.date_planned_start
-            plan_obj.do_production_schedule(self.date_planned_start)
+            plan_obj.do_production_schedule()
             # plan_obj.state = 'done'
             print('处理计划:', plan.id, '完成')
 

sf_sale/models/quick_easy_order_old.py

@@ -58,6 +58,15 @@ class QuickEasyOrder(models.Model):
 
     part_drawing_number = fields.Char('零件图号')
     machining_drawings = fields.Binary('2D加工图纸')
+    machining_drawings_name = fields.Char('2D加工图纸名')
+
+    @api.onchange('machining_drawings_name')
+    def _onchange_machining_drawings_name(self):
+        for item in self:
+            if item.machining_drawings_name:
+                if not item.machining_drawings_name.lower().endswith(
+                        '.pdf'):
+                    raise ValidationError('文件格式上传有误，请检查文件后缀(不区分大小写)是否为pdf')
 
     @api.onchange('parameter_ids')
     def _compute_parameter_ids(self):
@@ -128,6 +137,10 @@ class QuickEasyOrder(models.Model):
             if len(item.upload_model_file) > 1:
                 raise ValidationError('只允许上传一个文件')
             if item.upload_model_file:
+                if not item.upload_model_file.name.lower().endswith(
+                        '.step') and not item.upload_model_file.name.lower().endswith(
+                    '.stp'):
+                    raise ValidationError('文件格式上传有误，请检查文件后缀(不区分大小写)是否为step、stp')
                 file_attachment_id = item.upload_model_file[0]
                 # 附件路径
                 report_path = file_attachment_id._full_path(file_attachment_id.store_fname)

sf_sale/views/purchase_order_view.xml

@@ -184,5 +184,10 @@
                 </xpath>
             </field>
         </record>
+        <record id="purchase.product_normal_action_puchased" model="ir.actions.act_window">
+            <field name="context">
+                {"search_default_categ_id":1,"search_default_filter_to_purchase":1, "purchase_product_template": 1}
+            </field>
+        </record>
     </data>
 </odoo>

sf_sale/views/quick_easy_order_view.xml

@@ -80,7 +80,8 @@
                                 <field name="unit_price"/>
                                 <field name="price" options="{'format': false}"/>
                                 <field name="part_drawing_number"/>
-                                <field name="machining_drawings" widget="image"/>
+                                <field name="machining_drawings" filename="machining_drawings_name" widget="pdf_viewer"/>
+                                <field name="machining_drawings_name" invisible="1"/>
                                 <field name="sale_order_id"
                                        attrs='{"invisible": [("sale_order_id","=",False)],"readonly": [("sale_order_id","!=",False)]}'/>
                             </group>

sf_sale/views/res_partner_view.xml

@@ -100,8 +100,7 @@
             <field name="arch" type="xml">
                 <field name="property_supplier_payment_term_id" position="before">
                     <field name="purchase_user_id" context="{'supplier_rank': supplier_rank }"
-                           widget="many2one_avatar_user"
+                           widget="many2one_avatar_user"/>
-                           attrs="{'required' : [('supplier_rank','>', 0)]}"/>
                 </field>
                 <xpath expr="//field[@name='property_account_position_id']" position="attributes">
                     <attribute name="attrs">{'readonly': [('id','!=', False)]}</attribute>

sf_sale/views/sale_order_view.xml

@@ -225,5 +225,10 @@
                 </field>
             </field>
         </record>
+        <record id="sale.product_template_action" model="ir.actions.act_window">
+            <field name="context">{"search_default_categ_id":1,
+                "search_default_filter_to_sell":1,"sale_multi_pricelist_product_template": 1}
+            </field>
+        </record>
     </data>
 </odoo>

sf_stock/__manifest__.py

@@ -3,7 +3,7 @@
     'name': "sf_stock",
 
     'summary': """
-        处理代发货业务""",
+        处理仓库 -代发货业务""",
 
     'description': """
         Long description of module's purpose
@@ -25,6 +25,7 @@
     'data': [
         # 'security/ir.model.access.csv',
         'views/stock_picking.xml',
+        'views/stock_product_template.xml'
     ],
     # only loaded in demonstration mode
     'demo': [

sf_stock/models/stock_picking.py

@@ -13,8 +13,6 @@ _logger = logging.getLogger(__name__)
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
-    cancel_backorder_ids = fields.Boolean(default=False, string='是否取消后置单据')
-
     # 重写验证，下发发货到bfm
     def button_validate(self):
         info = super(StockPicking, self).button_validate()
@@ -76,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)
@@ -94,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_stock/views/stock_picking.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0" encoding="UTF-8" ?>
 <odoo>
   <data>
 

sf_stock/views/stock_product_template.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <data>
+        <record id="stock.product_template_action_product" model="ir.actions.act_window">
+            <field name="context">
+                {"search_default_categ_id":1,"search_default_consumable": 1, 'default_detailed_type': 'product'}
+            </field>
+        </record>
+
+    </data>
+</odoo>

sf_tool_management/controllers/controllers.py

@@ -122,7 +122,8 @@ class Manufacturing_Connect(http.Controller):
             tool_assembly.write({
                 'after_assembly_tool_loading_length': float(data_list[1] or "0"),  # 高度(总长度)
                 'after_assembly_functional_tool_diameter': float(data_list[2] or "0") * 2,  # 直径
-                'after_assembly_knife_tip_r_angle': float(data_list[3] or "0")  # R角
+                'after_assembly_knife_tip_r_angle': float(data_list[3] or "0"),  # R角
+                'bool_preset_parameter': True
             })
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}

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,
+        programming_no = cnc_processing.workorder_id.production_id.programming_no
-            'filename': cnc_processing.cnc_id.name,
+        logging.info(f'编程单号:{programming_no}')
-            'functional_tool_name': cnc_processing.cutting_tool_name,
+        cam_id = self.env['sf.cam.work.order.program.knife.plan'].sudo().search(
-            'cam_cutter_spacing_code': cnc_processing.cutting_tool_no,
+            [('programming_no', '=', programming_no),
-            'process_type': cnc_processing.processing_type,
+             ('functional_tool_name', '=', cnc_processing.cutting_tool_name)])
-            'margin_x_y': float(cnc_processing.margin_x_y),
+        logging.info(f'CAM装刀计划：{cam_id}')
-            'margin_z': float(cnc_processing.margin_z),
+        if not cam_id:
-            'finish_depth': float(cnc_processing.depth_of_processing_z),
+            knife_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().create({
-            'extension_length': float(cnc_processing.cutting_tool_extension_length),
+                'name': cnc_processing.workorder_id.production_id.name,
-            'shank_model': cnc_processing.cutting_tool_handle_type,
+                'programming_no': programming_no,
-            'estimated_processing_time': cnc_processing.estimated_processing_time,
+                'cam_procedure_code': cnc_processing.program_name,
-        })
+                'filename': cnc_processing.cnc_id.name,
-        logging.info('CAM工单程序用刀计划创建成功！！！')
+                'functional_tool_name': cnc_processing.cutting_tool_name,
-        # 创建装刀请求
+                'cam_cutter_spacing_code': cnc_processing.cutting_tool_no,
-        knife_plan.apply_for_tooling()
+                '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:
@@ -349,25 +360,102 @@ class CAMWorkOrderProgramKnifePlan(models.Model):
 
 class FunctionalToolAssembly(models.Model):
     _name = 'sf.functional.tool.assembly'
-    _inherit = ['mail.thread']
+    _inherit = ['mail.thread', 'barcodes.barcode_events_mixin']
     _description = '功能刀具组装'
-    _order = 'assemble_status, use_tool_time asc'
+    _order = 'tool_loading_time desc, use_tool_time asc'
+
+    def on_barcode_scanned(self, barcode):
+        """
+        智能工厂组装单处扫码校验刀具物料
+        """
+        if 'O-CMD' in barcode:
+            return ''
+        for record in self:
+            tool_assembly_id = self.env['sf.functional.tool.assembly'].browse(self.ids)
+            lot_ids = self.env['stock.lot'].sudo().search([('rfid', '=', barcode)])
+            if lot_ids:
+                for lot_id in lot_ids:
+                    if lot_id.tool_material_status != '可用':
+                        raise ValidationError(f'Rfid为【{barcode}】的刀柄已被占用，请重新扫描！！')
+                    if lot_id.product_id == record.handle_product_id:
+                        record.handle_code_id = lot_id.id
+                        tool_assembly_id.handle_code_id = lot_id.id
+                    else:
+                        raise ValidationError('刀柄选择错误，请重新确认！！！')
+            else:
+                location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
+                if location:
+                    if location == record.integral_freight_barcode_id:
+                        tool_assembly_id.integral_verify = True
+                        record.integral_verify = True
+                    elif location == record.blade_freight_barcode_id:
+                        tool_assembly_id.blade_verify = True
+                        record.blade_verify = True
+                    elif location == record.bar_freight_barcode_id:
+                        tool_assembly_id.bar_verify = True
+                        record.bar_verify = True
+                    elif location == record.pad_freight_barcode_id:
+                        tool_assembly_id.pad_verify = True
+                        record.pad_verify = True
+                    elif location == record.chuck_freight_barcode_id:
+                        tool_assembly_id.chuck_verify = True
+                        record.chuck_verify = True
+                    else:
+                        raise ValidationError('刀具选择错误，请重新确认！')
+                else:
+                    raise ValidationError(f'扫描为【{barcode}】的货位不存在，请重新扫描！')
 
     @api.depends('functional_tool_name')
     def _compute_name(self):
         for obj in self:
             obj.name = obj.assembly_order_code
 
-    code = fields.Char('功能刀具编码', readonly=True)
     rfid = fields.Char('Rfid', readonly=True)
-    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', readonly=True)
+    tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', store=True, compute='_compute_inventory_num')
     name = fields.Char(string='名称', readonly=True, compute='_compute_name')
     assembly_order_code = fields.Char(string='组装单编码', readonly=True)
 
     functional_tool_name_id = fields.Many2one('product.product', string='功能刀具', readonly=True)
-    functional_tool_name = fields.Char(string='功能刀具名称', readonly=True)
+    functional_tool_name = fields.Char(string='功能刀具名称', readonly=True, required=True)
-    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', readonly=True,
+    tool_inventory_id = fields.Many2one('sf.tool.inventory', string='功能刀具清单', store=True,
-                                              group_expand='_read_group_functional_tool_type_ids')
+                                        compute='_compute_functional_tool_name')
+
+    @api.depends('functional_tool_name')
+    def _compute_functional_tool_name(self):
+        for item in self:
+            if item.functional_tool_name:
+                inventory = self.env['sf.tool.inventory'].sudo().search([('name', '=', item.functional_tool_name)])
+                if inventory:
+                    item.tool_inventory_id = inventory.id
+                    item.after_assembly_functional_tool_name = item.functional_tool_name  # 组装后名称
+                    item.functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+                    item.tool_groups_id = item.tool_inventory_id.tool_groups_id.id  # 刀具组
+                    item.after_assembly_functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+                    item.after_assembly_functional_tool_diameter = item.tool_inventory_id.diameter  # 直径
+                    item.after_assembly_knife_tip_r_angle = item.tool_inventory_id.angle  # R角
+                    item.after_assembly_tool_loading_length = item.tool_inventory_id.tool_length  # 总长度
+                    item.after_assembly_functional_tool_length = item.tool_inventory_id.extension  # 伸出长度
+                    item.after_assembly_max_lifetime_value = item.tool_inventory_id.life_span  # 最大寿命
+
+    @api.depends('tool_inventory_id', 'tool_inventory_id.functional_cutting_tool_model_id', 'tool_inventory_id.angle',
+                 'tool_inventory_id.tool_groups_id', 'tool_inventory_id.diameter', 'tool_inventory_id.tool_length',
+                 'tool_inventory_id.extension', 'tool_inventory_id.life_span')
+    def _compute_inventory_num(self):
+        for item in self:
+            if item.assemble_status != '01':
+                return True
+            if item.tool_inventory_id:
+                item.functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+                item.tool_groups_id = item.tool_inventory_id.tool_groups_id.id  # 刀具组
+                item.after_assembly_functional_tool_type_id = item.tool_inventory_id.functional_cutting_tool_model_id.id
+                item.after_assembly_functional_tool_diameter = item.tool_inventory_id.diameter  # 直径
+                item.after_assembly_knife_tip_r_angle = item.tool_inventory_id.angle  # R角
+                item.after_assembly_tool_loading_length = item.tool_inventory_id.tool_length  # 总长度
+                item.after_assembly_max_lifetime_value = item.tool_inventory_id.life_span  # 最大寿命
+
+    functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型',
+                                              group_expand='_read_group_functional_tool_type_ids', store=True,
+                                              compute='_compute_inventory_num')
     functional_tool_diameter = fields.Float(string='功能刀具直径(mm)', readonly=True)
     knife_tip_r_angle = fields.Float(string='刀尖R角(mm)', readonly=True)
     coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], string='粗/中/精', readonly=True)
@@ -375,16 +463,17 @@ class FunctionalToolAssembly(models.Model):
     tool_loading_length = fields.Float(string='总长度(mm)', readonly=True)
     functional_tool_length = fields.Float(string='伸出长(mm)', readonly=True)
     effective_length = fields.Float(string='有效长(mm)', readonly=True)
-    loading_task_source = fields.Selection([('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装')],
+    loading_task_source = fields.Selection(
-                                           string='装刀任务来源', readonly=True)
+        [('0', 'CAM装刀'), ('1', '机台换刀'), ('2', '按库存组装'), ('3', '寿命到期组装')],
+        string='装刀任务来源', readonly=True)
     use_tool_time = fields.Datetime(string='用刀时间', readonly=True)
     production_line_name_id = fields.Many2one('sf.production.line', string='申请产线', readonly=True)
     machine_tool_name_id = fields.Many2one('maintenance.equipment', string='申请机台', readonly=True)
     machine_tool_code = fields.Char(string='机台号', readonly=True)
     applicant = fields.Char(string='申请人', readonly=True)
     apply_time = fields.Datetime(string='申请时间', default=fields.Datetime.now(), readonly=True)
-    assemble_status = fields.Selection([('0', '待组装'), ('1', '已组装')], string='组装状态', default='0',
+    assemble_status = fields.Selection([('0', '待组装'), ('01', '组装中'), ('1', '已组装'), ('3', '已取消')],
-                                       tracking=True, readonly=True)
+                                       string='组装状态', default='0', tracking=True, readonly=True)
     cutter_spacing_code_id = fields.Many2one('maintenance.equipment.tool', string='刀位号', readonly=True)
     whether_standard_knife = fields.Boolean(string='是否标准刀', default=True, readonly=True)
     reason_for_applying = fields.Char(string='申请原因', readonly=True)
@@ -392,7 +481,7 @@ class FunctionalToolAssembly(models.Model):
     alarm_value = fields.Integer(string='报警值(min)', readonly=True)
     used_value = fields.Integer(string='已使用值(min)', readonly=True)
 
-    image = fields.Binary('图片', readonly=True)
+    image = fields.Binary('图片', readonly=False)
 
     @api.model
     def _read_group_functional_tool_type_ids(self, categories, domain, order):
@@ -402,8 +491,9 @@ class FunctionalToolAssembly(models.Model):
 
     # 刀具物料信息
     # ==============整体式刀具型号=============
-    integral_freight_barcode_id = fields.Many2one('sf.shelf.location', string='整体式刀具货位')
+    integral_freight_barcode_id = fields.Many2one('sf.shelf.location', string='整体式刀具货位', readonly=True,
-    integral_lot_id = fields.Many2one('stock.lot', string='整体式刀具批次')
+                                                  domain="[('product_id.cutting_tool_material_id.name', '=', '整体式刀具'),('product_num', '>', 0)]")
+    integral_lot_id = fields.Many2one('stock.lot', string='整体式刀具批次', readonly=True)
     integral_product_id = fields.Many2one('product.product', string='整体式刀具名称',
                                           compute='_compute_integral_product_id', store=True)
     cutting_tool_integral_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='整体式刀具型号',
@@ -412,16 +502,20 @@ class FunctionalToolAssembly(models.Model):
                                                 related='integral_product_id.specification_id')
     sf_tool_brand_id_1 = fields.Many2one('sf.machine.brand', string='整体式刀具品牌',
                                          related='integral_product_id.brand_id')
+    integral_verify = fields.Boolean('整体刀校验', default=False)
 
     @api.depends('integral_lot_id')
     def _compute_integral_product_id(self):
         for item in self:
             if item.integral_lot_id:
                 item.integral_product_id = item.integral_lot_id.product_id.id
+            else:
+                item.integral_product_id = False
 
     # =================刀片型号=============
-    blade_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀片货位')
+    blade_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀片货位', readonly=True,
-    blade_lot_id = fields.Many2one('stock.lot', string='刀片批次')
+                                               domain="[('product_id.cutting_tool_material_id.name', '=', '刀片'),('product_num', '>', 0)]")
+    blade_lot_id = fields.Many2one('stock.lot', string='刀片批次', readonly=True)
     blade_product_id = fields.Many2one('product.product', string='刀片名称', compute='_compute_blade_product_id',
                                        store=True)
     cutting_tool_blade_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀片型号',
@@ -429,16 +523,20 @@ class FunctionalToolAssembly(models.Model):
     blade_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀片规格',
                                              related='blade_product_id.specification_id')
     sf_tool_brand_id_2 = fields.Many2one('sf.machine.brand', '刀片品牌', related='blade_product_id.brand_id')
+    blade_verify = fields.Boolean('刀片校验', default=False)
 
     @api.depends('blade_lot_id')
     def _compute_blade_product_id(self):
         for item in self:
             if item.blade_lot_id:
                 item.blade_product_id = item.blade_lot_id.product_id.id
+            else:
+                item.blade_product_id = False
 
     # ==============刀杆型号================
-    bar_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀杆货位')
+    bar_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀杆货位', readonly=True,
-    bar_lot_id = fields.Many2one('stock.lot', string='刀杆批次')
+                                             domain="[('product_id.cutting_tool_material_id.name', '=', '刀杆'),('product_num', '>', 0)]")
+    bar_lot_id = fields.Many2one('stock.lot', string='刀杆批次', readonly=True)
     bar_product_id = fields.Many2one('product.product', string='刀杆名称', compute='_compute_bar_product_id',
                                      store=True)
     cutting_tool_cutterbar_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀杆型号',
@@ -446,16 +544,20 @@ class FunctionalToolAssembly(models.Model):
     bar_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀杆规格',
                                            related='bar_product_id.specification_id')
     sf_tool_brand_id_3 = fields.Many2one('sf.machine.brand', '刀杆品牌', related='bar_product_id.brand_id')
+    bar_verify = fields.Boolean('刀杆校验', default=False)
 
     @api.depends('bar_lot_id')
     def _compute_bar_product_id(self):
         for item in self:
             if item.bar_lot_id:
                 item.bar_product_id = item.bar_lot_id.product_id.id
+            else:
+                item.bar_product_id = False
 
     # =============刀盘型号================
-    pad_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀盘货位')
+    pad_freight_barcode_id = fields.Many2one('sf.shelf.location', string='刀盘货位', readonly=True,
-    pad_lot_id = fields.Many2one('stock.lot', string='刀盘批次')
+                                             domain="[('product_id.cutting_tool_material_id.name', '=', '刀盘'),('product_num', '>', 0)]")
+    pad_lot_id = fields.Many2one('stock.lot', string='刀盘批次', readonly=True)
     pad_product_id = fields.Many2one('product.product', string='刀盘名称', compute='_compute_pad_product_id',
                                      store=True)
     cutting_tool_cutterpad_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀盘型号',
@@ -463,37 +565,42 @@ class FunctionalToolAssembly(models.Model):
     pad_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀盘规格',
                                            related='pad_product_id.specification_id')
     sf_tool_brand_id_4 = fields.Many2one('sf.machine.brand', '刀盘品牌', related='pad_product_id.brand_id')
+    pad_verify = fields.Boolean('刀盘校验', default=False)
 
     @api.depends('pad_lot_id')
     def _compute_pad_product_id(self):
         for item in self:
             if item.pad_lot_id:
                 item.pad_product_id = item.pad_lot_id.product_id.id
+            else:
+                item.pad_product_id = False
 
     # ==============刀柄型号==============
-    handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_handle_product_id', store=True)
+    handle_code_id = fields.Many2one('stock.lot', '刀柄序列号', readonly=True,
-    handle_code_id = fields.Many2one('stock.lot', '刀柄序列号')
+                                     domain="[('product_id', '=', handle_product_id)]")
-    handle_product_id = fields.Many2one('product.product', string='刀柄名称', compute='_compute_handle_product_id',
+    handle_freight_rfid = fields.Char('刀柄Rfid', compute='_compute_handle_rfid', store=True)
-                                        store=True)
+    handle_product_id = fields.Many2one('product.product', string='刀柄名称', readonly=True)
     cutting_tool_cutterhandle_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='刀柄型号',
                                                          related='handle_product_id.cutting_tool_model_id')
     handle_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='刀柄规格',
                                               related='handle_product_id.specification_id')
     sf_tool_brand_id_5 = fields.Many2one('sf.machine.brand', '刀柄品牌', related='handle_product_id.brand_id')
+    handle_verify = fields.Boolean('刀柄校验', default=False)
 
     @api.depends('handle_code_id')
-    def _compute_handle_product_id(self):
+    def _compute_handle_rfid(self):
         for item in self:
             if item.handle_code_id:
-                item.handle_product_id = item.handle_code_id.product_id.id
                 item.handle_freight_rfid = item.handle_code_id.rfid
+                item.rfid = item.handle_freight_rfid
             else:
-                item.handle_product_id = False
                 item.handle_freight_rfid = False
+                item.rfid = False
 
     # ==============夹头型号==============
-    chuck_freight_barcode_id = fields.Many2one('sf.shelf.location', string='夹头货位')
+    chuck_freight_barcode_id = fields.Many2one('sf.shelf.location', string='夹头货位', readonly=True,
-    chuck_lot_id = fields.Many2one('stock.lot', string='夹头批次')
+                                               domain="[('product_id.cutting_tool_material_id.name', '=', '夹头'),('product_num', '>', 0)]")
+    chuck_lot_id = fields.Many2one('stock.lot', string='夹头批次', readonly=True)
     chuck_product_id = fields.Many2one('product.product', string='夹头名称', compute='_compute_chuck_product_id',
                                        store=True)
     cutting_tool_cutterhead_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='夹头型号',
@@ -501,12 +608,15 @@ class FunctionalToolAssembly(models.Model):
     chuck_specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='夹头规格',
                                              related='chuck_product_id.specification_id')
     sf_tool_brand_id_6 = fields.Many2one('sf.machine.brand', '夹头品牌', related='chuck_product_id.brand_id')
+    chuck_verify = fields.Boolean('夹头校验', default=False)
 
     @api.depends('chuck_lot_id')
     def _compute_chuck_product_id(self):
         for item in self:
             if item.chuck_lot_id:
                 item.chuck_product_id = item.chuck_lot_id.product_id.id
+            else:
+                item.chuck_product_id = False
 
     # ==================待删除字段==================
     integral_freight_barcode = fields.Char('整体式刀具货位')
@@ -525,30 +635,39 @@ class FunctionalToolAssembly(models.Model):
     handle_name = fields.Char('')
     chuck_code_id = fields.Many2one('stock.lot', '夹头序列号')
     chuck_name = fields.Char('')
+    # ====================暂时无用字段=========================
+    after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
     # ==============================================
     # 组装功能刀具参数信息
     start_preset_bool = fields.Boolean('开始预调', default=False)
     barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号', readonly=True)
-    after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', readonly=True)
+    after_assembly_functional_tool_name = fields.Char(string='组装后功能刀具名称', store=True,
-    after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model',
+                                                      compute='_compute_functional_tool_name')
-                                                             string='组装后功能刀具类型', readonly=True)
+    after_assembly_functional_tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', store=True,
-    after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', readonly=True,
+                                                             string='组装后功能刀具类型',
-                                                           digits=(10, 3))
+                                                             compute='_compute_inventory_num')
-    after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', readonly=True, digits=(10, 3))
+    after_assembly_functional_tool_diameter = fields.Float(string='组装后功能刀具直径(mm)', digits=(10, 3), store=True,
-    after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', readonly=True)
+                                                           compute='_compute_inventory_num')
+    after_assembly_knife_tip_r_angle = fields.Float(string='组装后刀尖R角(mm)', digits=(10, 3), store=True,
+                                                    compute='_compute_inventory_num')
+    after_assembly_new_former = fields.Selection([('0', '新'), ('1', '旧')], string='组装后新/旧', default='0',
+                                                 store=True, compute='_compute_rota_tive')
     cut_time = fields.Integer(string='已切削时间(min)', readonly=True)
     cut_length = fields.Float(string='已切削长度(mm)', readonly=True)
     cut_number = fields.Integer(string='已切削次数', readonly=True)
 
     after_assembly_whether_standard_knife = fields.Boolean(string='组装后是否标准刀', default=True, readonly=True)
-    after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')],
+    after_assembly_coarse_middle_thin = fields.Selection([("1", "粗"), ('2', '中'), ('3', '精')], store=True,
-                                                         string='组装后粗/中/精', readonly=True)
+                                                         string='组装后粗/中/精', default='3',
-    after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', readonly=True)
+                                                         compute='_compute_rota_tive')
-    after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)', readonly=True)
+    after_assembly_max_lifetime_value = fields.Integer(string='组装后最大寿命值(min)', store=True,
-    after_assembly_used_value = fields.Integer(string='组装后已使用值(min)', readonly=True)
+                                                       compute='_compute_inventory_num')
-    after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', readonly=True, digits=(10, 3))
+    after_assembly_alarm_value = fields.Integer(string='组装后报警值(min)')
-    after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', readonly=True, digits=(10, 3))
+    after_assembly_tool_loading_length = fields.Float(string='组装后总长度(mm)', digits=(10, 3), store=True,
-    after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', readonly=True, digits=(10, 3))
+                                                      compute='_compute_inventory_num')
+    after_assembly_handle_length = fields.Float(string='组装后刀柄长度(mm)', digits=(10, 3))
+    after_assembly_functional_tool_length = fields.Float(string='组装后伸出长(mm)', digits=(10, 3), store=True,
+                                                         compute='_compute_length')
     after_assembly_effective_length = fields.Float(string='组装后有效长(mm)', readonly=True)
     L_D_number = fields.Float(string='L/D值(mm)', readonly=True)
     hiding_length = fields.Float(string='避空长(mm)', readonly=True)
@@ -562,10 +681,74 @@ class FunctionalToolAssembly(models.Model):
     sf_machine_table_tool_changing_apply_id = fields.Many2one('sf.machine.table.tool.changing.apply', '机床换刀申请',
                                                               readonly=True)
     sf_cam_work_order_program_knife_plan_id = fields.Many2one('sf.cam.work.order.program.knife.plan',
-                                                              'CAM工单程序用刀计划', readonly=True, )
+                                                              'CAM工单程序用刀计划', readonly=True)
 
     active = fields.Boolean(string='已归档', default=True)
 
+    code = fields.Char('功能刀具编码', compute='_compute_code')
+
+    @api.depends('after_assembly_tool_loading_length', 'after_assembly_handle_length')
+    def _compute_length(self):
+        for item in self:
+            if item.after_assembly_tool_loading_length > item.after_assembly_handle_length:
+                item.after_assembly_functional_tool_length = (
+                        item.after_assembly_tool_loading_length - item.after_assembly_handle_length)
+
+    @api.depends('integral_freight_barcode_id', 'blade_freight_barcode_id')
+    def _compute_rota_tive(self):
+        for item in self:
+            rota_tive_boolean = False
+            if item.integral_freight_barcode_id:
+                # 整体刀
+                if item.integral_freight_barcode_id.rotative_Boolean:
+                    rota_tive_boolean = True
+            elif item.blade_freight_barcode_id:
+                # 刀片
+                if item.blade_freight_barcode_id.rotative_Boolean:
+                    rota_tive_boolean = True
+            if rota_tive_boolean:
+                item.after_assembly_coarse_middle_thin = '1'
+                item.after_assembly_new_former = '1'
+            else:
+                item.after_assembly_coarse_middle_thin = '3'
+                item.after_assembly_new_former = '0'
+
+    @api.onchange('handle_product_id')
+    def _onchange_after_assembly_handle_length(self):
+        for item in self:
+            if item:
+                if item.handle_product_id:
+                    item.after_assembly_handle_length = item.handle_product_id.cutting_tool_shank_length
+
+    @api.depends('after_assembly_functional_tool_type_id', 'cutting_tool_cutterhandle_model_id',
+                 'after_assembly_functional_tool_diameter', 'after_assembly_tool_loading_length',
+                 'after_assembly_knife_tip_r_angle', 'after_assembly_functional_tool_length',
+                 'after_assembly_handle_length')
+    def _compute_code(self):
+        for obj in self:
+            if obj.cutting_tool_cutterhandle_model_id:
+                code = obj.cutting_tool_cutterhandle_model_id.code.split('-', 1)[0]
+                str_1 = '%s-GNDJ-%s-D%sL%sR%sB%sH%s' % (
+                    code, obj.after_assembly_functional_tool_type_id.code, obj.after_assembly_functional_tool_diameter,
+                    obj.after_assembly_tool_loading_length, obj.after_assembly_knife_tip_r_angle,
+                    round(obj.after_assembly_functional_tool_length, 3), obj.after_assembly_handle_length)
+                obj.code = '%s-%s' % (str_1, self._get_code_1(str_1))
+            else:
+                obj.code = ''
+
+    def _get_code_1(self, str_2):
+        functional_tool_assembly = self.env['sf.functional.cutting.tool.entity'].sudo().search(
+            [('code', 'like', str_2)],
+            limit=1,
+            order="id desc"
+        )
+        if not functional_tool_assembly:
+            num = "%03d" % 1
+        else:
+            m = int(functional_tool_assembly.code[-3:]) + 1
+            num = "%03d" % m
+        return num
+
     def action_open_reference1(self):
         self.ensure_one()
         return {
@@ -575,41 +758,326 @@ class FunctionalToolAssembly(models.Model):
             'res_id': self.id,
         }
 
-    def put_start_preset(self):
+    def start_preset(self):
-        self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
+        """
+        开始组装
+        """
+        # 设置初始值
+        self.start_preset_bool = True
+        self.assemble_status = '01'
+        self.after_assembly_coarse_middle_thin = '3'
+        self.after_assembly_new_former = '0'
+
+        # 调用功能刀具名称对应的清单的BOM获取对应刀具物料信息
+        bom = self._get_inventory_bom(self.tool_inventory_id)
+        # 根据BOM自动配置物料的值
+        self._set_tool_material(bom)
+        logging.info('功能刀具开始组装初始化值成功！')
+
+    def _set_tool_material(self, bom):
+        """根据BOM对刀具物料进行初始配置"""
+        options = bom.get('options')
+        # 配置刀柄信息
+        for handle_id in bom.get('handle_ids'):
+            if handle_id:
+                if not self.handle_product_id:
+                    self.handle_product_id = handle_id.id
+                break
+
+        # 刀柄之外的物料配置
+        if options == '刀柄+整体式刀具':
+            # 配置整体式刀具
+            integra_lot_id = self._get_old_tool_material_lot(bom.get('integral_ids'))
+            integra_location_lot_id = self._get_shelf_location_lot(integra_lot_id)
+            self.integral_freight_barcode_id = integra_location_lot_id.shelf_location_id.id
+            self.integral_lot_id = integra_location_lot_id.lot_id.id
+        else:
+            # 配置刀片
+            blade_lot_id = self._get_old_tool_material_lot(bom.get('blade_ids'))
+            blade_location_lot_id = self._get_shelf_location_lot(blade_lot_id)
+            self.blade_freight_barcode_id = blade_location_lot_id.shelf_location_id.id
+            self.blade_lot_id = blade_location_lot_id.lot_id.id
+
+            if options == '刀柄+刀杆+刀片':
+                # 配置刀杆
+                bar_lot_id = self._get_old_tool_material_lot(bom.get('bar_ids'))
+                bar_location_lot_id = self._get_shelf_location_lot(bar_lot_id)
+                self.bar_freight_barcode_id = bar_location_lot_id.shelf_location_id.id
+                self.bar_lot_id = bar_location_lot_id.lot_id.id
+            elif options == '刀柄+刀盘+刀片':
+                # 配置刀盘
+                pad_lot_id = self._get_old_tool_material_lot(bom.get('pad_ids'))
+                pad_location_lot_id = self._get_shelf_location_lot(pad_lot_id)
+                self.pad_freight_barcode_id = pad_location_lot_id.shelf_location_id.id
+                self.pad_lot_id = pad_location_lot_id.lot_id.id
+
+    def _get_old_tool_material_lot(self, material_ids):
+        """ 根据先进先出原则选择物料批次 """
+        location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
+        stock_quant = self.env['stock.quant'].sudo().search(
+            [('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],
+            order='lot_id', limit=1)
+        if stock_quant:
+            return stock_quant.lot_id
+        else:
+            raise ValidationError(f'【{material_ids[0].cutting_tool_material_id.name}】物料库存不足，请先进行盘点或采购')
+
+    def _get_shelf_location_lot(self, lot_id):
+        """根据所给的刀具物料批次号，返回一个刀具物料货位、批次信息"""
+        location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id)])
+        if not location_lots:
+            raise ValidationError(f'没有查询到批次为【{lot_id.name}】物料的货位信息！')
+        else:
+            return location_lots[0]
+
+    def _get_inventory_bom(self, inventory_id):
+        """获取BOM的刀具物料产品信息"""
+        product_ids = inventory_id.jikimo_bom_ids.product_ids  # BOM配置的物料产品
+        options = inventory_id.jikimo_bom_ids.options  # BOM产品组装类型
+
+        if not product_ids or not options:
+            raise ValidationError('功能刀具清单的BOM未进行配置，请先配置BOM信息！')
+        handle_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀柄')
+        integral_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '整体式刀具')
+        blade_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀片')
+        bar_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀杆')
+        pad_ids = product_ids.filtered(lambda a: a.cutting_tool_material_id.name == '刀盘')
+
+        if not handle_ids:
+            raise ValidationError('功能刀具清单的BOM未配置[刀柄]信息，请先配置BOM再开始组装！')
+
+        if options == '刀柄+整体式刀具':
+            if not integral_ids:
+                raise ValidationError('功能刀具清单的BOM未配置[整体式刀具]信息，请先配置BOM再开始组装！')
+            return {'options': options, 'handle_ids': handle_ids, 'integral_ids': integral_ids}
+        elif options == '刀柄+刀杆+刀片':
+            if not blade_ids:
+                raise ValidationError('功能刀具清单的BOM未配置[刀片]信息，请先配置BOM再开始组装！')
+            if not bar_ids:
+                raise ValidationError('功能刀具清单的BOM未配置[刀杆]信息，请先配置BOM再开始组装！')
+            return {'options': options, 'handle_ids': handle_ids, 'blade_ids': blade_ids, 'bar_ids': bar_ids}
+        elif options == '刀柄+刀盘+刀片':
+            if not blade_ids:
+                raise ValidationError('功能刀具清单的BOM未配置[刀片]信息，请先配置BOM再开始组装！')
+            if not pad_ids:
+                raise ValidationError('功能刀具清单的BOM未配置[刀盘]信息，请先配置BOM再开始组装！')
+            return {'options': options, 'handle_ids': handle_ids, 'blade_ids': blade_ids, 'pad_ids': pad_ids}
+        else:
+            raise ValidationError(f'功能刀具清单BOM的组装方式错误：【{options}】')
+
+    def set_tool_lot(self):
+        # 获取BOM的刀具物料产品信息
+        tool_data = self._get_inventory_bom(self.tool_inventory_id)
+
+        # 获取刀具类型
+        tool_type = self.env.context.get('tool_type')
+
+        if tool_type == '刀柄':
+            tool_material_ids = tool_data.get('handle_ids')
+            tool_material_tree_id = self.env.ref('sf_tool_management.view_tool_product_tree')
+        elif tool_type == '整体式刀具':
+            tool_material_ids = self._get_all_material_location_lot(tool_data.get('integral_ids'))
+            tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_1')
+        elif tool_type == '刀片':
+            tool_material_ids = self._get_all_material_location_lot(tool_data.get('blade_ids'))
+            tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_2')
+        elif tool_type == '刀杆':
+            tool_material_ids = self._get_all_material_location_lot(tool_data.get('bar_ids'))
+            tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_3')
+        else:
+            tool_material_ids = self._get_all_material_location_lot(tool_data.get('pad_ids'))
+            tool_material_tree_id = self.env.ref('sf_tool_management.view_shelf_location_lot_tree_4')
+
+        if tool_type == '刀柄':
+            return {
+                "type": "ir.actions.act_window",
+                "res_model": "product.product",
+                "views": [[tool_material_tree_id.id, "tree"],
+                          [self.env.ref('sf_tool_management.view_tool_product_search').id, "search"]],
+                "target": "new",
+                "domain": [('id', 'in', tool_material_ids.ids)],
+                "context": {'tool_id': self.id}
+            }
+        elif tool_type in ['整体式刀具', '刀片', '刀杆', '刀盘']:
+            return {
+                "type": "ir.actions.act_window",
+                "res_model": "sf.shelf.location.lot",
+                "views": [[tool_material_tree_id.id, "tree"]],
+                "target": "new",
+                "domain": [('id', 'in', tool_material_ids.ids)],
+                "context": {'tool_id': self.id}
+            }
+
+    def _get_all_material_location_lot(self, material_ids):
+        """ 获取所有满足条件 """
+        location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
+        stock_quant_ids = self.env['stock.quant'].sudo().search(
+            [('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids if material_ids else []),
+             ('quantity', '>', '0')])
+        lot_ids = []
+        for stock_quant_id in stock_quant_ids:
+            lot_ids.append(stock_quant_id.lot_id.id)
+        location_lots = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', 'in', lot_ids)])
+        return location_lots
+
+    def functional_tool_assembly(self):
+        """
+        功能刀具确认组装
+        :return:
+        """
+        logging.info('功能刀具开始组装！')
+        # 对物料做必填判断
+        self.materials_must_be_judged()
+
+        product_id = self.env['product.product']
+        # 创建组装入库单
+        # 创建功能刀具批次/序列号记录
+        stock_lot = product_id.create_assemble_warehouse_receipt(self)
+        # 封装功能刀具数据，用于创建功能刀具记录
+        desc_2 = self.get_desc(stock_lot, self)
+        # 创建功能刀具组装入库单
+        self.env['stock.picking'].create_tool_stocking_picking(stock_lot, self)
+        # 创建刀具物料出库单
+        self.env['stock.picking'].create_tool_stocking_picking1(self)
+
+        # ============================创建功能刀具列表、安全库存记录===============================
+        # 创建功能刀具列表记录
+        record_1 = self.env['sf.functional.cutting.tool.entity'].create(desc_2)
+        # 创建安全库存信息
+        self.env['sf.real.time.distribution.of.functional.tools'].create_or_edit_safety_stock({
+            'functional_name_id': self.tool_inventory_id.id
+        }, record_1)
+
+        # =====================修改功能刀具组装单、机床换刀申请、CAM工单程序用刀计划的状态==============
+        if self.sf_machine_table_tool_changing_apply_id:
+            # 修改机床换刀申请的状态
+            self.env['sf.machine.table.tool.changing.apply'].sudo().search([
+                ('id', '=', self.sf_machine_table_tool_changing_apply_id.id)
+            ]).write({'status': '3'})
+        elif self.sf_cam_work_order_program_knife_plan_id:
+            # 修改CAM工单程序用刀计划状态
+            cam_plan = self.env['sf.cam.work.order.program.knife.plan'].sudo().search([
+                ('id', '=', self.sf_cam_work_order_program_knife_plan_id.id)
+            ])
+            cam_plan.write({'plan_execute_status': '2'})
+
+        # ============修改组装单状态为已组装=================================‘
         self.write({
-            'after_assembly_tool_loading_length': 0,
+            'assemble_status': '1',
-            'after_assembly_functional_tool_diameter': 0,
+            'start_preset_bool': False,
-            'after_assembly_knife_tip_r_angle': 0,
+            'tool_loading_person': self.env.user.name,
-            'start_preset_bool': True
+            'tool_loading_time': fields.Datetime.now()
         })
+
+        logging.info('功能刀具组装完成！')
+
+    def materials_must_be_judged(self):
+        """
+        功能刀具组装必填判断
+        """
+        # 物料准确性校验
+
+        # 物料必填校验
+        if not self.handle_code_id:
+            raise ValidationError('缺少【刀柄】物料信息！')
+        if self.integral_lot_id:
+            if not self.integral_verify:
+                raise ValidationError('【整体式刀具】未进行验证！')
+        elif self.blade_lot_id:
+            if not self.blade_verify:
+                raise ValidationError('【刀片】未进行验证！')
+            if self.bar_lot_id:
+                if not self.bar_verify:
+                    raise ValidationError('【刀杆】未进行验证！')
+            elif self.pad_lot_id:
+                if not self.pad_verify:
+                    raise ValidationError('【刀盘】未进行验证！')
+        # 组装参数必填校验
+        if self.after_assembly_max_lifetime_value == 0:
+            raise ValidationError('组装参数信息【最大寿命值】不能为0！')
+        if self.after_assembly_functional_tool_diameter <= 0:
+            raise ValidationError('组装参数信息【刀具直径】不能小于等于0！')
+        if self.after_assembly_tool_loading_length == 0:
+            raise ValidationError('组装参数信息【总长度】不能为0！！！')
+        if self.after_assembly_handle_length == 0:
+            raise ValidationError('组装参数信息【刀柄长度】不能为0！')
+        if self.after_assembly_tool_loading_length < self.after_assembly_handle_length:
+            raise ValidationError('组装参数信息【刀柄长度】不能大于【总长度】！')
+
+    def get_desc(self, stock_lot, functional_tool_assembly_id):
         return {
-            'type': 'ir.actions.act_window',
+            'barcode_id': stock_lot.id,
-            'res_model': 'sf.functional.tool.assembly.order',
+            'code': self.code,
-            'name': '功能刀具组装单',
+            'name': self.tool_inventory_id.name,
-            'view_mode': 'form',
+            'tool_name_id': self.tool_inventory_id.id,
-            'target': 'new',
+            'rfid': self.rfid,
-            'context': {'default_name': self.name,
+            'tool_groups_id': self.tool_groups_id.id,
-                        'default_assembly_order_code': self.assembly_order_code,
+            'functional_tool_name_id': functional_tool_assembly_id.id,
-                        'default_production_line_name_id': self.production_line_name_id.id,
+            'sf_cutting_tool_type_id': self.after_assembly_functional_tool_type_id.id,
-                        'default_machine_tool_name_id': self.machine_tool_name_id.id,
+            'cutting_tool_integral_model_id': self.integral_product_id.id,
-                        'default_cutter_spacing_code_id': self.cutter_spacing_code_id.id,
+            'cutting_tool_blade_model_id': self.blade_product_id.id,
-                        'default_functional_tool_name': self.functional_tool_name,
+            'cutting_tool_cutterbar_model_id': self.bar_product_id.id,
-                        'default_functional_tool_type_id': self.functional_tool_type_id.id,
+            'cutting_tool_cutterpad_model_id': self.pad_product_id.id,
-                        'default_tool_groups_id': self.tool_groups_id.id,
+            'cutting_tool_cutterhandle_model_id': self.handle_product_id.id,
-                        'default_functional_tool_diameter': self.functional_tool_diameter,
+            'cutting_tool_cutterhead_model_id': self.chuck_product_id.id,
-                        'default_knife_tip_r_angle': self.knife_tip_r_angle,
+
-                        'default_tool_loading_length': self.tool_loading_length,
+            'functional_tool_diameter': self.after_assembly_functional_tool_diameter,
-                        'default_functional_tool_length': self.functional_tool_length,
+            'knife_tip_r_angle': self.after_assembly_knife_tip_r_angle,
-                        'default_effective_length': self.effective_length,
+            'coarse_middle_thin': self.after_assembly_coarse_middle_thin,
-                        'default_whether_standard_knife': self.whether_standard_knife,
+            'new_former': self.after_assembly_new_former,
-                        'default_coarse_middle_thin': self.coarse_middle_thin,
+            'tool_loading_length': self.after_assembly_tool_loading_length,
-                        'default_new_former': self.new_former,
+            'handle_length': self.after_assembly_handle_length,
-                        'default_use_tool_time': self.use_tool_time,
+            'functional_tool_length': self.after_assembly_functional_tool_length,
-                        'default_reason_for_applying': self.reason_for_applying
+            'effective_length': self.after_assembly_effective_length,
-                        }
+
+            'max_lifetime_value': self.after_assembly_max_lifetime_value,
+            'alarm_value': self.after_assembly_alarm_value,
+            'used_value': self.after_assembly_used_value,
+            'whether_standard_knife': self.after_assembly_whether_standard_knife,
+            'L_D_number': self.L_D_number,
+            'hiding_length': self.hiding_length,
+            'cut_time': self.cut_time,
+            'cut_length': self.cut_length,
+            'cut_number': self.cut_number,
+            'image': self.image,
         }
 
+    # def put_start_preset(self):
+    #     # 打开组装弹窗开始组装
+    #     self.search([('start_preset_bool', '=', True)]).write({'start_preset_bool': False})
+    #     self.write({
+    #         'after_assembly_tool_loading_length': 0,
+    #         'after_assembly_functional_tool_diameter': 0,
+    #         'after_assembly_knife_tip_r_angle': 0,
+    #         'start_preset_bool': True
+    #     })
+    #     return {
+    #         'type': 'ir.actions.act_window',
+    #         'res_model': 'sf.functional.tool.assembly.order',
+    #         'name': '功能刀具组装单',
+    #         'view_mode': 'form',
+    #         'target': 'new',
+    #         'context': {'default_name': self.name,
+    #                     'default_assembly_order_code': self.assembly_order_code,
+    #                     'default_production_line_name_id': self.production_line_name_id.id,
+    #                     'default_machine_tool_name_id': self.machine_tool_name_id.id,
+    #                     'default_cutter_spacing_code_id': self.cutter_spacing_code_id.id,
+    #                     'default_functional_tool_name': self.functional_tool_name,
+    #                     'default_functional_tool_type_id': self.functional_tool_type_id.id,
+    #                     'default_tool_groups_id': self.tool_groups_id.id,
+    #                     'default_functional_tool_diameter': self.functional_tool_diameter,
+    #                     'default_knife_tip_r_angle': self.knife_tip_r_angle,
+    #                     'default_tool_loading_length': self.tool_loading_length,
+    #                     'default_functional_tool_length': self.functional_tool_length,
+    #                     'default_effective_length': self.effective_length,
+    #                     'default_whether_standard_knife': self.whether_standard_knife,
+    #                     'default_coarse_middle_thin': self.coarse_middle_thin,
+    #                     'default_new_former': self.new_former,
+    #                     'default_use_tool_time': self.use_tool_time,
+    #                     'default_reason_for_applying': self.reason_for_applying
+    #                     }
+    #     }
+
     def _get_code(self, loading_task_source):
         """
         自动生成组装单编码
@@ -622,6 +1090,8 @@ class FunctionalToolAssembly(models.Model):
             code = 'J' + datetime
         elif loading_task_source == '2':
             code = 'K' + datetime
+        elif loading_task_source == '3':
+            code = 'S' + datetime
         else:
             code = False
         functional_tool_assembly = self.env['sf.functional.tool.assembly'].sudo().search(
@@ -648,6 +1118,13 @@ class FunctionalToolAssembly(models.Model):
                 return functional_tool
         return False
 
+    bool_preset_parameter = fields.Boolean('', default=False)
+
+    def get_tool_preset_parameter(self):
+        if not self.bool_preset_parameter:
+            raise ValidationError('没有获取到测量数据, 请确认刀具预调仪操作是否正确！')
+        return True
+
     def assemble_single_print(self):
         """
         todo 组装单打印
@@ -1032,6 +1509,47 @@ class FunctionalToolDismantle(models.Model):
             })
         logging.info('【%s】刀具拆解成功！' % self.name)
 
+        # ==================根据条件创建功能刀具组装单=======================
+        # 如果报废原因为【寿命到期报废】并且刀柄不报废时， 创建功能刀具组装单
+        if self.dismantle_cause in ['寿命到期报废'] and not self.scrap_boolean:
+            # 创建组装单
+            assembly_id = self.env['sf.functional.tool.assembly'].sudo().create({
+                'functional_tool_name': self.functional_tool_id.name,
+                'handle_code_id': self.handle_lot_id.id,
+                'handle_product_id': self.handle_product_id.id,
+                'loading_task_source': '3',
+                'use_tool_time': fields.Datetime.now() + timedelta(hours=4),
+                'reason_for_applying': '刀具寿命到期'
+            })
+
+            return {
+                'type': 'ir.actions.act_window',
+                'res_model': 'sf.functional.tool.assembly',
+                'view_type': 'form',
+                'view_mode': 'form',
+                'res_id': assembly_id.id,
+                # 'target': 'new'
+            }
+            #     {
+            #     'type': 'ir.actions.client',
+            #     'tag': 'display_notification',
+            #     'params': {
+            #         'title': '组装单创建完成',
+            #         'message': '请组装同名称的功能刀具',
+            #         'type': 'info'
+            #     }
+            # }
+
+            # 'params': {
+            #     'title': _('The following replenishment order has been generated'),
+            #     'message': '%s',
+            #     'links': [{
+            #         'label': order.display_name,
+            #         'url': f'#action={action.id}&id={order.id}&model=purchase.order',
+            #     }],
+            #     'sticky': False,
+            # }
+
     def create_tool_picking_scrap(self, datas):
         scrap_data = datas['scrap']
         picking_data = datas['picking']

sf_tool_management/models/functional_cutting_tool_model.py

@@ -3,4 +3,4 @@ from odoo import models, fields
 
 class SyncFunctionalCuttingToolModel(models.Model):
     _inherit = 'sf.functional.cutting.tool.model'
-    cutting_tool_type_ids = fields.Many2many('sf.cutting.tool.type', string='适用刀具物料类型', required=True)
+    cutting_tool_type_ids = fields.Many2many('sf.cutting.tool.type', string='适用刀具物料类型')

sf_tool_management/models/jikimo_bom.py

@@ -30,13 +30,27 @@ class jikimo_bom(models.Model):
         return result
 
     def check_types_in_list(self):
-        # 统计每个元素的类型
+        """
-        type_counts = Counter(item.cutting_tool_material_id.name for item in self.product_ids)
+          检查产品列表中的元素是否包含了所有指定的类型，并且每种类型至少出现一次。
-        return all(count > 0 for count in type_counts.values()) and len(type_counts) == self.options.split('+')
+          :return: 如果条件满足返回True，否则返回False
+        """
+        if not self.product_ids:
+            return False
+        try:
+            # 统计每个类型的出现次数
+            type_counts = Counter(item.cutting_tool_material_id.name for item in self.product_ids)
+
+            # 检查是否每种类型的出现次数都大于0，并且类型的数量与选项字符串中的数量相等
+            return all(count > 0 for count in type_counts.values()) and len(type_counts) == len(self.options.split('+'))
+        except AttributeError:
+            # 如果出现属性错误，说明产品列表中的元素可能缺少必要的属性
+            return False
+        # type_counts = Counter(item.cutting_tool_material_id.name for item in self.product_ids)
+        # return all(count > 0 for count in type_counts.values()) and len(type_counts) == self.options.split('+')
 
     def write(self, vals):
         # 在更新模型时记录旧的 Many2many ID 列表
-        if 'product_ids' in vals:
+        if 'product_ids' in vals and not self.env.context.get('is_assembly_options'):
             old_product_counter = Counter(self.product_ids.ids)
             super(jikimo_bom, self).write(vals)
             new_product_counter = Counter(self.product_ids.ids)
@@ -47,9 +61,15 @@ class jikimo_bom(models.Model):
                     return True
                 else:
                     raise UserError('每种物料最少要有一个')
+            return True
         return super(jikimo_bom, self).write(vals)
 
     def bom_product_domains(self, assembly_options):
+        """
+    根据装配选项生成产品域列表
+    :param assembly_options: 装配选项字符串，各选项以'+'分隔
+    :return: 动态生成的产品搜索条件
+        """
         self.options = assembly_options
         cutting_tool_materials = self.env['sf.cutting.tool.material'].search(
             [('name', 'in', assembly_options.split('+'))])
@@ -64,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)]
@@ -82,23 +102,25 @@ class jikimo_bom(models.Model):
             domains = domains + domain
             if index != 0:
                 domains = ['|'] + domains
-            # wqwqwe = self.env['product.product'].search(ddd)
+        domains = domains + [('stock_move_ids', '!=',False)]
-            # product = self.env['product.product'].search(domain)
-            # if product:
-            #     products = products + product
-        domains = domains + [('stock_move_count', '>', 0)]
         return domains
 
     def generate_bill_materials(self, assembly_options):
+        """
+    生成物料清单
+
+    根据装配选项生成物料清单，首先获取产品领域，然后搜索相关产品，并设置产品ID。
+
+    :param assembly_options: 组装方式
+    :type assembly_options: 装配选项字符串，各选项以'+'分隔
+        """
         domains = self.bom_product_domains(assembly_options)
         products = self.env['product.product'].search(domains)
         if products:
-            self.product_ids = [Command.set(products.ids)]
+            new_context = dict(self.env.context)
-            # if option.name == '刀盘':
+            new_context['is_assembly_options'] = True
-            #     hilt = self.env['product.product'].search(
+            self.with_context(new_context).write({'product_ids': [Command.set(products.ids)]})
-            #         [('cutting_tool_blade_diameter', '=', self.tool_inventory_id.diameter),
+            # self.product_ids = [Command.set(products.ids)]
-            #          ('cutting_tool_material_id', '=', option.id)])
-            #     self.product_ids = [Command.set(hilt.ids)]k
 
 
 class jikimo_bom_line(models.Model):
@@ -111,15 +133,15 @@ class jikimo_bom_line(models.Model):
 class ProductProduct(models.Model):
     _inherit = 'product.product'
     _order = 'cutting_tool_material_id, cutting_tool_type_id'
-    stock_move_count = fields.Integer(string='stock_move count', compute='_compute_stock_move_count', store=True)
+    # stock_move_count = fields.Integer(string='stock_move count', compute='_compute_stock_move_count')
-
+    #
-    @api.depends('stock_move_ids')
+    # @api.depends('stock_move_ids')
-    def _compute_stock_move_count(self):
+    # def _compute_stock_move_count(self):
-        for record in self:
+    #     for record in self:
-            if record.stock_move_ids:
+    #         if record.stock_move_ids:
-                record.stock_move_count = len(record.stock_move_ids)
+    #             record.stock_move_count = len(record.stock_move_ids)
-            else:
+    #         else:
-                record.stock_move_count = 0
+    #             record.stock_move_count = 0
 
     def search(self, args, offset=0, limit=None, order=None, count=False):
         # 你可以在这里修改 `args` 以调整搜索条件

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('创建制造订单无效刀检测结果记录！')
+                        if not production_id.detection_result_ids.filtered(
-                        production_id.detection_result_ids.create({
+                                lambda a: (a.processing_panel == key and a.detailed_reason == '无效功能刀具'
-                            'production_id': production_id.id,
+                                           and a.handle_result == '待处理' and a.routing_type == 'CNC加工'
-                            'processing_panel': key,
+                                           and a.rework_reason == 'programming' and a.test_results == '返工')):
-                            'routing_type': 'CNC加工',
+                            logging.info('创建制造订单无效刀检测结果记录！')
-                            'rework_reason': 'programming',  # 原因：编程(programming)
+                            production_id.detection_result_ids.create({
-                            'detailed_reason': '无效功能刀具',
+                                'production_id': production_id.id,
-                            'test_results': '返工',
+                                'processing_panel': key,
-                            'handle_result': '待处理'
+                                '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)