零件图纸,质检标准显示位置修改

Merge Request: 修改无功能刀具原因话术

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1434

jikimo_account_process/__manifest__.py

@@ -3,8 +3,8 @@
     'name': "jikimo_account_process",
 
     'summary': """
-        Short (1 phrase/line) summary of the module's purpose, used as
-        subtitle on modules listing or apps.openerp.com""",
+        处理会计凭证生成重复名称报错问题
+        """,
 
     'description': """
         Long description of module's purpose

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/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.css

@@ -1,41 +1,99 @@
-.zoomed {
-  position: fixed !important;
-  top: 50%;
-  left: 50%;
-  transform: translate(-50%, -50%) scale(10);
+
+.processing-capabilities-grid {
+    display: grid;
+    grid-template-columns: repeat(6, 1fr);
+    gap: 10px;
+    width: 100%;
 }
 
-.many2many_flex {
-  display: flex;
+.grid-item {
+    display: flex;
+    align-items: center;
 }
 
-.many2many_flex>div {
-  margin-right: 15px;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
+.item-content {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    text-align: center;
+}
+/*控制图片大小*/
+.item-icon {
+    width: 50px;
+    height: 50px;
+    margin-bottom: 5px;
 }
 
-.many2many_flex>div>:nth-child(2) {
-  position: relative;
+.item-label {
+    font-size: 12px;
+    word-break: break-word;
 }
 
-.close {
-  width: 20px;
-  height: 20px;
-  position: absolute;
-  top: -8.8px;
-  right: -8.8px;
-  color: #fff;
-  background-color: #000;
-  opacity: 0;
-  text-align: center;
-  line-height: 20px;
-  font-size: 18px;
+@media (max-width: 1200px) {
+    .processing-capabilities-grid {
+        grid-template-columns: repeat(4, 1fr);
+    }
 }
 
-.img_close {
-  opacity: 1;
-  transform: scale(0.1);
-  cursor: pointer;
+@media (max-width: 768px) {
+    .processing-capabilities-grid {
+        grid-template-columns: repeat(3, 1fr);
+    }
+}
+
+@media (max-width: 480px) {
+    .processing-capabilities-grid {
+        grid-template-columns: repeat(2, 1fr);
+    }
+}
+.image-preview-container {
+    position: fixed;
+    top: 0;
+    left: 0;
+    width: 100%;
+    height: 100%;
+    background-color: rgba(0, 0, 0, 0.9);
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    z-index: 1000;
+    opacity: 0;
+    transition: opacity 0.3s ease;
+}
+
+.image-preview-container.show {
+    opacity: 1;
+}
+
+.image-preview {
+    max-width: 90%;
+    max-height: 90%;
+    object-fit: contain;
+    box-shadow: 0 0 20px rgba(255, 255, 255, 0.2);
+    border-radius: 5px;
+    transform: scale(0.9);
+    transition: transform 0.3s ease;
+}
+
+.image-preview-container.show .image-preview {
+    transform: scale(1);
+}
+
+.image-preview-close {
+    position: absolute;
+    top: 20px;
+    right: 30px;
+    color: #fff;
+    font-size: 40px;
+    font-weight: bold;
+    transition: 0.3s;
+    cursor: pointer;
+    opacity: 0.7;
+}
+
+.image-preview-close:hover,
+.image-preview-close:focus {
+    opacity: 1;
+    text-decoration: none;
+    cursor: pointer;
 }

jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.js

@@ -4,35 +4,57 @@ import {Many2ManyCheckboxesField} from "@web/views/fields/many2many_checkboxes/m
 import {registry} from "@web/core/registry";
 
 export class MyCustomWidget extends Many2ManyCheckboxesField {
-    // 你可以重写或者添加一些方法和属性
-    // 例如，你可以重写setup方法来添加一些事件监听器或者初始化一些变量
     setup() {
-        super.setup(); // 调用父类的setup方法
-        // 你自己的代码
+        super.setup();
     }
 
-    onImageClick(event) {
-        // 放大图片逻辑
-        // 获取图片元素
-        const img = event.target;
-        const close = img.nextSibling;
+    onImageClick(event, src) {
+        event.preventDefault();
+        event.stopPropagation();
 
-        // 实现放大图片逻辑
-        // 比如使用 CSS 放大
-        img.parentElement.classList.add('zoomed');
-        close.classList.add('img_close');
-    }
+        // 创建预览框
+        const previewContainer = document.createElement('div');
+        previewContainer.className = 'image-preview-container';
 
-    onCloseClick(event) {
-        const close = event.target;
-        const img = close.previousSibling;
-        img.parentElement.classList.remove('zoomed');
-        close.classList.remove('img_close');
+        const previewImg = document.createElement('img');
+        previewImg.src = src;
+        previewImg.className = 'image-preview';
+        // 设置放大的预览图片大小
+        previewImg.style.width = '600px';
+        previewImg.style.height = 'auto'; // 保持宽高比
+
+        const closeButton = document.createElement('span');
+        closeButton.innerHTML = '×';
+        closeButton.className = 'image-preview-close';
+
+        previewContainer.appendChild(previewImg);
+        previewContainer.appendChild(closeButton);
+        document.body.appendChild(previewContainer);
+
+        // 添加关闭预览的事件监听器
+        const closePreview = () => {
+            previewContainer.classList.remove('show');
+            setTimeout(() => {
+                document.body.removeChild(previewContainer);
+            }, 300);
+        };
+
+        closeButton.addEventListener('click', closePreview);
+
+        // 点击预览框外部也可以关闭
+        previewContainer.addEventListener('click', (e) => {
+            if (e.target === previewContainer) {
+                closePreview();
+            }
+        });
+
+        // 使用 setTimeout 来触发过渡效果
+        setTimeout(() => {
+            previewContainer.classList.add('show');
+        }, 10);
     }
 }
 
 MyCustomWidget.template = "jikimo_frontend.MyCustomWidget";
-// MyCustomWidget.supportedTypes = ['many2many'];
-
-registry.category("fields").add("custom_many2many_checkboxes", MyCustomWidget);
 
+registry.category("fields").add("custom_many2many_checkboxes", MyCustomWidget);

jikimo_frontend/static/src/fields/custom_many2many_checkboxes/custom_many2many_checkboxes.xml

@@ -2,27 +2,22 @@
 <templates xml:space="preserve">
 
     <t t-name="jikimo_frontend.MyCustomWidget" owl="1">
-        <div aria-atomic="true" class="many2many_flex">
+        <div aria-atomic="true" class="many2many_flex processing-capabilities-grid">
             <t t-foreach="items" t-as="item" t-key="item[0]">
-                <div>
+                <div class="grid-item">
                     <CheckBox
                             value="isSelected(item)"
                             disabled="props.readonly"
                             onChange="(ev) => this.onChange(item[0], ev)"
                     >
-                        <t t-esc="item[1]"/>
-
+                        <div class="item-content">
+                            <img t-att-src="item[2]" class="item-icon" t-on-click="(ev) => this.onImageClick(ev, item[2])"/>
+                            <span class="item-label"><t t-esc="item[1]"/></span>
+                        </div>
                     </CheckBox>
-                    <div t-on-dblclick="onImageClick">
-                    <t>
-                        <img t-att-src="item[2]" width="50" height="50"/>
-                        <div class="close" t-on-click="onCloseClick">×</div>
-                    </t>
                 </div>
-                </div>
-
             </t>
         </div>
     </t>
 
-</templates>
+</templates>

jikimo_frontend/static/src/scss/custom_style.scss

@@ -108,6 +108,10 @@ td.o_required_modifier {
 }
 
 .color_3 {
+  background-color: #808080;
+}
+
+.color_4 {
   background-color: rgb(255, 150, 0);
 }
 

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_hide_options/models/models.py

@@ -324,4 +324,4 @@ def unlink(self):
 
 
 BaseModel._create = _create
-BaseModel.unlink = unlink
+# BaseModel.unlink = unlink

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"/>

jikimo_workorder_exception/__init__.py

@@ -0,0 +1,4 @@
+# -*- coding: utf-8 -*-
+
+from . import models
+from . import controllers

jikimo_workorder_exception/__manifest__.py

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': '机企猫 工单异常记录',
+    'version': '1.0',
+    'summary': '记录工单的异常日志',
+    'sequence': 1,
+    'category': 'sf',
+    'website': 'https://www.sf.jikimo.com',
+    'depends': ['sf_manufacturing', 'sf_mrs_connect'],
+    'data': [
+        'views/mrp_workorder_views.xml',
+        'security/ir.model.access.csv',
+    ],
+    'demo': [
+    ],
+    'license': 'LGPL-3',
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+}

jikimo_workorder_exception/controllers/__init__.py

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

jikimo_workorder_exception/controllers/main.py

@@ -0,0 +1,89 @@
+from odoo import http, fields
+from odoo.http import request
+import json
+import logging
+from odoo.addons.sf_mrs_connect.controllers.controllers import Sf_Mrs_Connect
+from odoo.addons.sf_manufacturing.controllers.controllers import Manufacturing_Connect
+
+_logger = logging.getLogger(__name__)
+
+class WorkorderExceptionConroller(http.Controller):
+
+    @http.route('/AutoDeviceApi/BillError', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def workder_exception(self, **kw):
+        """
+            记录工单异常
+        :param kw:
+        :return:
+        """
+        _logger.info('workder_exception:%s' % kw)
+        try:
+            res = {'Succeed': True, 'ErrorCode': 0, 'Error': ''}
+            datas = request.httprequest.data
+            ret = json.loads(datas)
+            if not ret.get('RfidCode') or not ret.get('coding'):
+                res = {'Succeed': False, 'ErrorCode': 400, 'Error': '参数错误'}
+                return json.JSONEncoder().encode(res)
+            
+            # 通过RfidCode获取就绪的CNC工单
+            workorder = request.env['mrp.workorder'].sudo().search([
+                ('rfid_code', '=', ret['RfidCode']),
+                ('routing_type', '=', 'CNC加工'),
+            ])
+            if not workorder:
+                res = {'Succeed': False, 'ErrorCode': 401, 'Error': '无效的工单'}
+                return json.JSONEncoder().encode(res)
+            
+            # 创建工单异常记录,关联工单
+            request.env['jikimo.workorder.exception'].sudo().create({
+                'workorder_id': workorder.id,
+                'exception_code': ret.get('coding'),
+                'exception_content': ret.get('Error', '')
+            })
+ 
+        except Exception as e:
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
+            _logger.info('workder_exception error:%s' % e)
+        return json.JSONEncoder().encode(res)
+
+
+class SfMrsConnectController(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):
+        """
+            更新工单异常记录【'YC001', 'YC004'】
+        """
+        res = super(SfMrsConnectController, self).get_cnc_processing_create(**kw)
+        # 如果有未完成的YC0001、YC0004异常记录，则标记为完成
+        res = json.loads(res)
+        _logger.info('已进入工单异常:%s' % res)
+        if res.get('production_ids'):
+            try:
+                productions = request.env['mrp.production'].sudo().search([('id', 'in', res.get('production_ids'))])
+                if productions.workorder_ids:
+                    productions.workorder_ids.handle_exception(['YC0001', 'YC0004'])
+            except Exception as e:
+                _logger.info('更新工单异常记录失败:%s' % e)
+        return json.JSONEncoder().encode(res)
+    
+class ManufactruingController(Manufacturing_Connect):
+
+    @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+                cors="*")
+    def button_Work_START(self, **kw):
+        """
+            更新工单异常记录【'YC0002', 'YC0003'】
+        """
+        res = super(ManufactruingController, self).button_Work_START(**kw)
+        res = json.loads(res)
+        _logger.info('已进入工单异常:%s' % res)
+        if res.get('workorder_id'):
+            try:
+                workorder = request.env['mrp.workorder'].sudo().browse(int(res.get('workorder_id')))
+                workorder.handle_exception(['YC0002', 'YC0003'])
+            except Exception as e:
+                _logger.info('更新工单异常记录失败:%s' % e)
+        return json.JSONEncoder().encode(res)

jikimo_workorder_exception/models/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import jikimo_workorder_exception
+from . import mrp_workorder

jikimo_workorder_exception/models/jikimo_workorder_exception.py

@@ -0,0 +1,14 @@
+from odoo import models, fields
+
+
+class JikimoWorkorderException(models.Model):
+    _name = 'jikimo.workorder.exception'
+    _description = '工单异常记录'
+    _order = 'id desc'
+
+    workorder_id = fields.Many2one('mrp.workorder', string='工单')
+    exception_code = fields.Char('异常编码')
+    exception_content = fields.Char('反馈的异常/问题信息')
+    completion_time = fields.Datetime('处理完成时间')
+    state = fields.Selection([('pending', '进行中'), ('done', '已处理')], string='状态', default='pending')
+    

jikimo_workorder_exception/models/mrp_workorder.py

@@ -0,0 +1,40 @@
+from odoo import models, fields
+import logging
+
+_logger = logging.getLogger(__name__)
+
+class MrpWorkorder(models.Model):
+    _inherit = 'mrp.workorder'
+
+    exception_ids = fields.One2many('jikimo.workorder.exception', 'workorder_id', string='工单异常记录')
+
+    def write(self, values):
+        if values.get('test_results') and self.exception_ids:
+            pending_exception = self.exception_ids.filtered(
+                lambda exc: exc.state == 'pending' and exc.exception_code == 'YC0005'
+            )
+            if pending_exception:
+                pending_exception.write({
+                    'completion_time': fields.Datetime.now(),
+                    'state': 'done'
+                })
+        return super(MrpWorkorder, self).write(values)
+    
+    def handle_exception(self, exception_codes):
+        """
+            处理异常
+            :param exception_codes: 需要处理的异常编码列表
+        """
+        if not isinstance(exception_codes, list):
+            exception_codes = [exception_codes]
+        if self.exception_ids:
+            _logger.info('workorder.exception_ids:%s' % self.exception_ids)
+            pending_exception = self.exception_ids.filtered(
+                lambda exc: exc.state == 'pending' and exc.exception_code in exception_codes
+            )
+            _logger.info('pending_exception:%s' % pending_exception)
+            if pending_exception:
+                pending_exception.write({
+                    'completion_time': fields.Datetime.now(),
+                    'state': 'done'
+                })

jikimo_workorder_exception/security/ir.model.access.csv

@@ -0,0 +1,2 @@
+"id","name","model_id:id","group_id:id","perm_read","perm_write","perm_create","perm_unlink"
+"access_jikimo_workorder_exception","access.jikimo.workorder.exception","model_jikimo_workorder_exception","mrp.group_mrp_user",1,1,1,0

jikimo_workorder_exception/tests/__init__.py

@@ -0,0 +1,2 @@
+from . import common
+from . import test_jikimo_workorder_exception

jikimo_workorder_exception/tests/common.py

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo import fields, Command
+from odoo.tests.common import TransactionCase, HttpCase, tagged, Form
+
+import json
+import time
+import base64
+from lxml import etree
+
+@tagged('post_install', '-at_install')
+class TestJikimoWorkorderExceptionCommon(TransactionCase):
+
+    def setUp(self):
+        super(TestJikimoWorkorderExceptionCommon, self).setUp()
+        # 获取名字为“1#自动生产线”的制造中心
+        workcenter = self.env['mrp.workcenter'].search([('name', '=', '1#自动生产线')], limit=1)
+        # 创建一个产品
+        product_product = self.env['product.product'].create({
+            'name': '测试产品',
+            'type': 'product',
+            })
+        uom_unit = self.env.ref('uom.product_uom_unit')
+        # 创建一个bom
+        self.bom = self.env['mrp.bom'].create({
+            'product_id': product_product.id,
+            'product_tmpl_id': product_product.product_tmpl_id.id,
+            'product_uom_id': uom_unit.id,
+            'product_qty': 1.0,
+            'type': 'normal',
+         })
+        # 创建一个制造订单
+        self.production = self.env['mrp.production'].create({
+            'name': 'Test Production',
+            'product_id': product_product.id,
+            'bom_id': self.bom.id,
+            'company_id': self.env.ref('base.main_company').id,
+        })
+        # 创建一个测试工单
+        self.workorder = self.env['mrp.workorder'].create({
+            'name': 'Test order',
+            'workcenter_id': workcenter.id,
+            'product_uom_id': self.bom.product_uom_id.id,
+            'production_id': self.production.id,
+            'duration_expected': 1.0,
+            'rfid_code': 'test-123456',
+            'routing_type': 'CNC加工'
+        })

jikimo_workorder_exception/tests/test_jikimo_workorder_exception.py

@@ -0,0 +1,53 @@
+import json
+from datetime import datetime
+from odoo.addons.jikimo_workorder_exception.tests.common import TestJikimoWorkorderExceptionCommon
+
+class TestJikimoWorkorderException(TestJikimoWorkorderExceptionCommon):
+
+    def test_create_exception_record(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0001',
+            'exception_content': '无CNC编程'
+        })
+       
+        self.assertTrue(exception_record)
+        self.assertEqual(exception_record.exception_content, '无CNC编程')
+        self.assertEqual(exception_record.workorder_id.id, self.workorder.id)
+        self.assertEqual(exception_record.exception_code, 'YC0001')
+
+    def test_handle_exception(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0001',
+            'exception_content': '无CNC编程'
+        })
+        self.workorder.handle_exception('YC0001')
+        self.assertEqual(exception_record.state, 'done')
+        # 判断完成时间是否为当前分钟
+        self.assertEqual(exception_record.completion_time.minute, datetime.now().minute)
+
+    def test_handle_exception_with_invalid_code(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0001',
+            'exception_content': '无CNC编程'
+        })
+        self.workorder.handle_exception(['YC0002', 'YC0004'])
+        self.assertEqual(exception_record.state, 'pending')
+        self.assertEqual(exception_record.completion_time, False) 
+    
+
+    def test_handle_exception_with_test_results(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0005',
+            'exception_content': '工单加工失败'
+        })
+        self.workorder.write({
+            'test_results': '返工',
+            'reason': 'cutter',
+            'detailed_reason': '刀坏了',
+        })
+        self.assertEqual(exception_record.state, 'done')
+        self.assertEqual(exception_record.completion_time.minute, datetime.now().minute)

jikimo_workorder_exception/views/mrp_workorder_views.xml

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<odoo>
+    <data>
+        <record id="jikimo_workorder_exception_form_view_inherit" model="ir.ui.view">
+            <field name="name">mrp.workorder.form</field>
+            <field name="model">mrp.workorder</field>
+            <field name="inherit_id" ref="mrp.mrp_production_workorder_form_view_inherit"/>
+            <field name="arch" type="xml">
+                <xpath expr="//notebook/page[last()]" position="after">
+                    <page string="异常记录" name="workorder_exception" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
+                        <field name="exception_ids" nolabel="1" readonly="1">
+                            <tree create="false" delete="false" edit="false">
+                                <field name="exception_content" string="反馈的异常/问题信息"/>
+                                <field name="create_date" string="时间"/>
+                                <field name="completion_time"/>
+                            </tree>
+                        </field>
+                    </page>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>

jikimo_workorder_exception_notify/__init__.py

@@ -1 +1,4 @@
 # -*- coding: utf-8 -*-
+
+from . import models
+

jikimo_workorder_exception_notify/__manifest__.py

@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+{
+    'name': '机企猫 工单异常消息通知',
+    'version': '1.0',
+    'summary': '当产生工单异常时，发送消息通知',
+    'sequence': 1,
+    'category': 'sf',
+    'website': 'https://www.sf.jikimo.com',
+    'depends': ['jikimo_workorder_exception', 'jikimo_message_notify'],
+    'data': [
+        'data/bussiness_node.xml',
+        'data/template_data.xml',
+        # 'security/ir.model.access.csv',
+    ],
+    'demo': [
+    ],
+    'license': 'LGPL-3',
+    'installable': True,
+    'application': False,
+    'auto_install': False,
+}

jikimo_workorder_exception_notify/data/bussiness_node.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data noupdate="1">
+        <record id="bussiness_no_functional_tool" model="jikimo.message.bussiness.node">
+            <field name="name">无功能刀具</field>
+            <field name="model">jikimo.workorder.exception</field>
+        </record>
+        <record id="bussiness_no_position_data" model="jikimo.message.bussiness.node">
+            <field name="name">无定位数据</field>
+            <field name="model">jikimo.workorder.exception</field>
+        </record>
+        <record id="bussiness_processing_failure" model="jikimo.message.bussiness.node">
+            <field name="name">加工失败</field>
+            <field name="model">jikimo.workorder.exception</field>
+        </record>
+    </data>
+</odoo>

jikimo_workorder_exception_notify/data/template_data.xml

@@ -0,0 +1,38 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data noupdate="1">
+        <record id="template_no_function_tool" model="jikimo.message.template">
+            <field name="name">生产线无功能刀具提醒</field>
+            <field name="model_id" ref="jikimo_workorder_exception_notify.model_jikimo_workorder_exception"/>
+            <field name="model">jikimo.workorder.exception</field>
+            <field name="bussiness_node_id" ref="bussiness_no_functional_tool"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">urgent</field>
+            <field name="content">### 生产线无功能刀具提醒
+单号：工单[{{workorder_id.production_id.name}}]({{url}})
+原因：生产线无加工程序要用的功能刀具</field>
+        </record>
+        <record id="template_no_position_data" model="jikimo.message.template">
+            <field name="name">工单无定位数据提醒</field>
+            <field name="model_id" ref="jikimo_workorder_exception_notify.model_jikimo_workorder_exception"/>
+            <field name="model">jikimo.workorder.exception</field>
+            <field name="bussiness_node_id" ref="bussiness_no_position_data"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">urgent</field>
+            <field name="content">### 工单无定位数据提醒
+单号：工单[{{workorder_id.production_id.name}}]({{url}})
+原因：无装夹定位测量数据</field>
+        </record>
+        <record id="template_processing_failure" model="jikimo.message.template">
+            <field name="name">工单加工失败提醒</field>
+            <field name="model_id" ref="jikimo_workorder_exception_notify.model_jikimo_workorder_exception"/>
+            <field name="model">jikimo.workorder.exception</field>
+            <field name="bussiness_node_id" ref="bussiness_processing_failure"/>
+            <field name="msgtype">markdown</field>
+            <field name="urgency">urgent</field>
+            <field name="content">### 工单加工失败提醒
+单号：工单[{{workorder_id.production_id.name}}]({{url}})
+原因：加工失败，工件下产线处理</field>
+        </record>
+    </data>
+</odoo>

jikimo_workorder_exception_notify/models/__init__.py

@@ -0,0 +1,3 @@
+# -*- coding: utf-8 -*-
+from . import jikimo_message_template
+from . import jikimo_workorder_exception

jikimo_workorder_exception_notify/models/jikimo_message_template.py

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

jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py

@@ -0,0 +1,61 @@
+from odoo import models, api
+from odoo.addons.sf_base.commons.common import Common
+import requests, logging
+
+_logger = logging.getLogger(__name__)
+
+
+class JikimoWorkorderException(models.Model):
+    _name = 'jikimo.workorder.exception'
+    _inherit = ['jikimo.workorder.exception', 'jikimo.message.dispatch']
+
+    @api.model_create_multi
+    def create(self, vals_list):
+        res = super(JikimoWorkorderException, self).create(vals_list)
+        # 根据异常编码发送消息提醒
+        try:    
+            for rec in res:
+                if rec.exception_code == 'YC0001':
+                    # 无CNC程序，调用cloud接口
+                    data = {'name': rec.workorder_id.production_id.programming_no, 'exception_code': 'YC0001'}
+                    configsettings = self.env['res.config.settings'].sudo().get_values()
+                    config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+                    url = '/api/message/workorder_exception'
+                    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('无CNC程序异常消息推送接口:%s' % ret)
+                elif rec.exception_code == 'YC0002':
+                    # 无功能刀具
+                    rec.add_queue('无功能刀具')
+                elif rec.exception_code == 'YC0003':
+                    # 无定位数据
+                    rec.add_queue('无定位数据') 
+                elif rec.exception_code == 'YC0004':
+                    # 无FTP文件，调用cloud接口
+                    data = {'name': rec.workorder_id.production_id.programming_no, 'exception_code': 'YC0004'}
+                    configsettings = self.env['res.config.settings'].sudo().get_values()
+                    config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
+                    url = '/api/message/workorder_exception'
+                    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('无FTP文件异常消息推送接口:%s' % ret)
+                elif rec.exception_code == 'YC0005':
+                    # 加工失败
+                    rec.add_queue('加工失败') 
+        except Exception as e:
+            _logger.error('异常编码发送消息提醒失败：%s' % e)
+        return res
+
+    def _get_message(self, message_queue_ids):
+        contents = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
+        url = self.env['ir.config_parameter'].get_param('web.base.url')
+        action_id = self.env.ref('mrp.mrp_production_action').id
+        for index, content in enumerate(contents):
+            exception_id = self.env['jikimo.workorder.exception'].browse(message_queue_ids[index].res_id)
+            url = url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
+            contents[index] = content.replace('{{url}}', url)
+        return contents

jikimo_workorder_exception_notify/tests/__init__.py

@@ -0,0 +1,2 @@
+from . import common
+from . import test_jikimo_workorder_exception_notify

jikimo_workorder_exception_notify/tests/common.py

@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+# Part of Odoo. See LICENSE file for full copyright and licensing details.
+from odoo import fields, Command
+from odoo.tests.common import TransactionCase, HttpCase, tagged, Form
+
+import json
+import time
+import base64
+from lxml import etree
+
+@tagged('post_install', '-at_install')
+class TestJikimoWorkorderExceptionNotifyCommonNotify(TransactionCase):
+
+    def setUp(self):
+        super(TestJikimoWorkorderExceptionNotifyCommonNotify, self).setUp()
+        # 获取最后一个工单
+        self.workorder = self.env['mrp.workorder'].search([], order='id desc', limit=1)
+        

jikimo_workorder_exception_notify/tests/test_jikimo_workorder_exception_notify.py

@@ -0,0 +1,113 @@
+import json
+from datetime import datetime
+from odoo.addons.jikimo_workorder_exception_notify.tests.common import TestJikimoWorkorderExceptionNotifyCommonNotify
+
+class TestJikimoWorkorderExceptionNotify(TestJikimoWorkorderExceptionNotifyCommonNotify):
+
+    def test_create_message_template(self):
+        self.assertTrue(self.env['jikimo.message.template'].search([
+            ('name', '=', '生产线无功能刀具提醒'),
+            ('model', '=', 'jikimo.workorder.exception')
+        ]))
+        self.assertTrue(self.env['jikimo.message.template'].search([
+            ('name', '=', '工单无定位数据提醒'),
+            ('model', '=', 'jikimo.workorder.exception')
+        ]))
+        self.assertTrue(self.env['jikimo.message.template'].search([
+            ('name', '=', '工单加工失败提醒'),
+            ('model', '=', 'jikimo.workorder.exception')
+        ]))
+
+    def test_create_message_queue_yc0001(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0001',
+            'exception_content': '无CNC程序'
+        })
+
+        message_record = self.env['jikimo.message.queue'].search([
+            ('res_id', '=', exception_record.id),
+            ('model', '=', 'jikimo.workorder.exception'),
+            ('message_status', '=', 'pending')
+        ])
+        self.assertFalse(message_record)
+
+    def test_create_message_queue_yc0002(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0002',
+            'exception_content': '无功能刀具'
+        })
+
+        bussiness_node = self.env['jikimo.message.bussiness.node'].search([
+            ('name', '=', '无功能刀具'),
+            ('model', '=', 'jikimo.workorder.exception')
+        ])
+
+        message_template = self.env['jikimo.message.template'].search([
+            ('bussiness_node_id', '=', bussiness_node.id),
+            ('model', '=', 'jikimo.workorder.exception')
+        ])
+
+        message_record = self.env['jikimo.message.queue'].search([
+            ('res_id', '=', exception_record.id),
+            ('model', '=', 'jikimo.workorder.exception'),
+            ('message_status', '=', 'pending'),
+            ('message_template_id', '=', message_template.id)
+        ])
+        self.assertTrue(message_record)
+
+    def test_create_message_queue_yc0003(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0003',
+            'exception_content': '无定位数据'
+        })
+
+        bussiness_node = self.env['jikimo.message.bussiness.node'].search([
+            ('name', '=', '无定位数据'),
+            ('model', '=', 'jikimo.workorder.exception')
+        ])
+
+        message_template = self.env['jikimo.message.template'].search([
+            ('bussiness_node_id', '=', bussiness_node.id),
+            ('model', '=', 'jikimo.workorder.exception')
+        ])
+
+        message_record = self.env['jikimo.message.queue'].search([
+            ('res_id', '=', exception_record.id),
+            ('model', '=', 'jikimo.workorder.exception'),
+            ('message_status', '=', 'pending'),
+            ('message_template_id', '=', message_template.id)
+        ])
+        self.assertTrue(message_record)
+    
+    def test_create_message_queue_yc0004(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0004',
+            'exception_content': '无CNC程序'
+        })
+
+        message_record = self.env['jikimo.message.queue'].search([
+            ('res_id', '=', exception_record.id),
+            ('model', '=', 'jikimo.workorder.exception'),
+            ('message_status', '=', 'pending')
+        ])
+        self.assertFalse(message_record)
+
+    def test_get_message(self):
+        exception_record = self.env['jikimo.workorder.exception'].create({
+            'workorder_id': self.workorder.id,
+            'exception_code': 'YC0002',
+            'exception_content': '无功能刀具'
+        })
+        message_queue_ids = self.env['jikimo.message.queue'].search([
+            ('res_id', '=', exception_record.id),
+            ('model', '=', 'jikimo.workorder.exception'),
+            ('message_status', '=', 'pending')
+        ])
+        message = self.env['jikimo.workorder.exception']._get_message(message_queue_ids)
+        self.assertTrue(message)
+
+    

mrp_workorder/models/mrp_production.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 # Part of Odoo. See LICENSE file for full copyright and licensing details.
 
-from odoo import fields, models
+from odoo import fields, models, api
 
 
 class MrpProduction(models.Model):
@@ -12,7 +12,8 @@ class MrpProduction(models.Model):
     check_ids = fields.One2many('quality.check', 'production_id', string="Checks")
 
     def _split_productions(self, amounts=False, cancel_remaining_qty=False, set_consumed_qty=False):
-        productions = super()._split_productions(amounts=amounts, cancel_remaining_qty=cancel_remaining_qty, set_consumed_qty=set_consumed_qty)
+        productions = super()._split_productions(amounts=amounts, cancel_remaining_qty=cancel_remaining_qty,
+                                                 set_consumed_qty=set_consumed_qty)
         backorders = productions[1:]
         if not backorders:
             return productions
@@ -20,3 +21,4 @@ class MrpProduction(models.Model):
             if wo.current_quality_check_id.component_id:
                 wo.current_quality_check_id._update_component_quantity()
         return productions
+

mrp_workorder/views/mrp_production_views.xml

@@ -1,41 +1,44 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
-        <!-- Manufacturing Order for Planing view -->
-        <record id="mrp_production_tree_view_planning" model="ir.ui.view">
-            <field name="name">mrp.production.tree.inherit.planning</field>
-            <field name="model">mrp.production</field>
-            <field name="arch" type="xml">
-                <tree default_order="date_planned_start asc" decoration-info="state=='confirmed'" decoration-danger="date_planned_start&lt;current_date and state not in ('done','cancel')" decoration-muted="state in ('done','cancel')" string="Manufacturing Orders" name="Production">
-                    <field name="message_needaction" invisible="1"/>
-                    <field name="name"/>
-                    <field name="date_planned_start"/>
-                    <field name="product_id"/>
-                    <field name="product_qty" sum="Total Qty" string="Quantity"/>
-                    <field name="product_uom_id" string="Unit of Measure" options="{'no_open':True,'no_create':True}" groups="uom.group_uom"/>
-                    <field name="reservation_state" string="Availability"/>
-                    <field name="origin"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
+    <!-- Manufacturing Order for Planing view -->
+    <record id="mrp_production_tree_view_planning" model="ir.ui.view">
+        <field name="name">mrp.production.tree.inherit.planning</field>
+        <field name="model">mrp.production</field>
+        <field name="arch" type="xml">
+            <tree default_order="date_planned_start asc" decoration-info="state=='confirmed'"
+                  decoration-danger="date_planned_start&lt;current_date and state not in ('done','cancel')"
+                  decoration-muted="state in ('done','cancel')" string="Manufacturing Orders" name="Production">
+                <field name="message_needaction" invisible="1"/>
+                <field name="name"/>
+                <field name="date_planned_start"/>
+                <field name="product_id"/>
+                <field name="product_qty" sum="Total Qty" string="Quantity"/>
+                <field name="product_uom_id" string="Unit of Measure" options="{'no_open':True,'no_create':True}"
+                       groups="uom.group_uom"/>
+                <field name="reservation_state" string="Availability"/>
+                <field name="origin"/>
+                <field name="state"/>
+            </tree>
+        </field>
+    </record>
 
-<!--    <record id="mrp_production_form_inherit_planning" model="ir.ui.view">-->
-<!--        <field name="name">mrp.production.form_inherit_planning</field>-->
-<!--        <field name="model">mrp.production</field>-->
-<!--        <field name="inherit_id" ref="mrp.mrp_production_form_view"/>-->
-<!--        <field name="arch" type="xml">-->
-<!--            <xpath expr="div[hasclass('oe_chatter')]" position="replace">-->
-<!--              &lt;!&ndash; 这里放置替换后的内容 &ndash;&gt;-->
-<!--            </xpath>-->
-<!--            <xpath expr="//notebook" position="after">-->
-<!--                <div class="oe_chatter">-->
-<!--                    <field name="message_follower_ids"/>-->
-<!--                    <field name="activity_ids"/>-->
-<!--                    <field name="message_ids"/>-->
-<!--                </div>-->
-<!--            </xpath>-->
-<!--        </field>-->
-<!--    </record>-->
+    <!--    <record id="mrp_production_form_inherit_planning" model="ir.ui.view">-->
+    <!--        <field name="name">mrp.production.form_inherit_planning</field>-->
+    <!--        <field name="model">mrp.production</field>-->
+    <!--        <field name="inherit_id" ref="mrp.mrp_production_form_view"/>-->
+    <!--        <field name="arch" type="xml">-->
+    <!--            <xpath expr="div[hasclass('oe_chatter')]" position="replace">-->
+    <!--              &lt;!&ndash; 这里放置替换后的内容 &ndash;&gt;-->
+    <!--            </xpath>-->
+    <!--            <xpath expr="//notebook" position="after">-->
+    <!--                <div class="oe_chatter">-->
+    <!--                    <field name="message_follower_ids"/>-->
+    <!--                    <field name="activity_ids"/>-->
+    <!--                    <field name="message_ids"/>-->
+    <!--                </div>-->
+    <!--            </xpath>-->
+    <!--        </field>-->
+    <!--    </record>-->
 
     <record id="mrp_production_view_search_inherit_planning" model="ir.ui.view">
         <field name="name">mrp.production.search.view.inherit.planning</field>
@@ -43,7 +46,9 @@
         <field name="inherit_id" ref="mrp.view_mrp_production_filter"/>
         <field name="arch" type="xml">
             <filter name="filter_planned" position="attributes">
-                <attribute name="domain">[('is_planned', '=', True), ('date_planned_start', '!=', False), ('date_planned_finished', '!=', False)]</attribute>
+                <attribute name="domain">[('is_planned', '=', True), ('date_planned_start', '!=', False),
+                    ('date_planned_finished', '!=', False)]
+                </attribute>
             </filter>
         </field>
     </record>
@@ -51,30 +56,33 @@
     <record id="production_order_unplan_server_action" model="ir.actions.server">
         <field name="name">Unplan orders</field>
         <field name="model_id" ref="mrp.model_mrp_production"/>
-        <field name="binding_model_id" ref="mrp.model_mrp_production" />
+        <field name="binding_model_id" ref="mrp.model_mrp_production"/>
         <field name="binding_view_types">list</field>
         <field name="state">code</field>
         <field name="code">records.button_unplan()</field>
     </record>
 
     <record id="mrp.act_product_mrp_production_workcenter" model="ir.actions.act_window">
-        <field name="domain">[('bom_id', '!=', False), ('bom_id.operation_ids.workcenter_id', '=', active_id), ('date_planned_start', '!=', False), ('date_planned_finished', '!=', False)]</field>
+        <field name="domain">[('bom_id', '!=', False), ('bom_id.operation_ids.workcenter_id', '=', active_id),
+            ('date_planned_start', '!=', False), ('date_planned_finished', '!=', False)]
+        </field>
         <field name="view_id" ref="mrp_production_tree_view_planning"/>
     </record>
 
+
     <menuitem id="mrp_workorder_menu_planning"
-        name="Work Orders"
-        sequence="2"
-        parent="mrp.mrp_planning_menu_root"
-        groups="mrp.group_mrp_routings"/>
+              name="Work Orders"
+              sequence="2"
+              parent="mrp.mrp_planning_menu_root"
+              groups="mrp.group_mrp_routings"/>
     <menuitem id="menu_mrp_workorder_production"
-        name="Planning by Production"
-        sequence="1"
-        action="mrp.action_mrp_workorder_production"
-        parent="mrp_workorder_menu_planning"/>
+              name="Planning by Production"
+              sequence="1"
+              action="mrp.action_mrp_workorder_production"
+              parent="mrp_workorder_menu_planning"/>
     <menuitem id="menu_mrp_workorder_workcenter"
-        name="Planning by Workcenter"
-        sequence="2"
-        action="mrp_workorder.action_mrp_workorder_dependencies_workcenter"
-        parent="mrp_workorder_menu_planning"/>
+              name="Planning by Workcenter"
+              sequence="2"
+              action="mrp_workorder.action_mrp_workorder_dependencies_workcenter"
+              parent="mrp_workorder_menu_planning"/>
 </odoo>

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"/>
 
@@ -1033,7 +1033,7 @@
             name="Overview"
             action="quality_alert_team_action"
             parent="menu_quality_root"
-            sequence="5"/>
+            sequence="5" active="False"/>
 
     <menuitem
             id="menu_quality_control"

requirements.txt

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

sf_base/controllers/controllers.py

@@ -38,3 +38,17 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('get_maintenance_tool_groups_Info error:%s' % e)
         return json.JSONEncoder().encode(res)
+
+
+class MultiInheritController():
+    _sub_classes = []
+
+    def __init_subclass__(cls):
+        """
+            多继承，解决多个字类时方法调用super的问题
+        """
+        super().__init_subclass__()
+        if len(cls._sub_classes) > 0 and cls not in cls._sub_classes:
+            cls.__bases__ = (cls._sub_classes[-1],)
+        if cls not in cls._sub_classes:
+            cls._sub_classes.append(cls)

sf_base/models/common.py

@@ -84,10 +84,12 @@ class MrsProductionProcessCategory(models.Model):
 class MrsProductionProcess(models.Model):
     _name = 'sf.production.process'
     _description = '表面工艺'
+    order = 'sequence asc'
 
     code = fields.Char("编码")
     name = fields.Char('名称')
     remark = fields.Text("备注")
+    sequence = fields.Integer('排序')
     # processing_order_ids = fields.One2many('sf.processing.order', 'production_process_id', string='工序')
     partner_process_ids = fields.Many2many('res.partner', 'process_ids', '加工工厂')
     active = fields.Boolean('有效', default=True)

sf_base/models/ir_sequence.py

@@ -19,7 +19,12 @@ class IrSequence(models.Model):
         # date mode
         dt = sequence_date or self._context.get('ir_sequence_date', fields.Date.today())
         seq_date = self.env['ir.sequence.date_range'].search(
-            [('sequence_id', '=', self.id), ('date_from', '<=', dt), ('date_to', '>=', dt)], limit=1)
+            [
+                ('sequence_id', '=', self.id),
+                ('date_from', '<=', dt),
+                ('date_to', '>=', dt),
+                ('date_range_period', '=', self.date_range_period)
+            ], limit=1)
         if not seq_date:
             if self.date_range_period:
                 seq_date = self._create_date_range_seq_by_period(dt, self.date_range_period)

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_base_new.py.rej

@@ -1,10 +0,0 @@
-diff a/sf_base/models/tool_base_new.py b/sf_base/models/tool_base_new.py	(rejected hunks)
-@@ -108,6 +108,4 @@
-     cutting_speed_ids = fields.One2many('sf.cutting.speed', 'standard_library_id', string='切削速度Vc')
--    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
--                                         domain=[('cutting_speed', '!=', False)])
--    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz',
--                                           domain=[('cutting_speed', '!=', False)])
-+    feed_per_tooth_ids = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
-+    feed_per_tooth_ids_3 = fields.One2many('sf.feed.per.tooth', 'standard_library_id', '每齿走刀量fz')
- 

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_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角度)', size=20)
+    blade_tip_diameter = fields.Float('刀尖直径(mm)')
+    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

@@ -0,0 +1,62 @@
+/** @odoo-module **/
+
+import { registry } from "@web/core/registry";
+import { barcodeGenericHandlers } from '@barcodes/barcode_handlers';
+import { patch } from "@web/core/utils/patch";
+
+// 定义新的 clickOnButton 函数
+function customClickOnButton(selector) {
+    console.log("This is the custom clickOnButton function!");
+
+    const buttons = document.body.querySelectorAll(selector);
+
+    let length = buttons.length;
+    if (length > 0) {
+        buttons[length - 1].click();
+    } else {
+        console.warn(`Button with selector ${selector} not found`);
+    }
+}
+
+patch(barcodeGenericHandlers, "start", {
+    start(env, { ui, barcode, notification }) {
+        // 使用新定义的 clickOnButton 函数
+        const COMMANDS = {
+            "O-CMD.EDIT": () => customClickOnButton(".o_form_button_edit"),
+            "O-CMD.DISCARD": () => customClickOnButton(".o_form_button_cancel"),
+            "O-CMD.SAVE": () => customClickOnButton(".o_form_button_save"),
+            "O-CMD.PREV": () => customClickOnButton(".o_pager_previous"),
+            "O-CMD.NEXT": () => customClickOnButton(".o_pager_next"),
+            "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) => {
+            const barcode = ev.detail.barcode;
+            if (barcode.startsWith("O-BTN.")) {
+                let targets = [];
+                try {
+                    targets = getVisibleElements(ui.activeElement, `[barcode_trigger=${barcode.slice(6)}]`);
+                } catch (_e) {
+                    console.warn(`Barcode '${barcode}' is not valid`);
+                }
+                for (let elem of targets) {
+                    elem.click();
+                }
+            }
+            if (barcode.startsWith("O-CMD.")) {
+                const fn = COMMANDS[barcode];
+                if (fn) {
+                    fn();
+                } else {
+                    notification.add(env._t("Barcode: ") + `'${barcode}'`, {
+                        title: env._t("Unknown barcode command"),
+                        type: "danger"
+                    });
+                }
+            }
+        });
+    }
+})

sf_base/static/src/js/remove_focus.js

@@ -5,9 +5,12 @@ import { registry } from '@web/core/registry';
 import { formView } from '@web/views/form/form_view';
 import { FormController } from '@web/views/form/form_controller';
 
+import { listView } from '@web/views/list/list_view';
+import { ListController } from '@web/views/list/list_controller'
+
 import { onRendered, onMounted } from "@odoo/owl";
 
-export class RemoveFocusController extends FormController {
+export class RemoveFocusFormController extends FormController {
     setup() {
         super.setup();
 
@@ -17,7 +20,23 @@ export class RemoveFocusController extends FormController {
     }
 }
 
-registry.category('views').add('remove_focus_view', {
+registry.category('views').add('remove_focus_form_view', {
     ...formView,
-    Controller: RemoveFocusController,
+    Controller: RemoveFocusFormController,
+});
+
+
+export class RemoveFocusListController extends ListController {
+    setup() {
+        super.setup();
+
+        onMounted(() => {
+            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
+        })
+    }
+}
+
+registry.category('views').add('remove_focus_list_view', {
+    ...listView,
+    Controller: RemoveFocusListController,
 });

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/base_view.xml

@@ -109,7 +109,7 @@
         <field name="name">form.sf.machine_tool.type</field>
         <field name="model">sf.machine_tool.type</field>
         <field name="arch" type="xml">
-              <form string="机床型号" delete="0">
+            <form string="机床型号" delete="0">
                 <sheet>
                     <div class="oe_title">
                         <h1>
@@ -129,31 +129,28 @@
                             <field name="machine_tool_picture" widget="image" nolabel="1"/>
                         </group>
                     </group>
-                     <group string="加工能力">
+                    <group string="加工能力">
                         <div>
-                             <field name='jg_image_id' widget="custom_many2many_checkboxes">
+                            <field name='jg_image_id' widget="custom_many2many_checkboxes">
+                                <tree>
+                                    <field name="name"/>
+                                    <field name="image" widget="image"/>
 
-                            <tree>
-                                <field name="name"/>
-                                <field name="image" widget="image"
-                                       options="{'size': [100, 100], 'click enlarge': True}"/>
-
-                            </tree>
-                        </field>
+                                </tree>
+                            </field>
                         </div>
 
                     </group>
                     <group string="冷却方式">
                         <div>
-                             <field name='lq_image_id' widget="custom_many2many_checkboxes">
+                            <field name='lq_image_id' widget="custom_many2many_checkboxes">
 
-                            <tree>
-                                <field name="name"/>
-                                <field name="image" widget="image"
-                                       options="{'size': [100, 100], 'click enlarge': True}"/>
+                                <tree>
+                                    <field name="name"/>
+                                    <field name="image" widget="image"/>
 
-                            </tree>
-                        </field>
+                                </tree>
+                            </field>
                         </div>
 
                     </group>
@@ -178,7 +175,7 @@
                                         <field name="workbench_H" class="o_address_zip" required="1"
                                                options="{'format': false}"/>
                                     </div>
-                                     <field name="workpiece_load"/>
+                                    <field name="workpiece_load"/>
                                     <label for="machine_tool_L" string="机床尺寸(mm)"/>
                                     <div class="test_model">
                                         <label for="machine_tool_L" string="长"/>
@@ -192,7 +189,7 @@
                                         <field name="machine_tool_H" class="o_address_zip"
                                                options="{'format': false}"/>
                                     </div>
-                                     <label for="T_trough_num" string="T型槽尺寸:"/>
+                                    <label for="T_trough_num" string="T型槽尺寸:"/>
                                     <div class="test_model">
                                         <label for="T_trough_num" string="槽数"/>
                                         <field name="T_trough_num" class="o_address_zip"
@@ -205,20 +202,20 @@
                                         <field name="T_trough_distance" class="o_address_zip"
                                                options="{'format': false}"/>
                                     </div>
-<!--                                    <field name="feed_speed" required="1"/>-->
-<!--                                    <label for="precision_min" string="X轴定位精度(mm)"/>-->
-<!--                                    <div class="test_model">-->
-<!--                                        <label for="precision_min" string="最小(min)"/>-->
-<!--                                        <field name="precision_min" class="o_address_zip" required="1"-->
-<!--                                               options="{'format': false}"/>-->
-<!--                                        <span>&amp;nbsp;</span>-->
-<!--                                        <label for="precision_max" string="最大(max)"/>-->
-<!--                                        <field name="precision_max" class="o_address_zip" required="1"-->
-<!--                                               options="{'format': false}"/>-->
-<!--                                    </div>-->
+                                    <!--                                    <field name="feed_speed" required="1"/>-->
+                                    <!--                                    <label for="precision_min" string="X轴定位精度(mm)"/>-->
+                                    <!--                                    <div class="test_model">-->
+                                    <!--                                        <label for="precision_min" string="最小(min)"/>-->
+                                    <!--                                        <field name="precision_min" class="o_address_zip" required="1"-->
+                                    <!--                                               options="{'format': false}"/>-->
+                                    <!--                                        <span>&amp;nbsp;</span>-->
+                                    <!--                                        <label for="precision_max" string="最大(max)"/>-->
+                                    <!--                                        <field name="precision_max" class="o_address_zip" required="1"-->
+                                    <!--                                               options="{'format': false}"/>-->
+                                    <!--                                    </div>-->
 
-<!--                                    <field name="lead_screw" required="1"/>-->
-<!--                                    <field name="guide_rail" required="1"/>-->
+                                    <!--                                    <field name="lead_screw" required="1"/>-->
+                                    <!--                                    <field name="guide_rail" required="1"/>-->
                                     <field name="number_of_axles" required="1" widget="radio"
                                            options="{'horizontal': true}"/>
                                     <label for="x_axis" string="加工行程(mm)"
@@ -258,7 +255,7 @@
                                 </group>
                                 <group string="主轴">
                                     <field name="taper_type_id" required="1"/>
-                                     <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
+                                    <label for="distance_min" string="主轴端面-工作台距离(mm)"/>
                                     <div class="test_model">
                                         <label for="distance_min" string="最小(min)"/>
                                         <field name="distance_min" class="o_address_zip"
@@ -268,7 +265,7 @@
                                         <field name="distance_max" class="o_address_zip"
                                                options="{'format': false}"/>
                                     </div>
-                                     <field name="rotate_speed" string="主轴最高转速(r/min)"
+                                    <field name="rotate_speed" string="主轴最高转速(r/min)"
                                            options="{'format': false}"/>
                                     <field name="spindle_center_distance"/>
                                     <field name="spindle_continuous_power"/>
@@ -286,50 +283,50 @@
                         <page string="进给/精度参数">
                             <group>
                                 <group string="进给参数">
-                                     <field name="X_axis_rapid_traverse_speed"/>
-                                     <field name="Y_axis_rapid_traverse_speed"/>
-                                     <field name="Z_axis_rapid_traverse_speed"/>
-                                     <field name="a_axis_rapid_traverse_speed"/>
-                                     <field name="b_axis_rapid_traverse_speed"/>
-                                     <field name="c_axis_rapid_traverse_speed"/>
-                                     <field name="straight_cutting_feed_rate"/>
-                                     <field name="rotary_cutting_feed_rate"/>
+                                    <field name="X_axis_rapid_traverse_speed"/>
+                                    <field name="Y_axis_rapid_traverse_speed"/>
+                                    <field name="Z_axis_rapid_traverse_speed"/>
+                                    <field name="a_axis_rapid_traverse_speed"/>
+                                    <field name="b_axis_rapid_traverse_speed"/>
+                                    <field name="c_axis_rapid_traverse_speed"/>
+                                    <field name="straight_cutting_feed_rate"/>
+                                    <field name="rotary_cutting_feed_rate"/>
                                 </group>
                                 <group string="精度参数">
-                                     <field name="X_precision"/>
-                                     <field name="X_precision_repeat"/>
-                                     <field name="Y_precision"/>
-                                     <field name="Y_precision_repeat"/>
-                                     <field name="Z_precision"/>
-                                     <field name="Z_precision_repeat"/>
-                                     <field name="a_precision"/>
-                                     <field name="a_precision_repeat"/>
-                                     <field name="b_precision"/>
-                                     <field name="b_precision_repeat"/>
-                                     <field name="c_precision"/>
-                                     <field name="c_precision_repeat"/>
+                                    <field name="X_precision"/>
+                                    <field name="X_precision_repeat"/>
+                                    <field name="Y_precision"/>
+                                    <field name="Y_precision_repeat"/>
+                                    <field name="Z_precision"/>
+                                    <field name="Z_precision_repeat"/>
+                                    <field name="a_precision"/>
+                                    <field name="a_precision_repeat"/>
+                                    <field name="b_precision"/>
+                                    <field name="b_precision_repeat"/>
+                                    <field name="c_precision"/>
+                                    <field name="c_precision_repeat"/>
                                 </group>
                             </group>
                         </page>
-                                <page string="刀库参数">
-                                    <group>
+                        <page string="刀库参数">
+                            <group>
                                 <group string="刀具">
-<!--                                    <field name="knife_type" required="1"/>-->
+                                    <!--                                    <field name="knife_type" required="1"/>-->
                                     <field name="number_of_knife_library" required="1" options="{'format': false}"/>
-<!--                                    <field name="tool_speed" required="1"/>-->
+                                    <!--                                    <field name="tool_speed" required="1"/>-->
                                     <field name="tool_full_diameter_max"/>
                                     <field name="tool_perimeter_diameter_max"/>
                                     <field name="tool_long_max"/>
-<!--                                    <label for="tool_diameter_min" string="刀具刀径(mm)"/>-->
-<!--                                    <div class="test_model">-->
-<!--                                        <label for="tool_diameter_min" string="最小(min)"/>-->
-<!--                                        <field name="tool_diameter_min" class="o_address_zip" required="1"-->
-<!--                                               options="{'format': false}"/>-->
-<!--                                        <span>&amp;nbsp;</span>-->
-<!--                                        <label for="tool_diameter_max" string="最大(max)"/>-->
-<!--                                        <field name="tool_diameter_max" class="o_address_zip" required="1"-->
-<!--                                               options="{'format': false}"/>-->
-<!--                                    </div>-->
+                                    <!--                                    <label for="tool_diameter_min" string="刀具刀径(mm)"/>-->
+                                    <!--                                    <div class="test_model">-->
+                                    <!--                                        <label for="tool_diameter_min" string="最小(min)"/>-->
+                                    <!--                                        <field name="tool_diameter_min" class="o_address_zip" required="1"-->
+                                    <!--                                               options="{'format': false}"/>-->
+                                    <!--                                        <span>&amp;nbsp;</span>-->
+                                    <!--                                        <label for="tool_diameter_max" string="最大(max)"/>-->
+                                    <!--                                        <field name="tool_diameter_max" class="o_address_zip" required="1"-->
+                                    <!--                                               options="{'format': false}"/>-->
+                                    <!--                                    </div>-->
                                     <field name="tool_quality_max"/>
                                     <field name="T_tool_time"/>
                                     <field name="C_tool_time"/>

sf_base/views/common_view.xml

@@ -12,7 +12,6 @@
                 </tree>
             </field>
         </record>
-
         <record model="ir.ui.view" id="mrs_production_process_parameter_form">
             <field name="model">sf.production.process.parameter</field>
             <field name="arch" type="xml">
@@ -26,19 +25,19 @@
                         <group>
                             <group>
                                 <field name="code" readonly="1"/>
-                                <field name="process_id" readonly="1"/>
-                                <field name="process_description" readonly="1"/>
+                                <field name="process_id" attrs="{'readonly': [('code', '!=', False)]}"/>
+                                <field name="process_description" attrs="{'readonly': [('code', '!=', False)]}"/>
                                 <field name="gain_way"/>
                             </group>
                             <group>
-                                <field name="processing_day" readonly="1"/>
-                                <field name="travel_day" readonly="1"/>
-                                <field name="processing_mm" readonly="1"/>
+                                <field name="processing_day" attrs="{'readonly': [('code', '!=', False)]}"/>
+                                <field name="travel_day" attrs="{'readonly': [('code', '!=', False)]}"/>
+                                <field name="processing_mm" attrs="{'readonly': [('code', '!=', False)]}"/>
                             </group>
                         </group>
                         <notebook>
                             <page string="适用材料">
-                                <field name="materials_model_ids" readonly="1"></field>
+                                <field name="materials_model_ids" attrs="{'readonly': [('code', '!=', False)]}"></field>
                             </page>
                         </notebook>
                     </sheet>
@@ -165,7 +164,7 @@
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
                 <tree string="表面工艺" create="0" edit="0" delete="0">
-                    <field name="sequence" widget="handle" string="序号"  readonly="1"/>
+                    <field name="sequence"  string="加工顺序"  readonly="1"/>
                     <field name="code"/>
                     <field name="name" string="名称"/>
                     <field name="remark"/>

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

@@ -80,10 +80,10 @@
             <field name="name">sf.cutter.function.tree</field>
             <field name="model">sf.functional.cutting.tool.model</field>
             <field name="arch" type="xml">
-                <tree string="功能刀具类型" create="0" delete="0" edit="1">
-                    <field name="name" string="名称"/>
-                    <field name="code"/>
-                    <field name="remark"/>
+                <tree string="功能刀具类型" create="0" delete="0" edit="1" editable="bottom">
+                    <field name="name" string="名称" readonly="1"/>
+                    <field name="code" readonly="1"/>
+                    <field name="remark" readonly="1"/>
                 </tree>
             </field>
         </record>
@@ -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
@@ -17,6 +18,11 @@ class StatusChange(models.Model):
         logging.info('函数已经执行=============')
         server_product_none = []
         for order in self.order_line:
+            gain_way_no = order.product_template_id.model_process_parameters_ids.filtered(lambda a: not a.gain_way)
+            if gain_way_no:
+                process_parameters = [item.name for item in gain_way_no]
+                raise UserError(
+                    _("请先至【制造】-【配置】中【表面工艺可选参数】为【%s】填写获取方式", ", ".join(process_parameters)))
             for item in order.product_template_id.model_process_parameters_ids:
                 if item.gain_way == '外协':
                     server_product = self.env['product.template'].search(
@@ -25,27 +31,36 @@ class StatusChange(models.Model):
                     if not server_product:
                         server_product_none.append(item.name)
         if server_product_none:
-            raise UserError(_("请先至【产品】中创建【表面工艺参数】为%s的服务产品", ", ".join(server_product_none)))
+            raise UserError(_("请先至【产品】中创建【表面工艺参数】为【%s】的服务产品", ", ".join(server_product_none)))
 
         # 使用super()来调用原始方法（在本例中为'sale.order'模型的'action_confirm'方法）
-        res = super(StatusChange, self).action_confirm()
-
-        # 原有方法执行后，进行额外的操作（如调用外部API）
-        process_start_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
-        config = self.env['res.config.settings'].get_values()
-        json1 = {
-            'params': {
-                'model_name': 'jikimo.process.order',
-                'field_name': 'name',
-                'default_code': self.default_code,
-                'state': '加工中',
-                'process_start_time': process_start_time,
-            },
-        }
-        url1 = config['bfm_url_new'] + '/api/get/state/get_order'
-        requests.post(url1, json=json1, data=None)
-        logging.info('接口已经执行=============')
-
+        try:
+            res = super(StatusChange, self).action_confirm()
+            # 原有方法执行后，进行额外的操作（如调用外部API）
+            process_start_time = datetime.now().strftime('%Y-%m-%d %H:%M:%S')
+            config = self.env['res.config.settings'].get_values()
+            json1 = {
+                'params': {
+                    'model_name': 'jikimo.process.order',
+                    'field_name': 'name',
+                    'default_code': self.default_code,
+                    'state': '加工中',
+                    'process_start_time': process_start_time,
+                },
+            }
+            url1 = config['bfm_url_new'] + '/api/get/state/get_order'
+            ret = requests.post(url1, json=json1, data=None)
+            ret = ret.json()
+            if not ret.get('error'):
+                logging.info('接口已经执行=============')
+            else:
+                traceback_error = traceback.format_exc()
+                logging.error("bfm订单状态同步失败:%s" % traceback_error)
+                raise UserError('工厂加工同步订单状态到bfm失败')
+        except UserError as e:
+            traceback_error = traceback.format_exc()
+            logging.error("工厂加工同步订单状态失败:%s " % traceback_error)
+            raise UserError(e)
         return res
 
     def action_cancel(self):

sf_dlm/__manifest__.py

@@ -10,7 +10,7 @@
     """,
     'category': 'sf',
     'website': 'https://www.sf.jikimo.com',
-    'depends': ['sf_base', 'web_widget_model_viewer', 'mrp_subcontracting', 'purchase_stock', 'uom', ],
+    'depends': ['sf_base', 'mrp_subcontracting', 'purchase_stock', 'uom'],
     'data': [
         'data/product_data.xml',
         'data/uom_data.xml',

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,24 @@
                         '刀具')], 'required': True}
                     </attribute>
                 </xpath>
-<!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
-<!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
-<!--                        [('product_variant_count', '>' , 1)]}-->
-<!--                    </attribute>-->
-<!--                </xpath>-->
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="2D加工图纸">
+                        <field name='machining_drawings' attrs="{'invisible': [('categ_type', '!=', '成品')]}"
+                               widget="adaptive_viewer"/>
+                    </page>
+                </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="质检标准">
+                        <field name='quality_standard' attrs="{'invisible': [('categ_type', '!=', '成品')]}"
+                               widget="adaptive_viewer"/>
+
+                    </page>
+                </xpath>
+                <!--                <xpath expr="//field[@name='default_code']" position="attributes">-->
+                <!--                    <attribute name="attrs">{'readonly': [('categ_type', '=', '刀具')], 'invisible':-->
+                <!--                        [('product_variant_count', '>' , 1)]}-->
+                <!--                    </attribute>-->
+                <!--                </xpath>-->
             </field>
         </record>
 
@@ -185,6 +204,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

@@ -12,7 +12,7 @@
     'category': 'sf',
     'author': 'jikimo',
     'website': 'https://sf.cs.jikimo.com',
-    'depends': ['web', 'mail', 'sf_base', 'sf_manufacturing', 'barcodes', ],
+    'depends': ['web', 'sf_manufacturing', 'barcodes'],
     'data': [
         # 定义权限组放在最上面
         # 权限组
@@ -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/models/ftp_client.py

@@ -217,7 +217,7 @@ class Machine_ftp(models.Model):
     status = fields.Boolean('机床在线状态', readonly=True)
     # run_status = fields.Selection([('0', '空闲中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')], string='机床运行状态',
     #                               readonly=True, default='0')
-    run_status = fields.Char('机床运行状态', readonly=True)
+    # run_status = fields.Char('机床运行状态', readonly=True)
     run_time = fields.Char('机床累计运行时长', readonly=True)
     # 机床系统日期
     system_date = fields.Char('机床系统日期', readonly=True)
@@ -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/__manifest__.py

@@ -11,6 +11,7 @@
         'security/group_security.xml',
         'security/ir.model.access.csv',
         'security/ir_rule_data.xml',
+        'data/scheduled_actions.xml',
         'views/maintenance_logs_views.xml',
         'views/maintenance_equipment_oee_views.xml',
         'views/maintenance_views.xml',

sf_maintenance/data/scheduled_actions.xml

@@ -0,0 +1,14 @@
+<odoo>
+    <data noupdate="1">
+        <record id="ir_cron_oee_get_running_datas" model="ir.cron">
+            <field name="name">设备运行数据</field>
+            <field name="model_id" ref="model_maintenance_equipment_oee"/>
+            <field name="state">code</field>
+            <field name="code">model.get_running_datas()</field>
+            <field name="interval_number">15</field>
+            <field name="interval_type">minutes</field>
+            <field name="numbercall">-1</field>
+            <field name="active" eval="True"/>
+        </record>
+    </data>
+</odoo>

sf_maintenance/models/sf_equipment_maintenance_standards.py

@@ -24,6 +24,7 @@ class SfEquipmentSaintenanceStandards(models.Model):
     remark = fields.Char('备注')
     maintenance_type = fields.Selection([('保养', '保养'), ("检修", "检修")], string='类型', default='保养')
     name = fields.Char(string='名称')
+    active = fields.Boolean(default=True)
 
     @api.model_create_multi
     def create(self, vals_list):

sf_maintenance/models/sf_maintenance.py

@@ -38,8 +38,9 @@ class SfMaintenanceEquipment(models.Model):
 
     crea_url = "/api/machine_tool/create"
 
+    run_status = fields.Char('机床运行状态', readonly=True)
 
-    #AGV运行日志
+    # AGV运行日志
     agv_logs = fields.One2many('maintenance.equipment.agv.log', 'equipment_id', string='AGV运行日志')
     # 1212修改后的字段
     number_of_axles = fields.Selection(
@@ -117,7 +118,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 +179,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 +329,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 +371,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 +461,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 +751,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 +765,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='编码')
-    name = fields.Char(string='名称')
+    code = fields.Char(string='编码', readonly=True)
+    name = fields.Char(string='名称', compute='_compute_name')
     type = fields.Selection([('type1', '类型1'), ('type2', '类型2')], string='类型')
     brand = fields.Many2one('sf.machine.brand', related='maintenance_equipment_id.brand_id', string='品牌')
     maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='机台号')
@@ -28,3 +29,13 @@ class SfMaintenanceLogs(models.Model):
     fault_duration = fields.Float(string='故障时长')
     note = fields.Text(string='备注')
     active = fields.Boolean('Active', default=True)
+
+    @api.depends('code')
+    def _compute_name(self):
+        for record in self:
+            if record.code:
+                record.name = self.env['maintenance.equipment'].sudo().search([('code', '=', record.code), ('active', '=', True)]).name
+                record.maintenance_equipment_id = self.env['maintenance.equipment'].sudo().search([('code', '=', record.code), ('active', '=', True)]).id
+            else:
+                record.name = ''
+

sf_maintenance/models/sf_maintenance_oee.py

@@ -1,5 +1,48 @@
 # -*- 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
+    if time_str == 0:
+        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 +52,300 @@ 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)')
-    done_nums = fields.Integer('加工件数')
-    utilization_rate = fields.Char('可用率')
-    fault_time = fields.Float('故障时长')
-    fault_nums = fields.Integer('故障次数')
-    # 故障率
-    fault_rate = fields.Char('故障率')
+
+    online_time = fields.Char('开机时长(小时)', reaonly='True')
+
+    offline_time = fields.Char('关机时长(小时)', reaonly='True')
+    idle_nums = fields.Integer('待机次数', reaonly='True')
+    # 待机时长
+
+    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_running_datas(self):
+        base_url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
+        url_time = base_url + '/api/RunningTimeDetail'
+        cnc_list_obj = self.env['maintenance.equipment'].sudo().search(
+            [('function_type', '!=', False), ('active', '=', True)])
+        machine_list = list(map(lambda x: x.code, cnc_list_obj))
+        # print('machine_list: %s' % machine_list)
+
+        data_time = {
+            "machine_list": str(machine_list)
+        }
+        # 发送POST请求
+        response_time = requests.post(url_time, json={}, data=data_time)
+        # print(response_time.json())
+        if response_time.status_code == 200:
+            result_time = response_time.json()
+            if result_time['status'] == 1:
+                real_dict = result_time['data']
+                for key in real_dict:
+                    # print(key)
+                    equipment_obj = self.env['maintenance.equipment.oee'].sudo().search([('equipment_code', '=', key)])
+                    if real_dict[key]['power_on_time'] == 0:
+                        equipment_obj.online_time = 0
+                        equipment_obj.idle_time = 0
+                        equipment_obj.idle_rate = 0
+                        equipment_obj.work_rate = 0
+                        equipment_obj.fault_time = 0
+                        equipment_obj.fault_rate = 0
+                        equipment_obj.fault_nums = 0
+                        equipment_obj.idle_nums = 0
+                        equipment_obj.work_time = 0
+                    else:
+                        equipment_obj.online_time = round(convert_to_seconds(real_dict[key]['power_on_time']) / 3600, 2)
+                        equipment_obj.work_time = round(convert_to_seconds(real_dict[key]['cut_time']) / 3600, 2)
+                        equipment_obj.fault_nums = real_dict[key]['alarm_all_nums']
+                        equipment_obj.idle_nums = real_dict[key]['idle_count']
+                        equipment_obj.fault_time = round((float(real_dict[key]['alarm_all_time']) if real_dict[key][
+                            'alarm_all_time'] else 0) / 3600, 2)
+                        equipment_obj.idle_time = float(equipment_obj.online_time) - float(
+                            equipment_obj.work_time) if equipment_obj.online_time and equipment_obj.work_time else 0
+                        equipment_obj.idle_rate = round(
+                            float(equipment_obj.idle_time) / (
+                                float(equipment_obj.online_time) if equipment_obj.online_time else 1) * 100, 2)
+                        equipment_obj.work_rate = round(
+                            float(equipment_obj.work_time) / (
+                                float(equipment_obj.online_time) if equipment_obj.online_time else 1) * 100, 2)
+
+                        equipment_obj.fault_rate = round(
+                            float(equipment_obj.fault_time) / (
+                                float(equipment_obj.online_time) if equipment_obj.online_time else 1) * 100, 2)
+
+                    # 获取当前时间的时间戳
+                    current_timestamp = datetime.datetime.now().timestamp()
+                    # 机床上线时间段
+                    first_online_duration = current_timestamp - int(equipment_obj.equipment_id.first_online_time.timestamp())
+
+                    if equipment_obj.online_time:
+                        equipment_obj.offline_time = round((first_online_duration - float(equipment_obj.online_time)) / 3600, 2)
+                    else:
+                        equipment_obj.offline_time = False
+                    # equipment_obj.offline_time = equipment_obj.equipment_id.first_online_time - (
+                    #     float(equipment_obj.online_time) if equipment_obj.online_time else 0)
+
+    # 获取日志详情
+    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:
+                if real_dict['power_on_24_time'] == 0:
+                    self.online_time = 0
+                    self.idle_time = 0
+                    self.idle_rate = 0
+                    self.work_rate = 0
+                    self.fault_time = 0
+                    self.fault_rate = 0
+                    self.fault_nums = 0
+                    self.idle_nums = 0
+                    self.work_time = 0
+                else:
+                    self.online_time = round((convert_to_seconds(real_dict['power_on_time']) - convert_to_seconds(
+                        real_dict['power_on_24_time'])) / 3600, 2)
+                    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']
+                    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)
+
+        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 +414,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

@@ -6,15 +6,16 @@
         <field name="name">equipment.maintenance.standards.form</field>
         <field name="model">equipment.maintenance.standards</field>
         <field name="arch" type="xml">
-            <form string="设备维保标准">
+            <form string="设备维保标准" delete="false" duplicate="false">
                 <sheet>
                     <group>
-                    <group>
-                        <field name="code" readonly="1" force_save="1"/>
-                        <field name="name" readonly="1" force_save="1"/>
-                        <field name="maintenance_equipment_category_id" required="1" />
-                        <field name="eq_maintenance_ids" invisible='1'/>
-                        <field name="overhaul_ids" invisible='1'/>
+                        <group>
+                            <field name="active" invisible="1"/>
+                            <field name="code" readonly="1" force_save="1"/>
+                            <field name="name" readonly="1" force_save="1"/>
+                            <field name="maintenance_equipment_category_id" required="1"/>
+                            <field name="eq_maintenance_ids" invisible='1'/>
+                            <field name="overhaul_ids" invisible='1'/>
 
 
                     </group>
@@ -50,7 +51,8 @@
         <field name="name">equipment.maintenance.standards.tree</field>
         <field name="model">equipment.maintenance.standards</field>
         <field name="arch" type="xml">
-            <tree string="设备维保标准">
+            <tree string="设备维保标准" delete="false">
+                <field name="active" invisible="1"/>
                 <field name="code" readonly="1" force_save="1"/>
                 <field name="maintenance_type" required="1"/>
                 <field name="name" required="1"/>
@@ -77,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="run_time"/>
-                    <field name="done_nums"/>
-                    <field name="utilization_rate"/>
+                    <field name="online_time"/>
+                    <field name="work_time"/>
+                    <field name="work_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"/>
-                                <field name="equipment_time"/>
-                                <field name="run_time"/>
-                                <field name="done_nums"/>
-                                <field name="utilization_rate"/>
-                                <field name="fault_time"/>
-                                <field name="fault_nums"/>
+                                <group>
+                                    <field name="equipment_id" domain="[('name','ilike','加工中心')]"/>
+                                    <field name="type_id"/>
+                                    <field name="state"/>
+                                    <field name="equipment_code"/>
+                                </group>
                             </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> -->
-<!--                         <page string="运行日志"> -->
-<!--                             <field name="oee_logs"> -->
-<!--                                 <tree create="1" edit="1" delete="1" editable="bottom"> -->
-<!--                                     <field name = 'run_time'/> -->
-<!--                                     <field name = 'state'/> -->
-<!--                                     <field name = 'workorder_id'/> -->
-<!--                                     <field name = 'time'/> -->
-<!--                                     <field name = 'color' widget="color"/> -->
-<!--                                 </tree> -->
-<!--                             </field> -->
+<!--                         <page string="24H日志详情"> -->
+<!--                             <group> -->
+<!--                                 <button name="get_day_logs" type="object" string="查看24H日志" t-attf-style="white-space:nowrap;"/> -->
+<!--                             </group> -->
+<!--                             <field name="day_logs_detail" readonly="1" widget="html"/> -->
+<!--                             <field name="page_num"/> -->
+<!--                             <group> -->
+<!--                                 <group> -->
+<!--                                     <button name="previous_day_logs" type="object" string="上一页" t-attf-style="white-space:nowrap;"/> -->
+<!--                                 </group> -->
+<!--                                 <group> -->
+<!--                                     <button name="next_day_logs" type="object" string="下一页" t-attf-style="white-space:nowrap;"/> -->
+<!--                                 </group> -->
+<!--                             </group> -->
+
+
+<!--                             <field name="day_logs_detail"/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1"/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1" class="oe_form_field oe_form_field_html"/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1" class="oe_form_field oe_form_field_html" options='{"class": "o_form_readonly"}'/> -->
+<!--                             <field name="day_logs_detail" widget="html" nolabel="1" class="oe_form_field oe_form_field_html" options='{"class": "o_form_readonly", "readonly": true, "style": "width: 100%; height: 400px;"}'/> -->
+<!--                             <group> -->
+<!--                                 <div class="oe_html_field"> -->
+<!--                                     <div id="pagination_day_logs"> -->
+<!--                                         <button id="prev_page_day_logs" disabled="true">Previous</button> -->
+<!--                                         <button id="next_page_day_logs">Next</button> -->
+<!--                                     </div> -->
+<!--                                 </div> -->
+<!--                             </group> -->
 <!--                         </page> -->
-<!--                         </notebook> -->
+<!--                         <page string="历史日志详情"> -->
+<!--                             <group> -->
+<!--                                 <group> -->
+<!--                                     <group> -->
+<!--                                     <field name="begin_time"/> -->
+<!--                                     </group> -->
+<!--                                      <group> -->
+<!--                                     <field name="end_time"/> -->
+<!--                                     </group> -->
+<!--                                 </group> -->
+<!--                                 <group> -->
+<!--                                     <group> -->
+<!--                                         <button name="get_history_logs" type="object" string="查看历史日志" t-attf-style="white-space:nowrap;"/> -->
+<!--                                     </group> -->
+<!--                                     <group> -->
+<!--                                         <button name="download_history_logs" type="object" string="下载历史日志" t-attf-style="white-space:nowrap;"/> -->
+<!--                                     </group> -->
+<!--                                 </group> -->
+
+<!--                             </group> -->
+<!--                             <field name="history_logs_detail"/> -->
+<!--                         </page> -->
+<!--                     </notebook> -->
                     </sheet>
                 </form>
             </field>

sf_maintenance/views/maintenance_logs_views.xml

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

@@ -1142,14 +1142,16 @@
                         </div>
                         <div class="show_state" t-attf-class="oe_kanban_global_click o_kanban_record_has_image_fill o_hr_kanban_record oe_kanban_card oe_kanban_global_click
                         ">
-                            <div t-attf-class="#{record.state.raw_value == '正常' ? 'color_1' : ''}"></div>
-                            <div t-attf-class="#{record.state.raw_value == '故障' ? 'color_2' : ''}"></div>
-                            <div t-attf-class="#{record.state.raw_value == '不可用' ? 'color_3' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '运行中' ? 'color_1' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '待机' ? 'color_4' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '故障' ? 'color_2' : ''}"></div>
+                            <div t-attf-class="#{record.run_status.raw_value == '离线' ? 'color_3' : ''}"></div>
                             <p class="o_kanban_record_bottom state_zc"
-                               t-attf-class="#{record.state.raw_value == '正常' ? 'font_color_1' : ''}
-                        #{record.state.raw_value == '故障' ? 'font_color_2' : ''}
-                        #{record.state.raw_value == '不可用' ? 'font_color_3' : ''}">
-                                <field name="state"/>
+                               t-attf-class="#{record.run_status.raw_value == '运行中' ? 'font_color_1' : ''}
+                               #{record.run_status.raw_value == '待机' ? 'font_color_4' : ''}
+                        #{record.run_status.raw_value == '故障' ? 'font_color_2' : ''}
+                        #{record.run_status.raw_value == '离线' ? 'font_color_3' : ''}">
+                                <field name="run_status"/>
                             </p>
                         </div>
                     </div>
@@ -1230,5 +1232,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

@@ -32,6 +32,7 @@
         'views/model_type_view.xml',
         'views/agv_setting_views.xml',
         'views/sf_maintenance_equipment.xml',
+        'views/res_config_settings_views.xml',
     ],
     'assets': {
 

sf_manufacturing/controllers/controllers.py

@@ -189,6 +189,7 @@ class Manufacturing_Connect(http.Controller):
                 request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
                     {'actual_start_time': workorder.date_start,
                      'state': 'processing'})
+            res.update({'workorder_id': workorder.id})
 
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
@@ -595,14 +596,6 @@ class Manufacturing_Connect(http.Controller):
                                                 if panel_workorder:
                                                     panel_workorder.write({'production_line_state': '已下产线'})
                                                     workorder.write({'state': 'to be detected'})
-                                                # workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
-                                                #     [
-                                                #         ('rfid_code', '=', rfid_code), ('type', '=', '下产线'),
-                                                #         ('production_id', '=', order.production_id.id),
-                                                #         ('workorder_id', '=', order.id),
-                                                #         ('workorder_state', '=', 'done')])
-                                                # if workpiece_delivery:
-                                                #     delivery_Arr.append(workpiece_delivery.id)
                                     else:
                                         res = {'Succeed': False, 'ErrorCode': 204,
                                                'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
@@ -668,7 +661,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('AGVDownProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/AgvStationState', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/AgvStationState', type='json', auth='public', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def AGVStationState(self, **kw):
         """
@@ -695,4 +688,4 @@ class Manufacturing_Connect(http.Controller):
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': str(e)}
             logging.info('AGVDownProduct error:%s' % e)
-        return json.JSONEncoder().encode(res)
+        return json.JSONEncoder().encode(res)

sf_manufacturing/models/__init__.py

@@ -10,3 +10,4 @@ from . import res_user
 from . import production_line_base
 from . import agv_setting
 from . import agv_scheduling
+from . import res_config_setting

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(
-                lambda r: r.start_site_id == agv_scheduling.start_site_id and r.start_site_id == agv_scheduling.start_site_id
-            )
-            if task_route:
-                # 下发AGV调度任务并修改接驳站状态为占用
-                agv_scheduling.dispatch_scheduling(task_route)
+            for agv_scheduling in agv_schedulings:
+                # 找到所有起点接驳站匹配的路线
+                start_matched_task_routes = task_routes.filtered(
+                    lambda r: r.start_site_id == agv_scheduling.start_site_id
+                )
+                # 如果调度任务有终点接驳站，找到终点接驳站匹配的路线
+                if agv_scheduling.end_site_id:
+                    matched_task_routes = start_matched_task_routes.filtered(
+                        lambda r: r.end_site_id == agv_scheduling.end_site_id
+                    )
+                else:
+                    matched_task_routes = start_matched_task_routes
+                if matched_task_routes:
+                    # 下发AGV调度任务并修改接驳站状态为占用
+                    agv_scheduling.dispatch_scheduling(matched_task_routes[0])
+                    break;
 
     def _delivery_avg(self):
         config = self.env['res.config.settings'].get_values()
@@ -231,7 +240,9 @@ class AgvScheduling(models.Model):
             rec.site_state = '空闲'
             rec.end_site_id = agv_task_route.end_site_id.id
             rec.agv_route_id = agv_task_route.id
-            # rec._delivery_avg()
+            is_agv_task_dispatch = self.env['ir.config_parameter'].sudo().get_param('is_agv_task_dispatch')
+            if is_agv_task_dispatch:
+                rec._delivery_avg()
             # 更新接驳站状态
             rec.env['sf.agv.site'].update_site_state({rec.end_site_id.name: '占用'}, False)
 
@@ -263,3 +274,18 @@ class ResMrpWorkOrder(models.Model):
         'sf_agv_scheduling_mrp_workorder_ref',
         string='AGV调度',
         domain=[('state', '!=', '已取消')])
+
+    def get_down_product_agv_scheduling(self):
+        """
+            获取关联的制造订单下产线的agv任务
+        """
+        self.ensure_one()
+        workorder_ids = self.production_id.workorder_ids
+        cnc_workorder = workorder_ids.filtered(
+            lambda w: w.routing_type == 'CNC加工' and w.state == 'done' and w.processing_panel == self.processing_panel
+        )
+        if cnc_workorder:
+            agv_schedulingss = cnc_workorder.agv_scheduling_ids
+            return agv_schedulingss.filtered(lambda a: a.state == '已配送' and a.agv_route_type == '下产线')
+        else:
+            return None

sf_manufacturing/models/mrp_production.py

@@ -1,12 +1,12 @@
 # -*- coding: utf-8 -*-
 import base64
+import datetime
 import logging
 import json
 import os
 import re
 import requests
 from itertools import groupby
-from datetime import datetime
 from collections import defaultdict, namedtuple
 from odoo import api, fields, models, SUPERUSER_ID, _
 from odoo.exceptions import UserError, ValidationError
@@ -18,7 +18,7 @@ class MrpProduction(models.Model):
     _inherit = 'mrp.production'
     _description = "制造订单"
     _order = 'create_date desc'
-
+    deadline_of_delivery = fields.Date('订单交期', tracking=True, compute='_compute_deadline_of_delivery')
     # tray_ids = fields.One2many('sf.tray', 'production_id', string="托盘")
     maintenance_count = fields.Integer(compute='_compute_maintenance_count', string="Number of maintenance requests")
     request_ids = fields.One2many('maintenance.request', 'production_id')
@@ -34,6 +34,16 @@ class MrpProduction(models.Model):
     tool_state_remark = fields.Text(string='功能刀具状态备注(缺刀)', compute='_compute_tool_state_remark', store=True)
     tool_state_remark2 = fields.Text(string='功能刀具状态备注(无效刀)', readonly=True)
 
+    @api.depends('procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id')
+    def _compute_deadline_of_delivery(self):
+        for production in self:
+            sale_order_ids = production.procurement_group_id.mrp_production_ids.move_dest_ids.group_id.sale_id.ids
+            if not sale_order_ids or len(sale_order_ids) < 1:
+                continue
+            sale_id = self.env['sale.order'].sudo().browse(sale_order_ids[0])
+            if sale_id:
+                production.deadline_of_delivery = sale_id.deadline_of_delivery
+
     @api.depends('workorder_ids.tool_state_remark')
     def _compute_tool_state_remark(self):
         for item in self:
@@ -118,14 +128,46 @@ class MrpProduction(models.Model):
     ], string='工序状态', default='待装夹')
 
     # 零件图号
-    part_number = fields.Char('零件图号')
+    part_number = fields.Char('零件图号', readonly=True)
 
     # 上传零件图纸
-    part_drawing = fields.Binary('零件图纸')
+    part_drawing = fields.Binary('零件图纸', readonly=True)
 
-    manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
+    quality_standard = fields.Binary('质检标准', readonly=True)
+
+    @api.depends('product_id.manual_quotation')
+    def _compute_manual_quotation(self):
+        for item in self:
+            item.manual_quotation = item.product_id.manual_quotation
+
+    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation, store=True)
     is_scrap = fields.Boolean('是否报废', default=False)
     is_remanufacture = fields.Boolean('是否重新制造', default=False)
+    remanufacture_count = fields.Integer("重新制造订单数量", compute='_compute_remanufacture_production_ids')
+    remanufacture_production_id = fields.Many2one('mrp.production', string='')
+
+    @api.depends('remanufacture_production_id')
+    def _compute_remanufacture_production_ids(self):
+        for production in self:
+            if production.remanufacture_production_id:
+                remanufacture_production = self.env['mrp.production'].search(
+                    [('id', '=', production.remanufacture_production_id.id)])
+                if remanufacture_production:
+                    production.remanufacture_count = len(remanufacture_production)
+            else:
+                production.remanufacture_count = 0
+
+    def action_view_remanufacture_productions(self):
+        self.ensure_one()
+        mrp_production = self.env['mrp.production'].search(
+            [('id', '=', self.remanufacture_production_id.id)])
+        action = {
+            'res_model': 'mrp.production',
+            'type': 'ir.actions.act_window',
+            'view_mode': 'form',
+            'res_id': mrp_production.id,
+        }
+        return action
 
     @api.depends(
         'move_raw_ids.state', 'move_raw_ids.quantity_done', 'move_finished_ids.state', 'tool_state',
@@ -266,8 +308,13 @@ class MrpProduction(models.Model):
     # 编程单更新
     def update_programming_state(self):
         try:
+            manufacturing_type = 'rework'
+            if self.is_scrap:
+                manufacturing_type = 'scrap'
+            elif self.tool_state == '2':
+                manufacturing_type = 'invalid_tool_rework'
             res = {'programming_no': self.programming_no,
-                   'manufacturing_type': 'rework' if self.is_scrap is False else 'scrap'}
+                   'manufacturing_type': manufacturing_type}
             logging.info('res=%s:' % res)
             configsettings = self.env['res.config.settings'].get_values()
             config_header = Common.get_headers(self, configsettings['token'], configsettings['sf_secret_key'])
@@ -288,8 +335,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(
-            [('name', '=', cnc.product_id.default_code.rsplit('-', 1)[0])])
+        quick_order = False
+        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'
@@ -446,44 +495,45 @@ class MrpProduction(models.Model):
                         #         self.env['mrp.workorder'].json_workorder_str(k, production, route))
                 # 表面工艺工序
                 # 获取表面工艺id
-                if production.product_id.model_process_parameters_ids:
-                    logging.info('model_process_parameters_ids:%s' % production.product_id.model_process_parameters_ids)
-                    surface_technics_arr = []
-                    # 工序id
-                    route_workcenter_arr = []
-                    for item in production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
-                        surface_technics_arr.append(item.route_workcenter_id.surface_technics_id.id)
-                        route_workcenter_arr.append(item.route_workcenter_id.id)
-                    if surface_technics_arr:
-                        production_process_category = self.env['sf.production.process.category'].search(
-                            [('production_process_ids.id', 'in', surface_technics_arr)],
-                            order='sequence asc'
-                        )
-                        # 用filter刷选表面工艺id'是否存在工艺类别对象里
-                        if production_process_category:
-                            for p in production_process_category:
-                                logging.info('production_process_category:%s' % p.name)
-                                production_process = p.production_process_ids.filtered(
-                                    lambda pp: pp.id in surface_technics_arr)
-                                if production_process:
-                                    process_parameter = production.product_id.model_process_parameters_ids.filtered(
-                                        lambda pm: pm.process_id.id == production_process.id)
-                                    if process_parameter:
-                                        # 产品为表面工艺服务的供应商
-                                        product_production_process = self.env['product.template'].search(
-                                            [('server_product_process_parameters_id', '=', process_parameter.id)])
-                                        if product_production_process:
-                                            route_production_process = self.env[
-                                                'mrp.routing.workcenter'].search(
-                                                [('surface_technics_id', '=', production_process.id),
-                                                 ('id', 'in', route_workcenter_arr)])
-                                            if route_production_process:
-                                                workorders_values.append(
-                                                    self.env[
-                                                        'mrp.workorder']._json_workorder_surface_process_str(
-                                                        production, route_production_process,
-                                                        process_parameter,
-                                                        product_production_process.seller_ids[0].partner_id.id))
+                # 工序id
+                surface_technics_arr = []
+                route_workcenter_arr = []
+                for item in production.product_id.product_model_type_id.surface_technics_routing_tmpl_ids:
+                    if item.route_workcenter_id.surface_technics_id.id:
+                        for process_param in production.product_id.model_process_parameters_ids:
+                            logging.info('process_param:%s%s' % (process_param.id, process_param.name))
+                            if item.route_workcenter_id.surface_technics_id == process_param.process_id:
+                                logging.info(
+                                    'surface_technics_id:%s%s' % (item.route_workcenter_id.surface_technics_id.id,
+                                                                  item.route_workcenter_id.surface_technics_id.name))
+                                surface_technics_arr.append(item.route_workcenter_id.surface_technics_id.id)
+                                route_workcenter_arr.append(item.route_workcenter_id.id)
+                if surface_technics_arr:
+                    production_process = self.env['sf.production.process'].search(
+                        [('id', 'in', surface_technics_arr)],
+                        order='sequence asc'
+                    )
+                    for p in production_process:
+                        logging.info('production_process:%s' % p.name)
+                        # if production_process:
+                        process_parameter = production.product_id.model_process_parameters_ids.filtered(
+                            lambda pm: pm.process_id.id == p.id)
+                        if process_parameter:
+                            # 产品为表面工艺服务的供应商
+                            product_production_process = self.env['product.template'].search(
+                                [('server_product_process_parameters_id', '=', process_parameter.id)])
+                            if product_production_process:
+                                route_production_process = self.env[
+                                    'mrp.routing.workcenter'].search(
+                                    [('surface_technics_id', '=', p.id),
+                                     ('id', 'in', route_workcenter_arr)])
+                                if route_production_process:
+                                    workorders_values.append(
+                                        self.env[
+                                            'mrp.workorder']._json_workorder_surface_process_str(
+                                            production, route_production_process,
+                                            process_parameter,
+                                            product_production_process.seller_ids[0].partner_id.id))
             elif production.product_id.categ_id.type == '坯料':
                 embryo_routing_workcenter = self.env['sf.embryo.model.type.routing.sort'].search(
                     [('embryo_model_type_id', '=', production.product_id.embryo_model_type_id.id)],
@@ -633,7 +683,7 @@ class MrpProduction(models.Model):
                         # 表面工艺工序
                         # 模型类型的表面工艺工序模版
                         surface_tmpl_ids = model_type_id.surface_technics_routing_tmpl_ids
-                        # 产品选择的表面工艺
+                        # 产品选择的表面工艺参数
                         model_process_parameters_ids = rec.product_id.model_process_parameters_ids
                         process_dict = {}
                         if model_process_parameters_ids:
@@ -642,7 +692,7 @@ class MrpProduction(models.Model):
                                 for surface_tmpl_id in surface_tmpl_ids:
                                     if process_id == surface_tmpl_id.route_workcenter_id.surface_technics_id:
                                         surface_tmpl_name = surface_tmpl_id.route_workcenter_id.name
-                                        process_dict.update({int(process_id.category_id.code): '%s-%s' % (
+                                        process_dict.update({int(process_id.sequence): '%s-%s' % (
                                             surface_tmpl_name, process_parameters_id.name)})
                         process_list = sorted(process_dict.keys())
                         for process_num in process_list:
@@ -659,14 +709,16 @@ class MrpProduction(models.Model):
                         raise ValidationError('该产品【加工面板】为空!')
                 else:
                     raise ValidationError('该产品没有选择【模版类型】!')
-
+                logging.info('sequence_list: %s' % sequence_list)
                 for work in rec.workorder_ids:
-                    if sequence_list.get(work.name):
-                        work.sequence = sequence_list[work.name]
+                    work_name = work.name
+                    logging.info(work_name)
+                    if sequence_list.get(work_name):
+                        work.sequence = sequence_list[work_name]
                     elif sequence_list.get(work.processing_panel):
                         processing_panel = sequence_list.get(work.processing_panel)
-                        if processing_panel.get(work.name):
-                            work.sequence = processing_panel[work.name]
+                        if processing_panel.get(work_name):
+                            work.sequence = processing_panel[work_name]
                         else:
                             raise ValidationError('工序【%s】在产品选择的模版类型中不存在!' % work.name)
                     else:
@@ -692,8 +744,9 @@ class MrpProduction(models.Model):
                         sequence_max += 1
                         panel_sequence_list.update({tmpl_id.route_workcenter_id.name: sequence_max})
                 for work_id in work_ids:
-                    if panel_sequence_list.get(work_id.name):
-                        work_id.sequence = panel_sequence_list[work_id.name]
+                    work_name = work_id.name
+                    if panel_sequence_list.get(work_name):
+                        work_id.sequence = panel_sequence_list[work_name]
 
     # 创建工单并进行排序
     def _create_workorder(self, item):
@@ -701,6 +754,53 @@ class MrpProduction(models.Model):
         self._reset_work_order_sequence()
         return True
 
+    def process_range_time(self):
+        for production in self:
+            works = production.workorder_ids
+            pro_plan = self.env['sf.production.plan'].search([('production_id', '=', production.id)], limit=1)
+            if not pro_plan:
+                continue
+            type_map = {'装夹预调': False, 'CNC加工': False, '解除装夹': False}
+            # 最后一次加工结束时间
+            last_time = pro_plan.date_planned_start
+            # 预置时间
+            for work in works:
+                count = type_map.get(work.routing_type)
+                date_planned_end = None
+                date_planned_start = None
+                duration_expected = datetime.timedelta(minutes=work.duration_expected)
+                reserve_time = datetime.timedelta(minutes=work.reserved_duration)
+                if not count:
+                    # 第一轮加工
+                    if work.routing_type == '装夹预调':
+                        date_planned_end = last_time - reserve_time
+                        date_planned_start = date_planned_end - duration_expected
+                    elif work.routing_type == 'CNC加工':
+                        date_planned_start = last_time
+                        date_planned_end = last_time + duration_expected
+                        last_time = date_planned_end
+                    else:
+                        date_planned_start = last_time + reserve_time
+                        date_planned_end = date_planned_start + duration_expected
+                        last_time = date_planned_end
+                    type_map.update({work.routing_type: True})
+                else:
+                    date_planned_start = last_time + reserve_time
+                    date_planned_end = date_planned_start + duration_expected
+                    last_time = date_planned_end
+                work.leave_id.write({
+                    'date_from': date_planned_start,
+                    'date_to': date_planned_end,
+                })
+                # work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end})
+                work.date_planned_start = date_planned_start
+                work.date_planned_finished = date_planned_end
+                routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(
+                    [('name', '=', work.routing_type)])
+
+                work.write({'date_planned_start': date_planned_start, 'date_planned_finished': date_planned_end,
+                            'duration_expected': routing_workcenter.time_cycle})
+
     # 修改标记已完成方法
     def button_mark_done1(self):
         if not self.workorder_ids.filtered(lambda w: w.routing_type not in ['表面工艺']):
@@ -723,6 +823,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
@@ -808,8 +912,8 @@ class MrpProduction(models.Model):
             'target': 'new',
             'context': {
                 'default_production_id': self.id,
-                'default_programming_state': '编程中' if cloud_programming[
-                                                             'programming_state'] != '已下发' else '已下发',
+                'default_reprogramming_num': cloud_programming['reprogramming_num'],
+                'default_programming_states': cloud_programming['programming_state'],
                 'default_is_reprogramming': True if cloud_programming['programming_state'] in ['已下发'] else False
             }
         }
@@ -856,6 +960,8 @@ class MrpProduction(models.Model):
             if production.programming_no in program_to_production_names:
                 productions_not_delivered = self.env['mrp.production'].search(
                     [('programming_no', '=', production.programming_no), ('programming_state', '=', '已编程未下发')])
+                productions = self.env['mrp.production'].search(
+                    [('programming_no', '=', production.programming_no), ('state', 'not in', ('cancel', 'done'))])
                 rework_workorder = production.workorder_ids.filtered(lambda m: m.state == 'rework')
                 if rework_workorder:
                     for rework_item in rework_workorder:
@@ -868,6 +974,13 @@ class MrpProduction(models.Model):
                             productions_not_delivered.write(
                                 {'state': 'progress', 'programming_state': '已编程', 'is_rework': False})
 
+                    # 对制造订单所以面的cnc工单的程序用刀进行校验
+                    try:
+                        logging.info(f'已更新制造订单：{productions_not_delivered}')
+                        productions.production_cnc_tool_checkout()
+                    except Exception as e:
+                        logging.info(f'对cnc工单的程序用刀进行校验报错：{e}')
+
     # 从cloud获取重新编程过的最新程序
     def get_new_program(self, processing_panel):
         try:
@@ -903,8 +1016,8 @@ class MrpProduction(models.Model):
                                 panel_workorder.cmm_ids.sudo().unlink()
                             if panel_workorder.cnc_ids:
                                 panel_workorder.cnc_ids.sudo().unlink()
-                                self.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
-                                    production)
+                                # self.env['sf.cam.work.order.program.knife.plan'].sudo().unlink_cam_plan(
+                                #     production)
                             # program_path_tmp_panel = os.path.join('C://Users//43484//Desktop//fsdownload//test',
                             #                                       processing_panel)
                             logging.info('program_path_tmp_panel:%s' % program_path_tmp_panel)
@@ -954,34 +1067,21 @@ class MrpProduction(models.Model):
                 [('origin', '=', sale_order.name), ('name', 'ilike', 'WH/OUT/')])
             move = out_picking.move_ids.filtered(lambda pd: pd.product_id == self.product_id)
             move_values = {'product_description_variants': '',
-                           'date_planned': datetime.now(),
-                           'date_deadline': datetime.now(),
-                           # 'move_dest_ids': self.env['stock.move'].search([('id', '=', move.id)]),
+                           'date_planned': fields.Datetime.now(),
+                           'date_deadline': fields.Datetime.now(),
                            'move_dest_ids': move,
-                           'group_id': False,
+                           'group_id': move.group_id,
                            'route_ids': [],
                            'warehouse_id': self.warehouse_id,
                            'priority': 0,
                            'orderpoint_id': False,
                            'product_packaging_id': False}
-            rule = self.env['stock.rule'].search(
-                [('action', '=', 'pull'), ('procure_method', '=', 'mts_else_mto'), (
-                    'location_dest_id', '=', self.env['stock.location'].search([('parent_path', '=', '2/5/')]).id),
-                 ('location_src_id', '=', self.env['stock.location'].search(
-                     [('barcode', '=', 'CP')]).id)])
-            # origin = move._prepare_procurement_origin()
             procurement_requests.append(self.env['procurement.group'].Procurement(
                 move.product_id, 1.0, move.product_uom,
-                self.env['stock.location'].search([('barcode', '=', 'CP')]),
-                rule and rule.name or "/",
+                move.location_id, move.rule_id and move.rule_id.name or "/",
                 sale_order.name, move.company_id, move_values))
             self.env['procurement.group'].run(procurement_requests,
                                               raise_user_error=not self.env.context.get('from_orderpoint'))
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
-            # productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
-            #                                (
-            #                                        p.move_dest_ids.procure_method != 'make_to_order' and
-            #                                        not p.move_raw_ids and not p.workorder_ids)).action_confirm()
             productions = self.env['mrp.production'].sudo().search(
                 [('origin', '=', self.origin)], order='id desc', limit=1)
             move = self.env['stock.move'].search([('origin', '=', productions.name)], order='id desc')
@@ -1009,74 +1109,41 @@ class MrpProduction(models.Model):
                                'picking_id': sfp_move.picking_id.id, 'picking_type_id': sfp_move.picking_type_id.id,
                                'production_id': False})
             productions.write({'programming_no': self.programming_no, 'is_remanufacture': True})
-            productions.procurement_group_id.mrp_production_ids.move_dest_ids.write(
-                {'group_id': self.env['procurement.group'].search([('name', '=', sale_order.name)])})
+            # productions.procurement_group_id.mrp_production_ids.move_dest_ids.write(
+            #     {'group_id': self.env['procurement.group'].search([('name', '=', sale_order.name)])})
+            stock_picking_remanufacture = self.env['stock.picking'].search([('origin', '=', productions.name)])
+            for pick in stock_picking_remanufacture:
+                if pick.name.startswith('WH/PC/') or pick.name.startswith('WH/INT/'):
+                    if pick.move_ids:
+                        product_type_id = pick.move_ids[0].product_id.categ_id
+                        if product_type_id.name == '坯料':
+                            location_id = self.env['stock.location'].search([('name', '=', '坯料存货区')])
+                            if not location_id:
+                                logging.info(f'没有搜索到【坯料存货区】: {location_id}')
+                                break
+                            if pick.picking_type_id.name == '内部调拨':
+                                if pick.location_dest_id.product_type != product_type_id:
+                                    pick.location_dest_id = location_id.id
+                            elif pick.picking_type_id.name == '生产发料':
+                                if pick.location_id.product_type != product_type_id:
+                                    pick.location_id = location_id.id
             scarp_process_parameter_workorder = self.env['mrp.workorder'].search(
                 [('surface_technics_parameters_id', '!=', False), ('production_id', '=', self.id),
                  ('is_subcontract', '=', True)])
             if scarp_process_parameter_workorder:
                 production_programming = self.env['mrp.production'].search(
-                    [('programming_no', '=', self.programming_no)], order='name asc')
+                    [('programming_no', '=', self.programming_no), ('id', '!=', productions.id)], order='name asc')
                 production_list = [production.name for production in production_programming]
-                purchase_orders = self.env['purchase.order'].search([('origin', '=', ','.join(production_list))])
+                purchase_orders = self.env['purchase.order'].search([('origin', 'ilike', ','.join(production_list))])
                 for purchase_item in purchase_orders.order_line:
                     for process_item in scarp_process_parameter_workorder:
                         if purchase_item.product_id.categ_type == '表面工艺':
                             if purchase_item.product_id.server_product_process_parameters_id == process_item.surface_technics_parameters_id:
-                                print(purchase_orders.find(productions.name))
-                                if purchase_orders.find(productions.name) == -1:
-                                    purchase_orders.origin += productions.name
+                                if purchase_orders.origin.find(productions.name) == -1:
+                                    purchase_orders.origin += ',' + productions.name
             if item['is_reprogramming'] is False:
                 productions._create_workorder(item)
                 productions.programming_state = '已编程'
-                for production_item in productions:
-                    process_parameter_workorder = self.env['mrp.workorder'].search(
-                        [('surface_technics_parameters_id', '!=', False), ('production_id', '=', production_item.id),
-                         ('is_subcontract', '=', True)])
-                    if process_parameter_workorder:
-                        is_pick = False
-                        consecutive_workorders = []
-                        m = 0
-                        sorted_workorders = sorted(process_parameter_workorder, key=lambda w: w.id)
-                        for i in range(len(sorted_workorders) - 1):
-                            if m == 0:
-                                is_pick = False
-                            if sorted_workorders[i].supplier_id.id == sorted_workorders[i + 1].supplier_id.id and \
-                                    sorted_workorders[i].is_subcontract == sorted_workorders[i + 1].is_subcontract and \
-                                    sorted_workorders[i].id == sorted_workorders[i + 1].id - 1:
-                                if sorted_workorders[i] not in consecutive_workorders:
-                                    consecutive_workorders.append(sorted_workorders[i])
-                                consecutive_workorders.append(sorted_workorders[i + 1])
-                                m += 1
-                                continue
-                            else:
-                                if m == len(consecutive_workorders) - 1 and m != 0:
-                                    self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
-                                                                                         production_item)
-                                    if sorted_workorders[i] in consecutive_workorders:
-                                        is_pick = True
-                                    consecutive_workorders = []
-                                    m = 0
-                                # 当前面的连续工序生成对应的外协出入库单再生成当前工序的外协出入库单
-                                if is_pick is False:
-                                    self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
-                                                                                         production_item)
-                            if m == len(consecutive_workorders) - 1 and m != 0:
-                                self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
-                                                                                     production_item)
-                                if sorted_workorders[i] in consecutive_workorders:
-                                    is_pick = True
-                                consecutive_workorders = []
-                                m = 0
-                        if m == len(consecutive_workorders) - 1 and m != 0:
-                            self.env['stock.picking'].create_outcontract_picking(consecutive_workorders,
-                                                                                 production_item)
-                        if is_pick is False and m == 0:
-                            if len(sorted_workorders) == 1:
-                                self.env['stock.picking'].create_outcontract_picking(sorted_workorders, production_item)
-                            else:
-                                self.env['stock.picking'].create_outcontract_picking(sorted_workorders[i],
-                                                                                     production_item)
             else:
                 productions.programming_state = '编程中'
             return productions

sf_manufacturing/models/mrp_routing_workcenter.py

@@ -21,7 +21,7 @@ class ResMrpRoutingWorkcenter(models.Model):
     workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)
     bom_id = fields.Many2one('mrp.bom', required=False)
     surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
-
+    reserved_duration = fields.Float('预留时长', default=30, tracking=True)
     def get_no(self):
         international_standards = self.search(
             [('code', '!=', ''), ('active', 'in', [True, False])],
@@ -40,7 +40,7 @@ class ResMrpRoutingWorkcenter(models.Model):
     def get_company_id(self):
         self.company_id = self.env.user.company_id.id
 
-    company_id = fields.Many2one('res.company', compute="get_company_id", related=False)
+    company_id = fields.Many2one('res.company', compute="get_company_id", related=False, store=True)
 
     # 排产的时候, 根据坯料的长宽高比对一下机床的最大加工尺寸.不符合就不要分配给这个加工中心(机床).
     # 工单对应的工作中心，根据工序中的工作中心去匹配，

sf_manufacturing/models/mrp_workcenter.py

@@ -1,7 +1,13 @@
 import datetime
+import logging
+from datetime import timedelta, time
 from collections import defaultdict
-from odoo import fields, models
+from odoo import fields, models, api
 from odoo.addons.resource.models.resource import Intervals
+from odoo.exceptions import UserError, ValidationError
+import math
+
+_logger = logging.getLogger(__name__)
 
 
 class ResWorkcenter(models.Model):
@@ -41,13 +47,16 @@ class ResWorkcenter(models.Model):
 
     oee_target = fields.Float(
         string='OEE Target', help="Overall Effective Efficiency Target in percentage", default=90, tracking=True)
+    oee = fields.Float(compute='_compute_oee', help='Overall Equipment Effectiveness, based on the last month',
+                       store=True)
 
     time_start = fields.Float('Setup Time', tracking=True)
     time_stop = fields.Float('Cleanup Time', tracking=True)
     costs_hour = fields.Float(string='Cost per hour', help='Hourly processing cost.', default=0.0, tracking=True)
 
     equipment_status = fields.Selection(
-        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"), ("封存(报废)", "封存(报废)")],
+        [("正常", "正常"), ("故障停机", "故障停机"), ("计划维保", "计划维保"), ("空闲", "空闲"),
+         ("封存(报废)", "封存(报废)")],
         string="设备状态", related='equipment_id.state')
 
     # @api.depends('equipment_id')
@@ -126,6 +135,128 @@ class ResWorkcenter(models.Model):
 
     # AGV是否可配送
     is_agv_scheduling = fields.Boolean(string="AGV所属区域", tracking=True)
+    # 生产线优化
+    available_machine_number = fields.Integer(string="可用机台数量")
+    single_machine_capacity = fields.Float(string="单台小时产能")
+    production_line_hour_capacity = fields.Float(string="生产线小时产能", readonly=True,
+                                                 compute='_compute_production_line_hour_capacity')
+    effective_working_hours_day = fields.Float(string="日有效工作时长", default=0, readonly=True,
+                                               compute='_compute_effective_working_hours_day')
+    default_capacity = fields.Float(
+        string='生产线日产能', compute='_compute_production_line_day_capacity', readonly=True)
+
+    # 计算生产线日产能
+    @api.depends('production_line_hour_capacity', 'effective_working_hours_day')
+    def _compute_production_line_day_capacity(self):
+        for record in self:
+            record.default_capacity = round(
+                record.production_line_hour_capacity * record.effective_working_hours_day, 2)
+
+    # 计算日有效工作时长
+    @api.depends('resource_calendar_id', 'resource_calendar_id.attendance_ids',
+                 'resource_calendar_id.attendance_ids.hour_to', 'resource_calendar_id.attendance_ids.hour_from')
+    def _compute_effective_working_hours_day(self):
+        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(datetime.datetime.now())]
+            if attendance_ids:
+                for attendance_id in attendance_ids:
+                    if attendance_id.hour_from and attendance_id.hour_to:
+                        record.effective_working_hours_day += attendance_id.hour_to - attendance_id.hour_from
+            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()
+        return str(day_num)
+
+    # 计算生产线小时产能
+    @api.depends('single_machine_capacity', 'available_machine_number')
+    def _compute_production_line_hour_capacity(self):
+        for record in self:
+            record.production_line_hour_capacity = round(
+                record.single_machine_capacity * record.available_machine_number, 2)
+
+    # 判断计划开始时间是否在配置的工作中心的工作日历内
+    def deal_with_workcenter_calendar(self, start_date):
+        start_date = start_date + timedelta(hours=8)  # 转换为北京时间
+        for record in self:
+            attendance_ids = [p for p in record.resource_calendar_id.attendance_ids if
+                              p.dayofweek == record.get_current_day_of_week(start_date) and self.is_between_times(
+                                  p.hour_from, p.hour_to, start_date)]
+        return False if not attendance_ids else True
+
+    # 判断传入时间是否在配置的工作中心的工作日历内
+    def is_between_times(self, hour_from, hour_to, start_date):
+        integer_part, decimal_part = self.get_integer_and_decimal_parts(hour_from)
+        start_time = time(integer_part, decimal_part)
+        integer_part, decimal_part = self.get_integer_and_decimal_parts(hour_to)
+        end_time = time(integer_part, decimal_part)
+        return start_time <= start_date.time() <= end_time
+
+    # 获取整数部分和小数部分
+    def get_integer_and_decimal_parts(self, value):
+        integer_part = int(value)
+        decimal_part = value - integer_part
+        if decimal_part > 0:
+            decimal_part = round(decimal_part, 2) * 60
+        return int(integer_part), math.ceil(decimal_part)
+
+    # 处理排程是否超过日产能
+    def deal_available_default_capacity(self, date_planned):
+        date_planned_start = date_planned.strftime('%Y-%m-%d')
+        date_planned_end = date_planned + timedelta(days=1)
+        date_planned_end = date_planned_end.strftime('%Y-%m-%d')
+        plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start),
+                                                                 ('date_planned_start', '<',
+                                                                  date_planned_end),
+                                                                 ('state', 'not in', ['draft', 'cancel'])])
+        if plan_ids:
+            sum_qty = sum([p.product_qty for p in plan_ids])
+            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
+
+    # 处理排程是否超过小时产能
+    def deal_available_single_machine_capacity(self, date_planned, count):
+
+        date_planned_start = date_planned.strftime('%Y-%m-%d %H:00:00')
+        date_planned_end = date_planned + timedelta(hours=1)
+        date_planned_end = date_planned_end.strftime('%Y-%m-%d %H:00:00')
+        plan_ids = self.env['sf.production.plan'].sudo().search([('date_planned_start', '>=', date_planned_start),
+                                                                 ('date_planned_start', '<',
+                                                                  date_planned_end),
+                                                                 ('state', 'not in', ['draft', 'cancel'])])
+
+        if plan_ids:
+            sum_qty = sum([p.product_qty for p in plan_ids])
+            production_line_hour_capacity = self.production_line_hour_capacity
+            if sum_qty >= production_line_hour_capacity:
+                message = '当前计划开始时间不能预约排程,超过生产线小时产能(%d件)%d件' % (
+                    production_line_hour_capacity, count)
+                raise UserError(message)
+                return False
+        return True
+
 
 class ResWorkcenterProductivity(models.Model):
     _inherit = 'mrp.workcenter.productivity'

sf_manufacturing/models/mrp_workorder.py

@@ -58,9 +58,15 @@ class ResMrpWorkOrder(models.Model):
         ('cancel', '取消')], string='Status',
         compute='_compute_state', store=True,
         default='pending', copy=False, readonly=True, recursive=True, index=True, tracking=True)
-    # state = fields.Selection(selection_add=[('to be detected', "待检测"), ('rework', '返工')], tracking=True)
 
-    manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
+    delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效')
+
+    @api.depends('production_id.manual_quotation')
+    def _compute_manual_quotation(self):
+        for item in self:
+            item.manual_quotation = item.production_id.manual_quotation
+
+    manual_quotation = fields.Boolean('人工编程', default=False, compute=_compute_manual_quotation, store=True)
 
     def _compute_working_users(self):
         super()._compute_working_users()
@@ -138,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:
@@ -178,17 +186,12 @@ class ResMrpWorkOrder(models.Model):
             if order.routing_type == '表面工艺':
                 production_programming = self.env['mrp.production'].search(
                     [('programming_no', '=', order.production_id.programming_no)], order='name asc')
+                production_no_remanufacture = production_programming.filtered(lambda a: a.is_remanufacture is False)
                 production_list = [production.name for production in production_programming]
                 purchase = self.env['purchase.order'].search([('origin', '=', ','.join(production_list))])
                 for line in purchase.order_line:
                     if line.product_id.server_product_process_parameters_id == order.surface_technics_parameters_id and line.product_qty == len(
-                            production_programming):
-                        # server_product = self.env['product.template'].search(
-                        #     [('server_product_process_parameters_id', '=', pp.id),
-                        #      ('detailed_type', '=', 'service')])
-                        # purchase_order_line = self.env['purchase.order.line'].search(
-                        #     [('product_id', '=', server_product.id), ('product_qty', '=', len(production_programming))])
-                        # if purchase_order_line:
+                            production_no_remanufacture):
                         order.surface_technics_purchase_count = len(purchase)
             else:
                 order.surface_technics_purchase_count = 0
@@ -221,7 +224,10 @@ 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='零件图号')
+    machining_drawings = fields.Binary('2D加工图纸', related='production_id.part_drawing', readonly=True)
+    quality_standard = fields.Binary('质检标准', related='production_id.quality_standard', readonly=True)
+
     # 工序状态
     process_state = fields.Selection([
         ('待装夹', '待装夹'),
@@ -237,6 +243,7 @@ class ResMrpWorkOrder(models.Model):
     tool_state = fields.Selection([('0', '正常'), ('1', '缺刀'), ('2', '无效刀')], string='功能刀具状态', default='0',
                                   store=True, compute='_compute_tool_state')
     tool_state_remark = fields.Text(string='功能刀具状态备注(缺刀)', compute='_compute_tool_state_remark', store=True)
+    reserved_duration = fields.Float('预留时长', default=30, tracking=True)
 
     @api.depends('cnc_ids.tool_state')
     def _compute_tool_state_remark(self):
@@ -412,12 +419,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)
@@ -426,6 +431,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}")
@@ -538,6 +555,7 @@ class ResMrpWorkOrder(models.Model):
             raise UserError('PT10点未测或数据错误')
 
         self.data_state = True
+        self.getcenter()
 
         return True
 
@@ -591,6 +609,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
@@ -646,29 +666,36 @@ class ResMrpWorkOrder(models.Model):
     # 拼接工单对象属性值
     def json_workorder_str(self, k, production, route, item):
         # 计算预计时长duration_expected
-        if route.routing_type == '切割':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '切割')]).time_cycle
-        # elif route.routing_type == '获取CNC加工程序':
+        routing_types = ['切割', '装夹预调', 'CNC加工', '解除装夹']
+        if route.routing_type in routing_types:
+            routing_workcenter = self.env['mrp.routing.workcenter'].sudo().search(
+                [('name', '=', route.routing_type)])
+            duration_expected = routing_workcenter.time_cycle
+            reserved_duration = routing_workcenter.reserved_duration
+        # if route.routing_type == '切割':
         #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-        #         [('name', '=', '获取CNC加工程序')]).time_cycle
-        elif route.routing_type == '装夹预调':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '装夹预调')]).time_cycle
-        # elif route.routing_type == '前置三元定位检测':
+        #         [('name', '=', '切割')]).time_cycle
+        # # elif route.routing_type == '获取CNC加工程序':
+        # #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        # #         [('name', '=', '获取CNC加工程序')]).time_cycle
+        # elif route.routing_type == '装夹预调':
         #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-        #         [('name', '=', '前置三元定位检测')]).time_cycle
-        elif route.routing_type == 'CNC加工':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', 'CNC加工')]).time_cycle
-        # elif route.routing_type == '后置三元质量检测':
+        #         [('name', '=', '装夹预调')]).time_cycle
+        # # elif route.routing_type == '前置三元定位检测':
+        # #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        # #         [('name', '=', '前置三元定位检测')]).time_cycle
+        # elif route.routing_type == 'CNC加工':
         #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-        #         [('name', '=', '后置三元质量检测')]).time_cycle
-        elif route.routing_type == '解除装夹':
-            duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
-                [('name', '=', '解除装夹')]).time_cycle
+        #         [('name', '=', 'CNC加工')]).time_cycle
+        # # elif route.routing_type == '后置三元质量检测':
+        # #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        # #         [('name', '=', '后置三元质量检测')]).time_cycle
+        # elif route.routing_type == '解除装夹':
+        #     duration_expected = self.env['mrp.routing.workcenter'].sudo().search(
+        #         [('name', '=', '解除装夹')]).time_cycle
         else:
             duration_expected = 60
+            reserved_duration = 30
         workorders_values_str = [0, '', {
             'product_uom_id': production.product_uom_id.id,
             'qty_producing': 0,
@@ -686,12 +713,14 @@ 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,
                                                                                                                   item),
             # 'workpiece_delivery_ids': False if not route.routing_type == '装夹预调' else self._json_workpiece_delivery_list(
             #     production)
+            'reserved_duration': reserved_duration,
         }]
         return workorders_values_str
 
@@ -956,12 +985,14 @@ class ResMrpWorkOrder(models.Model):
                             else:
                                 production_programming = self.env['mrp.production'].search(
                                     [('programming_no', '=', self.production_id.programming_no)], order='name asc')
+                                production_no_remanufacture = production_programming.filtered(
+                                    lambda a: a.is_remanufacture is False)
                                 production_list = [production.name for production in production_programming]
                                 purchase_orders = self.env['purchase.order'].search(
-                                    [('origin', '=', ','.join(production_list))])
+                                    [('origin', 'ilike', ','.join(production_list))])
                                 for line in purchase_orders.order_line:
                                     if line.product_id.server_product_process_parameters_id == workorder.surface_technics_parameters_id and line.product_qty == len(
-                                            production_programming):
+                                            production_no_remanufacture):
                                         if purchase_orders.state == 'purchase':
                                             workorder.state = 'ready'
                                         else:
@@ -1003,16 +1034,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 workorder.production_id.reservation_state == 'assigned':
-                                            workorder.state = 'ready'
-                                        elif workorder.production_id.reservation_state != 'assigned':
-                                            workorder.state = 'waiting'
-                                            continue
+                                    if work_id.routing_type == '装夹预调':
+                                        if workorder == work_id:
+                                            if workorder.production_id.reservation_state == 'assigned':
+                                                workorder.state = 'ready'
+                                            elif workorder.production_id.reservation_state != 'assigned':
+                                                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
@@ -1050,6 +1085,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
@@ -1088,7 +1129,7 @@ class ResMrpWorkOrder(models.Model):
                          [('barcode', 'ilike', 'VL-SPOC')]).id),
                      ('origin', '=', self.production_id.name)])
                 if move_out.state != 'done':
-                    move_out.write({'state': 'assigned'})
+                    move_out.write({'state': 'assigned', 'production_id': False})
                     self.env['stock.move.line'].create(move_out.get_move_line(self.production_id, self))
 
                 # move_out._action_assign()
@@ -1154,10 +1195,13 @@ class ResMrpWorkOrder(models.Model):
     def button_finish(self):
         for record in self:
             if record.routing_type == '装夹预调':
-                if not record.material_center_point and record.X_deviation_angle > 0:
-                    raise UserError("请对前置三元检测定位参数进行计算定位")
                 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:
+                        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 = '待加工'
@@ -1257,15 +1301,14 @@ class ResMrpWorkOrder(models.Model):
 
     # 解绑托盘
     def unbind_tray(self):
-        self.write({
+        self.production_id.workorder_ids.write({
             'rfid_code': False,
             'tray_serial_number': False,
             'tray_product_id': False,
             'tray_brand_id': False,
             'tray_type_id': False,
             'tray_model_id': False,
-            'is_trayed': False
-        })
+            'is_trayed': False})
 
     # 将FTP的检测报告文件下载到临时目录
     def download_reportfile_tmp(self, workorder, reportpath):
@@ -1316,6 +1359,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')
@@ -1328,7 +1372,7 @@ class ResMrpWorkOrder(models.Model):
                     'name': 'button_delivery',
                     'type': 'object',
                     'string': '解除装夹',
-                    'class': 'btn-primary',
+                    'class': 'btn-primary jikimo_button_confirm',
                     # 'className': 'btn-primary',
                     'modifiers': '{"force_show": 1}'
                 })
@@ -1339,18 +1383,23 @@ class ResMrpWorkOrder(models.Model):
         return res
 
     def button_delivery(self):
-        production_ids = []
-        workorder_ids = []
+        # production_ids = []
+        # workorder_ids = []
         delivery_type = '运送空料架'
-        max_num = 4  # 最大配送数量
-        if len(self) > max_num:
-            raise UserError('仅限于拆卸1-4个制造订单，请重新选择')
-        for item in self:
-            if item.state != 'ready':
-                raise UserError('请选择状态为【就绪】的工单进行解除装夹')
-
-            production_ids.append(item.production_id.id)
-            workorder_ids.append(item.id)
+        # max_num = 4  # 最大配送数量
+        # feeder_station_start_id = False
+        # if len(self) > max_num:
+        #     raise UserError('仅限于拆卸1-4个制造订单，请重新选择')
+        # for item in self:
+        #     if item.state != 'ready':
+        #         raise UserError('请选择状态为【就绪】的工单进行解除装夹')
+        #
+        #     production_ids.append(item.production_id.id)
+        #     workorder_ids.append(item.id)
+        #     if not feeder_station_start_id:
+        #         down_product_agv_scheduling = item.get_down_product_agv_scheduling()
+        #         if down_product_agv_scheduling:
+        #             feeder_station_start_id = down_product_agv_scheduling.end_site_id.id
         return {
             'name': _('确认'),
             'type': 'ir.actions.act_window',
@@ -1359,11 +1408,12 @@ class ResMrpWorkOrder(models.Model):
             'target': 'new',
             'context': {
                 # 'default_delivery_ids': [(6, 0, delivery_ids)],
-                'default_production_ids': [(6, 0, production_ids)],
+                # 'default_production_ids': [(6, 0, production_ids)],
                 'default_delivery_type': delivery_type,
-                'default_workorder_ids': [(6, 0, workorder_ids)],
+                # 'default_workorder_ids': [(6, 0, workorder_ids)],
                 'default_workcenter_id': self.env.context.get('default_workcenter_id'),
-                'default_confirm_button': '确认解除'
+                'default_confirm_button': '确认解除',
+                # 'default_feeder_station_start_id': feeder_station_start_id,
             }}
 
 
@@ -1532,6 +1582,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)])
@@ -1539,8 +1591,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 == '装夹预调':
@@ -1774,6 +1829,11 @@ class WorkPieceDelivery(models.Model):
                 return is_free
             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):
@@ -1834,7 +1894,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)]")
-
-    brand_id = fields.Many2one('sf.machine.brand', '品牌')
-
-    tool_length = fields.Float('长度(mm)')
-    tool_width = fields.Float('宽度(mm)')
+    # cutting_tool_type_id = fields.Many2one(related='cutting_tool_model_id.cutting_tool_type_id', string='类型',
+    #                                        domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
+    # brand_id = fields.Many2one('sf.machine.brand', '品牌')
+    brand_id = fields.Many2one(related='cutting_tool_model_id.brand_id', string='品牌')
+    # cutting_tool_model_id.brand_id
+    # tool_length = fields.Float('长度(mm)')
+    tool_length = fields.Float(related='specification_id.length', string='长度(mm)')
+    # specification_id.length
+    # tool_width = fields.Float('宽度(mm)')
+    tool_width = fields.Float(related='specification_id.width', string='宽度(mm)')
+    # specification_id.width
     tool_height = fields.Float('高度(mm)')
-    tool_thickness = fields.Float('厚度(mm)')
-    tool_weight = fields.Float('重量(kg)')
-    tool_hardness = fields.Integer('硬度(hrc)')
-    coating_material = fields.Char('涂层材质')
+    # tool_thickness = fields.Float('厚度(mm)')
+    tool_thickness = fields.Float(related='specification_id.thickness', string='厚度(mm)')
+    # specification_id.thickness
+    # tool_weight = fields.Float('重量(kg)')
+    tool_weight = fields.Float(related='specification_id.weight', string='重量(kg)')
+    # specification_id.weight
+    # tool_hardness = fields.Integer('硬度(hrc)')
+    tool_hardness = fields.Integer(related='cutting_tool_model_id.tool_hardness', string='硬度(hrc)')
+    # cutting_tool_model_id.tool_hardness
+    # coating_material = fields.Char('涂层材质')
+    coating_material = fields.Char(related='cutting_tool_model_id.coating_material', string='涂层材质')
+    # cutting_tool_model_id.coating_material
     # 整体式刀具特有字段
-    cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
-    cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
-    cutting_tool_blade_length = fields.Float('刃部长度(mm)')
-    cutting_tool_blade_number = fields.Selection(
-        [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
-        string='刃数(个)', default='0')
+    # cutting_tool_total_length = fields.Float('总长度(mm)', digits=(6, 1))
+    cutting_tool_total_length = fields.Float(related='specification_id.total_length', string='总长度(mm)', digits=(6, 1))
+    # specification_id.total_length
+    # cutting_tool_shank_length = fields.Float('柄部长度(mm)', digits=(6, 1))
+    cutting_tool_shank_length = fields.Float(related='specification_id.handle_length', string='柄部长度(mm)',
+                                             digits=(6, 1))
+    # specification_id.handle_length
+    # cutting_tool_blade_length = fields.Float('刃部长度(mm)')
+    cutting_tool_blade_length = fields.Float(related='specification_id.blade_length', string='刃部长度(mm)')
+    # specification_id.blade_length
+    # cutting_tool_blade_number = fields.Selection(
+    #     [('0', '0'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'), ('7', '7'), ('8', '8')],
+    #     string='刃数(个)', default='0')
+    cutting_tool_blade_number = fields.Selection(related='specification_id.blade_number', string='刃数(个)')
+    # specification_id.blade_number
     # 整体式刀具新增字段
-    cutting_tool_neck_length = fields.Float('颈部长度(mm)', digits=(6, 1))
-    cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
-    cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
-    cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
-    cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
-    cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
-    cutting_tool_blade_type = fields.Char('刃部类型')
-    cutting_tool_pitch = fields.Float('牙距(mm)')
-    cutting_tool_blade_width = fields.Float('刃部宽度(mm)')
-    cutting_tool_blade_depth = fields.Float('刃部深度(mm)')
+    # cutting_tool_neck_length = fields.Float('颈部长度(mm)', digits=(6, 1))
+    cutting_tool_neck_length = fields.Float(related='specification_id.neck_length', string='颈部长度(mm)', digits=(6, 1))
+    # specification_id.neck_length
+    # cutting_tool_neck_diameter = fields.Float('颈部直径(mm)', digits=(6, 1))
+    cutting_tool_neck_diameter = fields.Float(related='specification_id.neck_diameter', string='颈部直径(mm)',
+                                               digits=(6, 1))
+    # specification_id.neck_diameter
+    # cutting_tool_shank_diameter = fields.Float('柄部直径(mm)', digits=(6, 1))
+    cutting_tool_shank_diameter = fields.Float(related='specification_id.handle_diameter', string='柄部直径(mm)', digits=(6, 1))
+    # specification_id.handle_diameter
+    # cutting_tool_blade_tip_diameter = fields.Float('刀尖直径(mm)', digits=(6, 1))
+    cutting_tool_blade_tip_diameter = fields.Float(related='specification_id.blade_tip_diameter', string='刀尖直径(mm)',
+                                               digits=(6, 1))
+    # specification_id.blade_tip_diameter
+    # cutting_tool_blade_tip_taper = fields.Integer('刀尖锥度(°)')
+    cutting_tool_blade_tip_taper = fields.Integer(related='specification_id.blade_tip_taper', string='刀尖锥度(°)')
+    # specification_id.blade_tip_taper
+    # cutting_tool_blade_helix_angle = fields.Integer('刃部螺旋角(°)')
+    cutting_tool_blade_helix_angle = fields.Integer(related='specification_id.blade_helix_angle', string='刃部螺旋角(°)')
+    # specification_id.blade_helix_angle
+    # cutting_tool_blade_type = fields.Char('刃部类型')
+    cutting_tool_blade_type = fields.Char(related='cutting_tool_model_id.blade_type', string='刃部类型')
+    # cutting_tool_pitch = fields.Float('牙距(mm)')
+    cutting_tool_pitch = fields.Float(related='specification_id.pitch', string='牙距(mm)')
+    # specification_id.pitch
+    # cutting_tool_blade_width = fields.Float('刃部宽度(mm)')
+    cutting_tool_blade_width = fields.Float(related='specification_id.blade_width', string='刃部宽度(mm)')
+    # specification_id.blade_width
+    # cutting_tool_blade_depth = fields.Float('刃部深度(mm)')
+    cutting_tool_blade_depth = fields.Float(related='specification_id.blade_depth', string='刃部深度(mm)')
+    # specification_id.blade_depth
     cutting_tool_cut_depth = fields.Float('切削深度(mm)')
-    cutting_tool_cut_depth_max = fields.Float('最大切削深度(mm)')
-    cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
-    cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
-    cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
-    cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20)
+    # cutting_tool_cut_depth_max = fields.Float('最大切削深度(mm)')
+    cutting_tool_cut_depth_max = fields.Float(related='specification_id.cut_depth_max', string='最大切削深度(mm)')
+    # specification_id.cut_depth_max
+    # cutting_tool_coarse_medium_fine = fields.Selection([('粗', '粗'), ('中', '中'), ('精', '精')], '粗/中/精')
+    cutting_tool_coarse_medium_fine = fields.Selection(related='cutting_tool_model_id.integral_coarse_medium_fine', string='粗/中/精')
+    # cutting_tool_model_id.integral_coarse_medium_fine
+    # cutting_tool_run_out_accuracy_max = fields.Float('端跳精度max', digits=(6, 1))
+    cutting_tool_run_out_accuracy_max = fields.Char(related='cutting_tool_model_id.integral_run_out_accuracy_max', string='端跳精度max', digits=(6, 1))
+    # cutting_tool_model_id.integral_run_out_accuracy_max
+    # cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1))
+    cutting_tool_run_out_accuracy_min = fields.Char(related='cutting_tool_model_id.integral_run_out_accuracy_min',
+                                                       string='端跳精度min', digits=(6, 1))
+    # cutting_tool_model_id.integral_run_out_accuracy_min
+    # cutting_tool_blade_tip_working_size = fields.Char('刀尖倒角度(°)', size=20)
+    cutting_tool_blade_tip_working_size = fields.Char(related='specification_id.blade_tip_working_size',
+                                                    string='刀尖倒角度(°)', size=20)
+    # specification_id.blade_tip_working_size
+    # cutting_tool_blade_tip_r_size = fields.Float('刀尖R角(mm)')
+    cutting_tool_blade_tip_r_size = fields.Float(related='specification_id.tip_r_size',
+                                                      string='刀尖R角(mm)')
+    # specification_id.tip_r_size
     fit_blade_shape_id = fields.Many2one('maintenance.equipment.image',
                                          '适配刀片形状', domain=[('type', '=', '刀片形状')])
     suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image',
@@ -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_main_included_angle = fields.Integer('主偏角(°)')
+    # cutting_tool_rear_angle = fields.Integer('后角(°)')
+    cutting_tool_rear_angle = fields.Integer(related='specification_id.relief_angle',
+                                        string='后角(°)')
+    # specification_id.relief_angle
+    # cutting_tool_main_included_angle = fields.Integer('主偏角(°)')
+    cutting_tool_main_included_angle = fields.Integer(related='specification_id.main_included_angle',
+                                             string='主偏角(°)')
+    # specification_id.main_included_angle
     # 适用夹头型号可以多选
     cutting_tool_chuck_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
         domain="[('cutting_tool_type', '=', '夹头')]",
         string='适用夹头型号')
     # 刀片参数
-    cutting_tool_cut_blade_length = fields.Float('切削刃长(mm)')
-    cutting_tool_blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
-    cutting_tool_top_angle = fields.Integer('顶角(°)')
-    cutting_tool_inscribed_circle_diameter = fields.Float('内接圆直径(mm)')
-    cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
-    cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
-                                                        string='有无断屑槽')
-    cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号')
-    cutting_tool_bladed_teeth_model = fields.Selection(
-        [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
-         ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
-         ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
-         ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
-         ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无')
-    cutting_tool_blade_blade_number = fields.Selection(
-        [('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'),
-         ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
-        string='刀片的刃数(个)')
+    # cutting_tool_cut_blade_length = fields.Float('切削刃长(mm)')
+    cutting_tool_cut_blade_length = fields.Float(related='specification_id.cutting_blade_length',
+                                        string='切削刃长(mm)')
+    # specification_id.cutting_blade_length
+    # cutting_tool_blade_tip_circular_arc_radius = fields.Char('刀尖圆弧半径(mm)', size=20)
+    cutting_tool_blade_tip_circular_arc_radius = fields.Char(related='specification_id.blade_tip_circular_arc_radius',
+                                                    string='刀尖圆弧半径(mm)')
+    # specification_id.blade_tip_circular_arc_radius
+    # cutting_tool_top_angle = fields.Integer('顶角(°)')
+    cutting_tool_top_angle = fields.Integer(related='specification_id.top_angle',
+                                                      string='顶角(°)')
+    # specification_id.top_angle
+    # cutting_tool_inscribed_circle_diameter = fields.Float('内接圆直径(mm)')
+    cutting_tool_inscribed_circle_diameter = fields.Float(related='specification_id.inscribed_circle_diameter',
+                                                             string='内接圆直径(mm)')
+    # specification_id.inscribed_circle_diameter
+    # cutting_tool_install_aperture_diameter = fields.Float('安装孔直径(mm)')
+    cutting_tool_install_aperture_diameter = fields.Float(related='specification_id.install_aperture_diameter',
+                                                             string='安装孔直径(mm)')
+    # specification_id.install_aperture_diameter
+    # cutting_tool_chip_breaker_groove = fields.Selection([('无', '无'), ('单面', '单面'), ('双面', '双面')],
+    #                                                     string='有无断屑槽')
+    cutting_tool_chip_breaker_groove = fields.Selection(related='specification_id.chip_breaker_groove',
+                                                          string='有无断屑槽')
+    # specification_id.chip_breaker_groove
+    # cutting_tool_chip_breaker_type_code = fields.Char('断屑槽型代号')
+    cutting_tool_chip_breaker_type_code = fields.Char(related='specification_id.chip_breaker_type_code',
+                                                          string='断屑槽型代号')
+    # specification_id.chip_breaker_type_code
+    # cutting_tool_bladed_teeth_model = fields.Selection(
+    #     [('无', '无'), ('V牙型', 'V牙型'), ('米制全牙型', '米制全牙型'), ('美制全牙型', '美制全牙型'),
+    #      ('惠氏全牙型', '惠氏全牙型'), ('BSPT全牙型', 'BSPT全牙型'), ('NPT全牙型', 'NPT全牙型'),
+    #      ('UNJ全牙型', 'UNJ全牙型'), ('DIN405圆牙型', 'DIN405圆牙型'), ('ACME梯形', 'ACME梯形'),
+    #      ('石油管螺纹刀片', '石油管螺纹刀片'), ('矮牙ACME梯形', '矮牙ACME梯形'),
+    #      ('Trapeze30° 103', 'Trapeze30° 103')], string='刀片牙型', default='无')
+    cutting_tool_bladed_teeth_model = fields.Selection(related='specification_id.blade_teeth_model',
+                                                      string='断屑槽型代号')
+    # specification_id.blade_teeth_model
+    # cutting_tool_blade_blade_number = fields.Selection(
+    #     [('0', '0'), ('1', '1'), ('2', '2'), ('3', '3'), ('4', '4'), ('5', '5'), ('6', '6'),
+    #      ('7', '7'), ('8', '8'), ('9', '9'), ('10', '10')],
+    #     string='刀片的刃数(个)')
+    cutting_tool_blade_blade_number = fields.Selection(related='specification_id.blade_blade_number',
+                                                          string='刀片的刃数(个)')
+    # specification_id.blade_blade_number
 
-    cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
-                                                 string='螺纹类型')
-    cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
-    cutting_tool_blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
-    cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
-    cutting_tool_thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
-
-    cutting_tool_jump_accuracy = fields.Char('径跳精度(mm)')
+    # cutting_tool_thread_model = fields.Selection([('无', '无'), ('外螺纹', '外螺纹'), ('内螺纹', '内螺纹')],
+    #                                              string='螺纹类型')
+    cutting_tool_thread_model = fields.Selection(related='specification_id.thread_model',
+                                                          string='螺纹类型')
+    # specification_id.thread_model
+    # cutting_tool_thread_num = fields.Float('每英寸螺纹数(tpi)')
+    cutting_tool_thread_num = fields.Float(related='specification_id.thread_num',
+                                                 string='每英寸螺纹数(tpi)')
+    # specification_id.thread_num
+    # cutting_tool_blade_tip_height_tolerance = fields.Char('刀尖高度公差(mm)', size=20)
+    cutting_tool_blade_tip_height_tolerance = fields.Char(related='specification_id.blade_tip_height_tolerance',
+                                             string='刀尖高度公差(mm)')
+    # specification_id.blade_tip_height_tolerance
+    # cutting_tool_inscribed_circle_tolerance = fields.Char('内接圆公差(mm)', size=20)
+    cutting_tool_inscribed_circle_tolerance = fields.Char(related='specification_id.inscribed_circle_tolerance',
+                                                          string='内接圆公差(mm)')
+    # specification_id.inscribed_circle_tolerance
+    # cutting_tool_thickness_tolerance = fields.Char('厚度公差(mm)', size=20)
+    cutting_tool_thickness_tolerance = fields.Char(related='specification_id.thickness_tolerance',
+                                                          string='厚度公差(mm)')
+    # specification_id.thickness_tolerance
+    # cutting_tool_jump_accuracy = fields.Char('径跳精度(mm)')
+    cutting_tool_jump_accuracy = fields.Char(related='specification_id.run_out_accuracy',
+                                               string='径跳精度(mm)')
+    # specification_id.run_out_accuracy
     cutting_tool_working_hardness = fields.Integer('加工硬度(hrc)')
     cutting_tool_cutter_bar_ids = fields.Many2many(
         'sf.cutting_tool.standard.library',
@@ -483,55 +600,153 @@ class ResProductMo(models.Model):
         string='适用刀盘型号'  # 使用空列表作为默认值
     )
     # 刀杆/参数
-    cutting_tool_knife_head_height = fields.Float('刀头高度(mm)')
-    cutting_tool_knife_head_width = fields.Float('刀头宽度(mm)')
-    cutting_tool_knife_head_length = fields.Float('刀头长度(mm)')
-    cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
-    cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)')
-    cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
-    cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)')
-    cutting_tool_installing_structure = fields.Char('安装结构', size=20)
+    # cutting_tool_knife_head_height = fields.Float('刀头高度(mm)')
+    cutting_tool_knife_head_height = fields.Float(related='specification_id.knife_head_height',
+                                               string='刀头高度(mm)')
+    # specification_id.knife_head_height
+    # cutting_tool_knife_head_width = fields.Float('刀头宽度(mm)')
+    cutting_tool_knife_head_width = fields.Float(related='specification_id.knife_head_width',
+                                                  string='刀头宽度(mm)')
+    # cutting_tool_knife_head_length = fields.Float('刀头长度(mm)')
+    cutting_tool_knife_head_length = fields.Float(related='specification_id.knife_head_length',
+                                                  string='刀头长度(mm)')
+    # cutting_tool_blade_diameter = fields.Float('刃径/刃部直径(mm)')
+    cutting_tool_blade_diameter = fields.Float(related='specification_id.blade_diameter',
+                                                     string='刃径/刃部直径(mm)')
+    # specification_id.blade_diameter
+    # cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)')
+    cutting_tool_cutter_arbor_diameter = fields.Float(related='specification_id.cutter_arbor_diameter',
+                                                        string='刀杆直径(mm)')
+    # specification_id.cutter_arbor_diameter
+    # cutting_tool_min_machining_aperture = fields.Integer('最小加工孔径(mm)')
+    cutting_tool_min_machining_aperture = fields.Integer(related='specification_id.min_machining_aperture',
+                                                        string='最小加工孔径(mm)')
+    # specification_id.min_machining_aperture
+    # cutting_tool_install_blade_tip_num = fields.Integer('可装刀片数/齿数(个)')
+    cutting_tool_install_blade_tip_num = fields.Integer(related='specification_id.install_blade_tip_num',
+                                            string='可装刀片数/齿数(个)')
+    # specification_id.install_blade_tip_num
+    # cutting_tool_installing_structure = fields.Char('安装结构', size=20)
+    cutting_tool_installing_structure = fields.Char(related='specification_id.installing_structure',
+                                                        string='安装结构')
+    # specification_id.installing_structure
     cutting_tool_blade_id = fields.Many2one(
         'sf.cutting_tool.standard.library',
         domain="[('cutting_tool_type', '=', '刀片')]",
         string='适用刀片型号'  # 使用空列表作为默认值
     )
-    cutting_tool_tool_shim = fields.Char('适配刀垫型号', size=50)
-    cutting_tool_cotter_pin = fields.Char('适配销钉型号', size=50)
-    cutting_tool_pressing_plate = fields.Char('适配压板型号', size=50)
-    cutting_tool_screw = fields.Char('适配螺钉型号', size=50)
-    cutting_tool_wrench = fields.Char('适配扳手型号')
-    cutting_tool_is_cooling_hole = fields.Boolean('有无冷却孔', default=False)
-    cutting_tool_locating_slot_code = fields.Char('定位槽代号', size=20)
+    # cutting_tool_blade_id = fields.Many2one(related='specification_id.blade_id',
+    #                                         domain="[('cutting_tool_type', '=', '刀片')]",
+    #                                  string='适用刀片型号')
+    # specification_id.blade_id
+    # cutting_tool_tool_shim = fields.Char('适配刀垫型号', size=50)
+    cutting_tool_tool_shim = fields.Char(related='specification_id.tool_shim',
+                                     string='适配刀垫型号')
+    # specification_id.tool_shim
+    # cutting_tool_cotter_pin = fields.Char('适配销钉型号', size=50)
+    cutting_tool_cotter_pin = fields.Char(related='specification_id.cotter_pin',
+                                         string='适配销钉型号')
+    # cutting_tool_pressing_plate = fields.Char('适配压板型号', size=50)
+    cutting_tool_pressing_plate = fields.Char(related='specification_id.pressing_plate',
+                                         string='适配压板型号')
+    # cutting_tool_screw = fields.Char('适配螺钉型号', size=50)
+    cutting_tool_screw = fields.Char(related='specification_id.screw',
+                                                      string='适配螺钉型号')
+    # specification_id.screw
+    # cutting_tool_wrench = fields.Char('适配扳手型号')
+    cutting_tool_wrench = fields.Char(related='specification_id.spanner',
+                                                      string='适配扳手型号')
+    # specification_id.spanner
+    # cutting_tool_is_cooling_hole = fields.Boolean('有无冷却孔', default=False)
+    cutting_tool_is_cooling_hole = fields.Boolean(related='specification_id.is_cooling_hole',
+                                                      string='有无冷却孔')
+    # specification_id.is_cooling_hole
+    # cutting_tool_locating_slot_code = fields.Char('定位槽代号', size=20)
+    cutting_tool_locating_slot_code = fields.Char(related='specification_id.locating_slot_code',
+                                                  string='定位槽代号')
+    # specification_id.locating_slot_code
     # 刀盘参数
-    cutting_tool_cutter_head_diameter = fields.Float('刀盘直径(mm)')
-    cutting_tool_interface_diameter = fields.Float('接口直径(mm)')
-
+    # cutting_tool_cutter_head_diameter = fields.Float('刀盘直径(mm)')
+    cutting_tool_cutter_head_diameter = fields.Float(related='specification_id.cutter_head_diameter',
+                                                     string='刀盘直径(mm)')
+    # specification_id.cutter_head_diameter
+    # cutting_tool_interface_diameter = fields.Float('接口直径(mm)')
+    cutting_tool_interface_diameter = fields.Float(related='specification_id.interface_diameter',
+                                                     string='接口直径(mm)')
+    # specification_id.interface_diameter
     # 刀柄参数
-    cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径')
-    cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
-    cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
-    cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
-    cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False)
-    cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
-    cutting_tool_change_time = fields.Integer('换刀时间(s)')
-    cutting_tool_clamping_way = fields.Char('夹持方式')
-    cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸')
-    cutting_tool_taper_shank_model = fields.Char('锥柄型号')
+    # cutting_tool_clamping_diameter_max = fields.Float('最大夹持直径')
+    cutting_tool_clamping_diameter_max = fields.Float(related='specification_id.max_clamping_diameter',
+                                                      string='最大夹持直径')
+    # specification_id.max_clamping_diameter
+    # cutting_tool_clamping_diameter_min = fields.Float('最小夹持直径')
+    cutting_tool_clamping_diameter_min = fields.Float(related='specification_id.min_clamping_diameter',
+                                               string='最小夹持直径')
+    # specification_id.min_clamping_diameter
+    # cutting_tool_flange_length = fields.Float('法兰柄长(mm)')
+    cutting_tool_flange_length = fields.Float(related='specification_id.flange_shank_length',
+                                            string='法兰柄长(mm)')
+    # cutting_tool_flange_diameter = fields.Float('法兰直径(mm)')
+    cutting_tool_flange_diameter = fields.Float(related='specification_id.flange_diameter',
+                                              string='法兰直径(mm)')
+    # cutting_tool_is_safety_lock = fields.Boolean('有无安全锁', default=False)
+    cutting_tool_is_safety_lock = fields.Boolean(related='specification_id.is_safe_lock',
+                                                string='有无安全锁')
+    # cutting_tool_is_high_speed_cutting = fields.Boolean('可高速切削', default=False)
+    cutting_tool_is_high_speed_cutting = fields.Boolean(related='specification_id.is_quick_cutting',
+                                                 string='可高速切削')
+    # cutting_tool_change_time = fields.Integer('换刀时间(s)')
+    cutting_tool_change_time = fields.Integer(related='specification_id.tool_changing_time',
+                                            string='换刀时间(s)')
+    # cutting_tool_clamping_way = fields.Char('夹持方式')
+    cutting_tool_clamping_way = fields.Char(related='specification_id.clamping_mode',
+                                        string='夹持方式')
+    # cutting_tool_fit_chuck_size = fields.Char('适配夹头尺寸')
+    cutting_tool_fit_chuck_size = fields.Char(related='specification_id.fit_chuck_size',
+                                            string='适配夹头尺寸')
+    # cutting_tool_taper_shank_model = fields.Char('锥柄型号')
+    cutting_tool_taper_shank_model = fields.Char(related='specification_id.taper_shank_model',
+                                            string='锥柄型号')
     cutting_tool_standard_speed = fields.Integer('标准转速(n/min)')
-    cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
+    # cutting_tool_speed_max = fields.Integer('最大转速(n/min)')
+    cutting_tool_speed_max = fields.Integer(related='specification_id.max_rotate_speed',
+                                        string='最大转速(n/min)')
+    # specification_id.max_rotate_speed
     cutting_tool_cooling_type = fields.Char('冷却类型')
     cutting_tool_dynamic_balance_class = fields.Char('动平衡等级')
-    cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号')
-
+    # cutting_tool_fit_nut_model = fields.Char('适用锁紧螺母型号')
+    cutting_tool_fit_nut_model = fields.Char(related='specification_id.nut',
+                                                 string='适用锁紧螺母型号')
+    # specification_id.nut
     # 夹头参数
-    cutting_tool_taper = fields.Integer('锥度(°)')
-    cutting_tool_top_diameter = fields.Float('顶部直径')
-    cutting_tool_outer_diameter = fields.Float('外径(mm)')
-    cutting_tool_inner_diameter = fields.Float('内径(mm)')
-    cooling_suit_type_ids = fields.Char('适用冷却套型号')
-    cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
-    cutting_tool_er_size_model = fields.Char('尺寸型号')
+    # cutting_tool_taper = fields.Integer('锥度(°)')
+    cutting_tool_taper = fields.Integer(related='specification_id.taper',
+                                               string='锥度(°)')
+    # specification_id.taper
+    # cutting_tool_top_diameter = fields.Float('顶部直径')
+    cutting_tool_top_diameter = fields.Float(related='specification_id.top_diameter',
+                                        string='顶部直径')
+    # specification_id.top_diameter
+    # cutting_tool_outer_diameter = fields.Float('外径(mm)')
+    # specification_id.outer_diameter
+    cutting_tool_outer_diameter = fields.Float(related='specification_id.outer_diameter',
+                                               string='外径(mm)')
+    # cutting_tool_inner_diameter = fields.Float('内径(mm)')
+    cutting_tool_inner_diameter = fields.Float(related='specification_id.inner_diameter',
+                                               string='内径(mm)')
+    # specification_id.inner_diameter
+    # cooling_suit_type_ids = fields.Char('适用冷却套型号')
+    cooling_suit_type_ids = fields.Char(related='specification_id.cooling_jacket',
+                                                 string='适用冷却套型号')
+    # specification_id.cooling_jacket
+    # cutting_tool_max_load_capacity = fields.Float('最大负载能力(kg)')
+    cutting_tool_max_load_capacity = fields.Float(related='specification_id.max_load_capacity',
+                                                 string='最大负载能力(kg)')
+    # specification_id.max_load_capacity
+    # cutting_tool_er_size_model = fields.Char('尺寸型号')
+    cutting_tool_er_size_model = fields.Char(related='specification_id.er_size_model',
+                                                  string='尺寸型号')
+    # specification_id.er_size_model
     # cutting_tool_handle_ids = fields.Many2many(
     #     'sf.cutting_tool.standard.library',
     #     relation='product_cutting_tool_library_chuck_handle_rel',
@@ -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([('未注册', '未注册'), ('已注册', '已注册'), ('注册失败', '注册失败')],
@@ -555,6 +774,10 @@ class ResProductMo(models.Model):
     # bfm下单
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
     part_number = fields.Char(string='零件图号', readonly=True)
+    machining_drawings = fields.Binary('2D加工图纸', readonly=True)
+    quality_standard = fields.Binary('质检标准', readonly=True)
+    machining_drawings_name = fields.Char('2D加工图纸名', readonly=True)
+    quality_standard_name = fields.Char('质检标准名', readonly=True)
 
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
@@ -616,6 +839,11 @@ class ResProductMo(models.Model):
         else:
             return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
 
+    def attachment_update(self, name, res_id, res_field):
+        attachment_info = self.env['ir.attachment'].sudo().search(
+            [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
+        attachment_info.write({'name': name})
+
     # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
     def product_create(self, product_id, item, order_id, order_number, i):
         copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
@@ -654,6 +882,11 @@ class ResProductMo(models.Model):
             'manual_quotation': item['manual_quotation'] or False,
             'part_number': item.get('part_number') or '',
             'active': True,
+            'machining_drawings_name': item['machining_drawings_name'],
+            'quality_standard_name': item['quality_standard_name'],
+            'machining_drawings': '' if not item['machining_drawings'] else base64.b64decode(
+                item['machining_drawings']),
+            'quality_standard': '' if not item['quality_standard'] else base64.b64decode(item['quality_standard']),
         }
         tax_id = self.env['account.tax'].sudo().search(
             [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])
@@ -661,6 +894,12 @@ class ResProductMo(models.Model):
             vals.update({'taxes_id': [(6, 0, [int(tax_id)])]})
         copy_product_id.sudo().write(vals)
         product_id.product_tmpl_id.active = False
+        if item['machining_drawings'] and item['machining_drawings_name']:
+            self.attachment_update(item['machining_drawings_name'], copy_product_id.product_tmpl_id.id,
+                                   'machining_drawings')
+        if item['quality_standard'] and item['quality_standard_name']:
+            self.attachment_update(item['quality_standard_name'], copy_product_id.product_tmpl_id.id,
+                                   'quality_standard')
         return copy_product_id
 
     def _get_ids(self, param):

sf_manufacturing/models/res_config_setting.py

@@ -0,0 +1,42 @@
+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

@@ -169,7 +169,6 @@ class StockRule(models.Model):
                 else:
                     forecasted_qties_by_loc[rule.location_src_id][procurement.product_id.id] -= qty_needed
                     procure_method = 'make_to_stock'
-
             move_values = rule._get_stock_move_values(*procurement)
             move_values['procure_method'] = procure_method
             moves_values_by_company[procurement.company_id.id].append(move_values)
@@ -177,15 +176,17 @@ class StockRule(models.Model):
         for company_id, moves_values in moves_values_by_company.items():
             # create the move as SUPERUSER because the current user may not have the rights to do it (mto product
             # launched by a sale for example)
-            logging.info(moves_values)
             moves = self.env['stock.move'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
                 moves_values)
-            logging.info(moves)
             # Since action_confirm launch following procurement_group we should activate it.
             moves._action_confirm()
-
         return True
 
+    def attachment_update(self, name, res_id, res_field):
+        attachment_info = self.env['ir.attachment'].sudo().search(
+            [('res_id', '=', res_id), ('res_field', '=', res_field)], limit=1)
+        attachment_info.write({'name': name})
+
     @api.model
     def _run_manufacture(self, procurements):
         productions_values_by_company = defaultdict(list)
@@ -271,6 +272,21 @@ 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})
+                else:
+                    production.write({'part_number': production.product_id.part_number,
+                                      'part_drawing': production.product_id.machining_drawings,
+                                      'quality_standard': production.product_id.quality_standard})
+                    if production.product_id.machining_drawings and production.product_id.machining_drawings_name:
+                        self.attachment_update(production.product_id.machining_drawings_name, production.id,
+                                               'part_drawing')
+                    if production.product_id.quality_standard and production.product_id.quality_standard_name:
+                        self.attachment_update(production.product_id.quality_standard_name, production.id,
+                                               'quality_standard')
                 if sale_order:
                     # sale_order.write({'schedule_status': 'to schedule'})
                     self.env['sf.production.plan'].sudo().with_company(company_id).create({
@@ -292,28 +308,47 @@ 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:
-                if production_item.product_id.id in product_id_to_production_names:
-                    if production_item.product_id.model_process_parameters_ids:
-                        is_purchase = False
-                        sorted_process_parameters = sorted(production_item.product_id.model_process_parameters_ids,
-                                                           key=lambda w: w.id)
 
-                        consecutive_process_parameters = []
-                        m = 0
-                        for i in range(len(sorted_process_parameters) - 1):
-                            if m == 0:
-                                is_purchase = False
-                            if self.env['product.template']._get_process_parameters_product(
-                                    sorted_process_parameters[i]).partner_id == self.env[
-                                'product.template']._get_process_parameters_product(sorted_process_parameters[
-                                                                                        i + 1]).partner_id and \
-                                    sorted_process_parameters[i].gain_way == '外协':
-                                if sorted_process_parameters[i] not in consecutive_process_parameters:
-                                    consecutive_process_parameters.append(sorted_process_parameters[i])
-                                consecutive_process_parameters.append(sorted_process_parameters[i + 1])
-                                m += 1
-                                continue
-                        else:
+                production_programming = self.env['mrp.production'].search(
+                    [('product_id.id', '=', production_item.product_id.id),
+                     ('origin', '=', production_item.origin)],
+                    limit=1, order='id asc')
+                if production_item.product_id.id in product_id_to_production_names:
+                    if not production_programming.programming_no:
+                        if production_item.product_id.model_process_parameters_ids:
+                            is_purchase = False
+                            sorted_process_parameters = sorted(production_item.product_id.model_process_parameters_ids,
+                                                               key=lambda w: w.id)
+
+                            consecutive_process_parameters = []
+                            m = 0
+                            for i in range(len(sorted_process_parameters) - 1):
+                                if m == 0:
+                                    is_purchase = False
+                                if self.env['product.template']._get_process_parameters_product(
+                                        sorted_process_parameters[i]).partner_id == self.env[
+                                    'product.template']._get_process_parameters_product(sorted_process_parameters[
+                                                                                            i + 1]).partner_id and \
+                                        sorted_process_parameters[i].gain_way == '外协':
+                                    if sorted_process_parameters[i] not in consecutive_process_parameters:
+                                        consecutive_process_parameters.append(sorted_process_parameters[i])
+                                    consecutive_process_parameters.append(sorted_process_parameters[i + 1])
+                                    m += 1
+                                    continue
+                            else:
+                                if m == len(consecutive_process_parameters) - 1 and m != 0:
+                                    self.env['purchase.order'].get_purchase_order(consecutive_process_parameters,
+                                                                                  production_item,
+                                                                                  product_id_to_production_names)
+                                    if sorted_process_parameters[i] in consecutive_process_parameters:
+                                        is_purchase = True
+                                    consecutive_process_parameters = []
+                                    m = 0
+                                # 当前面的连续外协采购单生成再生成当前外协采购单
+                            if is_purchase is False:
+                                self.env['purchase.order'].get_purchase_order(consecutive_process_parameters,
+                                                                              production_item,
+                                                                              product_id_to_production_names)
                             if m == len(consecutive_process_parameters) - 1 and m != 0:
                                 self.env['purchase.order'].get_purchase_order(consecutive_process_parameters,
                                                                               production_item,
@@ -322,39 +357,22 @@ class StockRule(models.Model):
                                     is_purchase = True
                                 consecutive_process_parameters = []
                                 m = 0
-                            # 当前面的连续外协采购单生成再生成当前外协采购单
-                        if is_purchase is False:
-                            self.env['purchase.order'].get_purchase_order(consecutive_process_parameters,
-                                                                          production_item,
-                                                                          product_id_to_production_names)
-                        if m == len(consecutive_process_parameters) - 1 and m != 0:
-                            self.env['purchase.order'].get_purchase_order(consecutive_process_parameters,
-                                                                          production_item,
-                                                                          product_id_to_production_names)
-                            if sorted_process_parameters[i] in consecutive_process_parameters:
-                                is_purchase = True
-                            consecutive_process_parameters = []
-                            m = 0
-                        if m == len(consecutive_process_parameters) - 1 and m != 0:
-                            self.env['purchase.order'].get_purchase_order(consecutive_process_parameters,
-                                                                          production_item,
-                                                                          product_id_to_production_names)
-                        if is_purchase is False and m == 0:
-                            if len(sorted_process_parameters) == 1:
-                                self.env['purchase.order'].get_purchase_order(sorted_process_parameters,
-                                                                              production_item,
-                                                                              product_id_to_production_names)
-                            else:
-                                self.env['purchase.order'].get_purchase_order(sorted_process_parameters[i],
+                            if m == len(consecutive_process_parameters) - 1 and m != 0:
+                                self.env['purchase.order'].get_purchase_order(consecutive_process_parameters,
                                                                               production_item,
                                                                               product_id_to_production_names)
+                            if is_purchase is False and m == 0:
+                                if len(sorted_process_parameters) == 1:
+                                    self.env['purchase.order'].get_purchase_order(sorted_process_parameters,
+                                                                                  production_item,
+                                                                                  product_id_to_production_names)
+                                else:
+                                    self.env['purchase.order'].get_purchase_order(sorted_process_parameters[i],
+                                                                                  production_item,
+                                                                                  product_id_to_production_names)
                     #     # 同一个产品多个制造订单对应一个编程单和模型库
                     #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
                     if not production_item.programming_no:
-                        production_programming = self.env['mrp.production'].search(
-                            [('product_id.id', '=', production_item.product_id.id),
-                             ('origin', '=', production_item.origin)],
-                            limit=1, order='id asc')
                         if not production_programming.programming_no:
                             production_item.fetchCNC(
                                 ', '.join(product_id_to_production_names[production_item.product_id.id]))
@@ -444,7 +462,7 @@ class ProductionLot(models.Model):
         if product.tracking == "serial":
             last_serial = self.env['stock.lot'].search(
                 [('company_id', '=', company.id), ('product_id', '=', product.id)],
-                limit=1, order='id DESC')
+                limit=1, order='name desc')
             if last_serial:
                 if product.categ_id.name == '刀具':
                     return self.env['stock.lot'].get_tool_generate_lot_names1(company, product)
@@ -548,7 +566,7 @@ class StockPicking(models.Model):
 
     # 设置外协出入单的名称
     def _get_name_Res(self, rescode):
-        last_picking = self.sudo().search([('name', 'like', rescode)], order='create_date desc,id desc', limit=1)
+        last_picking = self.sudo().search([('name', 'ilike', rescode)], order='create_date desc,id desc', limit=1)
         if not last_picking:
             num = "%04d" % 1
         else:
@@ -577,6 +595,7 @@ class StockPicking(models.Model):
              ('origin', '=', self.origin), ('picking_id', '=', self.id)])
         if self.location_id == move_in.location_id and self.location_dest_id == move_in.location_dest_id:
             if move_out.origin == move_in.origin:
+                move_in.write({'production_id': False})
                 if move_out.picking_id.state != 'done':
                     raise UserError(
                         _('该入库单对应的单号为%s的出库单还未完成，不能进行验证操作！' % move_out.picking_id.name))
@@ -662,6 +681,11 @@ class ReStockMove(models.Model):
         return move_values
 
     def _get_new_picking_values_Res(self, item, sorted_workorders, rescode):
+        picking_type_id = self.mapped('picking_type_id').id
+        if rescode == 'WH/OCOUT/':
+            picking_type_id = self.env.ref('sf_manufacturing.outcontract_picking_out').id
+        elif rescode == 'WH/OCIN/':
+            picking_type_id = self.env.ref('sf_manufacturing.outcontract_picking_in').id
         return {
             'name': self.env['stock.picking']._get_name_Res(rescode),
             'origin': item.name,
@@ -670,7 +694,7 @@ class ReStockMove(models.Model):
             'user_id': False,
             'move_type': self.mapped('group_id').move_type or 'direct',
             'partner_id': sorted_workorders.supplier_id.id,
-            'picking_type_id': self.mapped('picking_type_id').id,
+            'picking_type_id': picking_type_id,
             'location_id': self.mapped('location_id').id,
             'location_dest_id': self.mapped('location_dest_id').id,
             'state': 'confirmed',

sf_manufacturing/security/ir.model.access.csv

@@ -103,10 +103,20 @@ access_mrp_production_split_multi_group_sf_mrp_user,access.mrp.production.split.
 access_mrp_production_split_group_sf_mrp_user,access.mrp.production.split,mrp.model_mrp_production_split,sf_base.group_sf_mrp_user,1,1,1,0
 access_mrp_production_split_line_group_sf_mrp_user,access.mrp.production.split.line,mrp.model_mrp_production_split_line,sf_base.group_sf_mrp_user,1,1,1,0
 access_mrp_workcenter_capacity_manager_group_sf_mrp_user,mrp.workcenter.capacity.manager,mrp.model_mrp_workcenter_capacity,sf_base.group_sf_mrp_user,1,1,1,0
-
-
+access_mrp_workcenter_group_quality,mrp_workcenter_group_quality,model_mrp_workcenter,sf_base.group_quality,1,0,0,0
+access_mrp_workcenter_group_quality_director,mrp_workcenter_group_quality_director,model_mrp_workcenter,sf_base.group_quality_director,1,0,0,0
+access_sf_detection_result_group_quality,sf_detection_result_group_quality,model_sf_detection_result,sf_base.group_quality,1,0,1,0
+access_sf_detection_result_group_quality_director,sf_detection_result_group_quality_director,model_sf_detection_result,sf_base.group_quality_director,1,0,1,0
+access_mrp_workcenter_productivity_loss_group_quality,mrp_workcenter_productivity_loss_group_quality,mrp.model_mrp_workcenter_productivity_loss,sf_base.group_quality,1,0,0,0
+access_mrp_workcenter_productivity_loss_group_quality_director,mrp_workcenter_productivity_loss_group_quality_director,mrp.model_mrp_workcenter_productivity_loss,sf_base.group_quality_director,1,0,0,0
+access_mrp_workcenter_productivity_group_quality,mrp_workcenter_productivity_group_quality,mrp.model_mrp_workcenter_productivity,sf_base.group_quality,1,1,1,0
+access_mrp_workcenter_productivity_group_quality_director,mrp_workcenter_productivity_group_quality_director,mrp.model_mrp_workcenter_productivity,sf_base.group_quality_director,1,1,1,0
 access_mrp_production_group_plan_dispatch,mrp_production,model_mrp_production,sf_base.group_plan_dispatch,1,1,0,0
-access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_plan_dispatch,1,1,1,0
+access_mrp_production_group_quality,mrp_production,model_mrp_production,sf_base.group_quality,1,1,0,0
+access_mrp_production_group_quality_director,mrp_production,model_mrp_production,sf_base.group_quality_director,1,1,0,0
+access_mrp_workorder_group_quality,mrp_workorder,model_mrp_workorder,sf_base.group_quality,1,1,0,0
+access_mrp_workorder_group_quality_director,mrp_workorder,model_mrp_workorder,sf_base.group_quality_director,1,1,0,0
+access_mrp_workorder,mrp_workorder,model_mrp_workorder,sf_base.group_plan_dispatch,1,1,0,0
 access_sf_production_line_group_plan_dispatch,sf.production.line,model_sf_production_line,sf_base.group_plan_dispatch,1,0,0,0
 access_sf_production_line_group_plan_director,sf.production.line,model_sf_production_line,sf_base.group_plan_director,1,1,1,0
 access_sf_production_line,sf.production.line,model_sf_production_line,sf_maintenance.sf_group_equipment_user,1,1,1,0

sf_manufacturing/static/src/js/customRFID.js

@@ -3,13 +3,34 @@ $(document).off('keydown')
 $(document).on('keydown', 'body.o_web_client', function (e) {
     setTimeout(() => {
         RFID = ''
-    }, 200)
 
+    }, 200)
     if(e.key == 'Enter' && e.keyCode == 13 || e.key == 'Tab' && e.keyCode == 9){
+
+        let fieldValue1 = $('[name="routing_type"]');
+        console.log('字段值:', fieldValue1.text());
         console.log(RFID)
-        if(!RFID || RFID.length <= 3) return;
-        $('[name="button_start"]').trigger('click')
-        RFID = ''
+        let fieldValue2 = $('[name="rfid_code"]');
+        console.log('字段值2:', fieldValue2.text());
+        // if(!RFID || RFID.length <= 3) return;
+        // $('[name="button_start"]').trigger('click')
+        // setTimeout(() => {
+        //     $('.o_dialog .modal-footer .btn-primary').trigger('click')
+        // }, 50)
+        // RFID = ''
+        // return;
+
+        // fieldValue2.val() === '')
+        // 检查字段值是否等于“装夹预调”
+        if (fieldValue1.text() === '装夹预调') {
+            if (!RFID || RFID.length <= 3) return;
+            $('[name="button_start"]').trigger('click');
+            setTimeout(() => {
+                $('.o_dialog .modal-footer .btn-primary').trigger('click');
+            }, 100);
+        }
+
+        RFID = '';
         return;
     }
     RFID += e.key

sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js

@@ -10,7 +10,7 @@ odoo.define('sf_manufacturing.action_dispatch_confirm', function (require) {
             title: "确认",
             $content: $('<div>').append("请确认是否仅配送" + params.workorder_count + "个工件？"),
             buttons: [
-                { text: "确认", classes: 'btn-primary', close: true, click: () => dispatchConfirmed(parent, params) },
+                { text: "确认", classes: 'btn-primary jikimo_button_confirm', close: true, click: () => dispatchConfirmed(parent, params) },
                 { text: "取消", close: true },
             ],
         });

sf_manufacturing/views/mrp_production_addional_change.xml

@@ -98,9 +98,9 @@
                     <field name="production_line_id" readonly="1"/>
                     <!--                    <field name="production_line_state" readonly="1"/>-->
                     <field name="part_number" string="成品的零件图号"/>
-                    <field name="part_drawing"/>
                     <field name="tool_state"/>
                     <field name="tool_state_remark" string="备注" attrs="{'invisible': [('tool_state', '!=', '1')]}"/>
+                    <field name="deadline_of_delivery" readonly="1"/>
                     <field name="tool_state_remark2" invisible="1"/>
                 </xpath>
                 <xpath expr="//header//button[@name='action_cancel']" position="replace">
@@ -127,7 +127,7 @@
                             confirm="是否确认更新程序"
                             attrs="{'invisible': ['|',('state', '!=', 'rework'),('programming_state', '!=', '已编程未下发')]}"/>
                     <button name="button_rework" string="返工" type="object" groups="sf_base.group_sf_mrp_user"
-                            attrs="{'invisible': ['|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程')]}"/>
+                            attrs="{'invisible': ['|','|',('state', '!=', 'rework') ,('programming_state', '!=', '已编程'),('is_rework', '=', True)]}"/>
                     <button name="button_scrap_new" string="报废" type="object"
                             groups="sf_base.group_sf_mrp_user"
                             attrs="{'invisible': ['|',('is_scrap', '=', False),('state','=','cancel')]}"/>
@@ -201,6 +201,19 @@
                             data-hotkey="l"/>
                 </xpath>
 
+                <xpath expr="//button[@name='action_view_mo_delivery']" position="before">
+                    <button class="oe_stat_button" name="action_view_remanufacture_productions" type="object"
+                            icon="fa-wrench" attrs="{'invisible': [('remanufacture_count', '=', 0)]}"
+                            groups="mrp.group_mrp_user">
+                        <div class="o_field_widget o_stat_info">
+                            <span class="o_stat_value">
+                                <field name="remanufacture_count"/>
+                            </span>
+                            <span class="o_stat_text">新的制造</span>
+                        </div>
+                    </button>
+                </xpath>
+
                 <xpath expr="//header//button[@name='action_toggle_is_locked']" position="replace">
                     <button name="action_toggle_is_locked"
                             attrs="{'invisible': ['|', ('show_lock', '=', False), ('is_locked', '=', True)]}"
@@ -283,6 +296,13 @@
                     </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">
@@ -308,6 +328,16 @@
                 <xpath expr="//field[@name='components_availability']" position="attributes">
                     <attribute name="string">投料状态</attribute>
                 </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="零件图纸">
+                        <field name="part_drawing" widget="adaptive_viewer"/>
+                    </page>
+                </xpath>
+                <xpath expr="//sheet//notebook" position="inside">
+                    <page string="质检标准">
+                        <field name="quality_standard" widget="adaptive_viewer"/>
+                    </page>
+                </xpath>
             </field>
         </record>
 
@@ -331,8 +361,11 @@
             <field name="arch" type="xml">
                 <xpath expr="//tree" position="attributes">
                     <attribute name="default_order">sequence</attribute>
+                    <attribute name="decoration-warning">delivery_warning == 'warning'</attribute>
+                    <attribute name="decoration-danger">delivery_warning == 'overdue'</attribute>
                 </xpath>
                 <xpath expr="//field[@name='state']" position="replace">
+                    <field name="delivery_warning" invisible="True"/>
                     <field name="state" widget="badge" decoration-warning="state == 'progress'"
                            decoration-success="state == 'done'" decoration-danger="state in ('cancel','rework')"
                            decoration-muted="state == 'to be detected'"
@@ -424,6 +457,12 @@
                 <xpath expr="//header//button[@name='action_cancel']" position="replace">
                     <button name="action_cancel" type="object" string="取消" groups="sf_base.group_sf_mrp_user"/>
                 </xpath>
+                <xpath expr="//field[@name='state']" position="replace">
+                    <field name="state" decoration-success="state in ('done', 'to_close')"
+                           decoration-warning="state == 'progress'" decoration-info="state == 'confirmed'"
+                           decoration-danger="state in ('cancel','rework','scrap')" decoration-muted="state == 'draft'"
+                           optional="show" widget="badge" class="text-dark"/>
+                </xpath>
                 <xpath expr="//field[@name='state']" position="after">
                     <field name="tool_state" invisible="1"/>
                 </xpath>
@@ -533,7 +572,12 @@
                                             </div>
                                             <field name="priority" widget="priority"/>
                                         </div>
-
+                                        <t t-if="record.brand_id.raw_value">
+                                            <div class="mt-1">
+                                                品牌:
+                                                <field name="brand_id"></field>
+                                            </div>
+                                        </t>
                                         <div name="product_specification_id" class="mt-1">
                                             规格:
                                             <field name="specification_id"/>

sf_manufacturing/views/mrp_routing_workcenter_view.xml

@@ -17,6 +17,7 @@
                 <field name="bom_product_template_attribute_value_ids" position="after">
                     <field name="routing_type" required="1"/>
                     <field name="is_repeat"/>
+                    <field name="reserved_duration"/>
                 </field>
             </field>
         </record>

sf_manufacturing/views/mrp_workcenter_views.xml

@@ -6,9 +6,9 @@
         <field name="model">mrp.production</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-<!--             <button name="action_cancel" position="before"> -->
-<!--                 <button name="button_maintenance_req" type="object" string="维修请求"/> -->
-<!--             </button> -->
+            <!--             <button name="action_cancel" position="before"> -->
+            <!--                 <button name="button_maintenance_req" type="object" string="维修请求"/> -->
+            <!--             </button> -->
             <div name="button_box" position="inside">
                 <button name="open_maintenance_request_mo" type="object" class="oe_stat_button" icon="fa-wrench"
                         attrs="{'invisible': [('maintenance_count', '=', 0)]}"
@@ -25,38 +25,81 @@
     </record>
 
     <record id="custom_model_form_view_inherit" model="ir.ui.view">
-            <field name="name">custom.model.form.view.inherit</field>
-            <field name="model">mrp.workcenter</field>
-            <field name="inherit_id" ref="mrp.mrp_workcenter_view"/>
-            <field name="arch" type="xml">
-                <xpath expr='//form//sheet' position="after">
-                    <div class="oe_chatter">
-                        <field name="message_follower_ids"/>
-                        <field name="message_ids"/>
-                    </div>
-                </xpath>
-            </field>
-        </record>
+        <field name="name">custom.model.form.view.inherit</field>
+        <field name="model">mrp.workcenter</field>
+        <field name="inherit_id" ref="mrp.mrp_workcenter_view"/>
+        <field name="arch" type="xml">
+            <xpath expr='//form//sheet' position="after">
+                <div class="oe_chatter">
+                    <field name="message_follower_ids"/>
+                    <field name="message_ids"/>
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='default_capacity'][last()]" position="attributes">
+                <attribute name="invisible">1</attribute>
+            </xpath>
+            <xpath expr="//field[@name='default_capacity'][last()]" position="after">
 
-        <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
-            <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
-            <field name="model">mrp.workcenter</field>
-            <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
-            <field name="arch" type="xml">
-                <!-- Desktop view -->
-                <xpath expr='(//field[@name="name"])[1]' position="after">
-                        <field name="equipment_status" />
-                        <field name="equipment_image" />
-                </xpath>
-                 <xpath expr='(//field[@name="name"])[2]' position="after">
-                        <field name="equipment_status" />
-                        <field name="equipment_image" widget="image" />
-                </xpath>
-                <xpath expr='(//a[@name="unblock"])' position="after">
-                        <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>
-                </xpath>
-            </field>
-        </record>
+                <label for="default_capacity"/>
+                <div class="o_row">
+                    <field name="default_capacity" string="产线日产能"/>
+                    件
+                </div>
+            </xpath>
+            <xpath expr="//field[@name='default_capacity'][last()]" position="before">
+                <label for="available_machine_number"/>
+                <div class="o_row">
+                    <field name="available_machine_number"/>
+                    台
+                </div>
+                <label for="single_machine_capacity"/>
+                <div class="o_row">
+                    <field name="single_machine_capacity"/>
+                    件/小时
+                </div>
+                <label for="production_line_hour_capacity"/>
+                <div class="o_row">
+                    <field name="production_line_hour_capacity"/>
+                    件/小时
+                </div>
+                <label for="effective_working_hours_day"/>
+                <div class="o_row">
+                    <field name="effective_working_hours_day"/>
+                    小时
+                </div>
+            </xpath>
+            <!--            <xpath expr='//group[@name="capacity"]//field[@name="default_capacity"])' position="after">-->
+            <!--                <group>-->
+            <!--                    <field name="available_machine_number"/>-->
+            <!--                    <field name="single_machine_capacity"/>-->
+            <!--                    <field name="production_line_hour_capacity"/>-->
+            <!--                    <field name="effective_working_hours_day"/>-->
+
+            <!--                </group>-->
+            <!--            </xpath>-->
+
+        </field>
+    </record>
+
+    <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
+        <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
+        <field name="model">mrp.workcenter</field>
+        <field name="inherit_id" ref="mrp.mrp_workcenter_kanban"/>
+        <field name="arch" type="xml">
+            <!-- Desktop view -->
+            <xpath expr='(//field[@name="name"])[1]' position="after">
+                <field name="equipment_status"/>
+                <field name="equipment_image"/>
+            </xpath>
+            <xpath expr='(//field[@name="name"])[2]' position="after">
+                <field name="equipment_status"/>
+                <field name="equipment_image" widget="image"/>
+            </xpath>
+            <xpath expr='(//a[@name="unblock"])' position="after">
+                <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>
+            </xpath>
+        </field>
+    </record>
 
     <record id="mrp_workcenter_view_kanban_inherit_workorder" model="ir.ui.view">
         <field name="name">mrp.workcenter.view.kanban.inherit.mrp.workorder</field>
@@ -73,11 +116,11 @@
 
             </xpath>
             <xpath expr='(//a[@name="unblock"])' position="after">
-<!--                <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>-->
+                <!--                <div class="czyg">绿色：正常，红色：故障，黄色：下线/暂停</div>-->
             </xpath>
         </field>
     </record>
-<!--&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
+    <!--&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;&#45;-->
     <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
         <field name="name">mrp.workcenter.kanban.inherit</field>
         <field name="model">mrp.workcenter</field>
@@ -99,7 +142,7 @@
         </field>
     </record>
 
-<!--         继承原有的看板视图 -->
+    <!--         继承原有的看板视图 -->
     <record id="mrp_workcenter_kanban_inherit1" model="ir.ui.view">
         <field name="name">mrp.workcenter.kanban.inherit</field>
         <field name="model">mrp.workcenter</field>
@@ -391,9 +434,9 @@
         <field name="model">mrp.production</field>
         <field name="inherit_id" ref="mrp.mrp_production_form_view"/>
         <field name="arch" type="xml">
-<!--             <button name="action_cancel" position="before"> -->
-<!--                 <button name="button_maintenance_req" type="object" string="维修请求"/> -->
-<!--             </button> -->
+            <!--             <button name="action_cancel" position="before"> -->
+            <!--                 <button name="button_maintenance_req" type="object" string="维修请求"/> -->
+            <!--             </button> -->
             <div name="button_box" position="inside">
                 <button name="open_maintenance_request_mo" type="object" class="oe_stat_button" icon="fa-wrench"
                         attrs="{'invisible': [('maintenance_count', '=', 0)]}"

sf_manufacturing/views/mrp_workorder_view.xml

@@ -10,7 +10,7 @@
                 <field name="name" decoration-success="is_subcontract" decoration-bf="is_subcontract"/>
             </field>
             <field name="name" position="before">
-                <field name="sequence"/>
+                <field name="sequence" string="序号"/>
                 <field name='user_permissions' invisible="1"/>
             </field>
             <field name="name" position="after">
@@ -32,19 +32,24 @@
             </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"/>
             </xpath>
+            <xpath expr="//field[@name='date_planned_start']" position="before">
+                <field name="reserved_duration" string="计划预留时间" optional="hide"/>
+            </xpath>
             <xpath expr="//field[@name='date_planned_finished']" position="replace">
                 <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',-->
-<!--                    'done',-->
-<!--                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),-->
-<!--                    ('is_user_working', '!=', False),("user_permissions","=",False),("name","=","CNC加工")]}-->
-<!--                </attribute>-->
+                <!--                <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',-->
+                <!--                    'done',-->
+                <!--                    'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),-->
+                <!--                    ('is_user_working', '!=', False),("user_permissions","=",False),("name","=","CNC加工")]}-->
+                <!--                </attribute>-->
                 <attribute name="attrs">{'invisible': ['|', '|', '|','|','|', ('production_state','in', ('draft',
                     'done',
                     'cancel')), ('working_state', '=', 'blocked'), ('state', 'in', ('done', 'cancel')),
@@ -96,7 +101,9 @@
         <!--        <field name="target">fullscreen</field>-->
         <field name="target">current</field>
         <field name="domain">[('state', '!=', 'cancel'),('schedule_state', '=', '已排')]</field>
-        <field name="context">{'search_default_product': 1, 'search_default_workcenter_id': active_id}</field>
+        <field name="context">{'search_default_product': 1, 'search_default_workcenter_id':
+            active_id,'search_default_filter_order_warning':1,'search_default_filter_order_overdue':1}
+        </field>
         <field name="help" type="html">
             <p class="o_view_nocontent_workorder">
                 没有工单要做！
@@ -162,8 +169,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="是否确认开始"-->
-<!--                        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': ['|', '|', '|', ('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"
@@ -188,14 +195,14 @@
                 <!--                         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"-->
-<!--                        attrs="{'invisible': ['|','|','|','|',('routing_type','!=','装夹预调'),('is_delivery','=',True),('state','!=','done'),('is_rework','=',True),'&amp;',('rfid_code','in',['',False]),('state','=','done')]}"/>-->
+                <!--                <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')]}"/>-->
                 <button name="button_rework_pre" type="object" string="返工"
                         class="btn-primary"
                         attrs="{'invisible': ['|','|',('routing_type','!=','装夹预调'),('state','!=','progress'),('is_rework','=',True)]}"/>
                 <button name="unbind_tray" type="object" string="解绑托盘"
                         class="btn-primary"
-                        attrs="{'invisible': ['|', '|', ('routing_type','!=','装夹预调'),('state','!=','progress'), ('is_trayed', '=', False)]}"/>
+                        attrs="{'invisible': ['|', '|', '|', ('routing_type','!=','装夹预调'),('state','!=','progress'), ('is_trayed', '=', False), ('state', 'in', ('done'))]}"/>
                 <button name="print_method" type="object" string="打印二维码" class="btn-primary"
                         attrs="{'invisible': ['|',('routing_type','!=','解除装夹'),('state','!=','done')]}"/>
             </xpath>
@@ -216,11 +223,51 @@
                 </page>
             </xpath>
             <xpath expr="//label[1]" position="before">
-                <field name='routing_type' readonly="1"/>
-                <field name='process_state' attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/>
-                <field name="rfid_code" force_save="1" readonly="1" cache="True"
+                <!--                -->
+                <field name="production_id" invisible="0"/>
+                <field name="duration_expected" invisible="1"/>
+                <field name="date_planned_start" invisible="1"/>
+                <field name="date_planned_finished" invisible="1"/>
+                <field name="duration" widget="mrp_timer"
+                       invisible="1" sum="real duration"/>
+                <field name="glb_file" readonly="1" widget="Viewer3D" string="加工模型"/>
+                <field name="manual_quotation" readonly="1"
+                       attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
+                <field name="processing_panel" readonly="1"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
+                <field name="equipment_id" readonly="1"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+                <field name="production_line_id"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+                <field name="production_line_state" readonly="1"
+                       attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
+
+                <field name='routing_type' invisible="1"/>
+                <field name='process_state' invisible="1"/>
+                <field name='tag_type' readonly="1" attrs='{"invisible": [("tag_type","=",False)]}'
+                       decoration-danger="tag_type == '重新加工'"/>
+                <field name="rfid_code" force_save="1" readonly="0" cache="True"
                        attrs="{'invisible': [('rfid_code_old', '!=', False)]}"/>
                 <field name="rfid_code_old" readonly="1" attrs="{'invisible': [('rfid_code_old', '=', False)]}"/>
+
+            </xpath>
+            <xpath expr="//form//sheet//group//group//div[2]" position="replace">
+            </xpath>
+            <xpath expr="//form//sheet//group//group//div[1]" position="after">
+                <field name="save_name" widget="CopyClipboardChar"
+                       attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
+                <label for="material_length" string="物料尺寸"/>
+                <div class="o_address_format">
+                    <label for="material_length" string="长"/>
+                    <field name="material_length" class="o_address_zip"/>
+                    <span>&amp;nbsp;</span>
+                    <label for="material_width" string="宽"/>
+                    <field name="material_width" class="o_address_zip"/>
+                    <span>&amp;nbsp;</span>
+                    <label for="material_height" string="高"/>
+                    <field name="material_height" class="o_address_zip"/>
+                </div>
+                <field name="part_number" string="成品的零件图号"/>
             </xpath>
             <xpath expr="//label[1]" position="attributes">
                 <attribute name="string">计划加工时间</attribute>
@@ -238,76 +285,12 @@
                 <field name='materiel_width' string="宽"/>
                 <field name='materiel_height' string="高"/>
             </xpath>
-            <field name="production_id" position="after" invisible="0">
-                <group>
-                    <field name="date_planned_start" invisible="1"/>
-                    <field name="date_planned_finished" invisible="1"/>
-                    <!--                    <field name="production_id" readonly="1"/>-->
-                    <field name="duration" widget="mrp_timer"
-                           attrs="{'invisible': [('production_state','=', 'draft')], 'readonly': [('is_user_working', '=', True)]}"
-                           sum="real duration"/>
-                    <field name="glb_file" readonly="1" widget="Viewer3D" string="加工模型"/>
-                    <field name="manual_quotation" readonly="1"
-                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
-                    <field name="processing_panel" readonly="1"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
-                    <field name="equipment_id" readonly="1"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
-                    <field name="production_line_id"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割"))]}'/>
-                    <field name="production_line_state" readonly="1"
-                           attrs='{"invisible": [("routing_type","in",("获取CNC加工程序","切割","装夹预调"))]}'/>
-                    <!--                     <field name="functional_fixture_id" -->
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-                    <!--                     <field name="functional_fixture_code" force_save="1" -->
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-                    <!--                     <field name="functional_fixture_type_id" -->
-                    <!--                            attrs='{"invisible": [("routing_type","!=","装夹预调")]}'/> -->
-                </group>
-                <!--                <group>-->
-                <!--                    <div>-->
-                <!--                        <label for="glb_file" string="加工模型"/>-->
-                <!--                        <field name="glb_file" readonly="1" widget="Viewer3D"/>-->
-                <!--                    </div>-->
-                <!--                    &lt;!&ndash;                    <field name="glb_file" string="模型" readonly="1" widget="Viewer3D"/>&ndash;&gt;-->
-                <!--                </group>-->
 
-                <!--                <field name="processing_panel" readonly="1" attrs="{'invisible': [('routing_type', 'in', ('获取CNC加工程序','装夹','解除装夹',-->
-                <!--                '前置三元定位检测','后置三元质量检测','解除装夹'))]}"/>-->
-            </field>
-            <!--            <page string="Components" name="components">-->
+
             <xpath expr="//page[1]" position="before">
-                <!--                <page string="装夹托盘" attrs='{"invisible": [("routing_type","!=","装夹")]}'>-->
-                <!--                    <group>-->
-                <!--                        <field name="routing_type" invisible="1"/>-->
-                <!--                        <field name="tray_code"/>-->
-                <!--                        <field name="tray_id" readonly="1"/>-->
-                <!--                    </group>-->
-                <!--                    <group>-->
-                <!--                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","=",False)]}'-->
-                <!--                               style="color:green"/>-->
-                <!--                        <field name="pro_code" readonly="1" attrs='{"invisible": [("pro_code_ok","!=",False)]}'/>-->
-                <!--                        <div>-->
-                <!--                            <field name="pro_code_ok" invisible="1"/>-->
-                <!--                        </div>-->
-
-                <!--                    </group>-->
-                <!--                    <div class="col-12 col-lg-6 o_setting_box">-->
-                <!--                        <button type="object" class="oe_highlight" name="gettray" string="绑定托盘"-->
-                <!--                                attrs='{"invisible": ["|","|",("tray_id","!=",False),("state","!=","progress"),("production_id","=",False)]}'/>-->
-
-                <!--                    </div>-->
-                <!--                </page>-->
                 <page string="工件装夹" attrs='{"invisible": [("routing_type","!=","装夹预调")]}'>
                     <group>
                         <field name="_barcode_scanned" widget="barcode_handler"/>
-                        <!--                        <group string="卡盘">-->
-                        <!--                            <field name="chuck_serial_number"/>-->
-                        <!--                            <field name="chuck_name"/>-->
-                        <!--                            <field name="chuck_brand_id"/>-->
-                        <!--                            <field name="chuck_type_id"/>-->
-                        <!--                            <field name="chuck_model_id"/>-->
-                        <!--                        </group>-->
                         <group string="托盘">
                             <field name="tray_serial_number" readonly="1" string="序列号"/>
                         </group>
@@ -322,10 +305,6 @@
                             <field name="tray_model_id" readonly="1" string="型号"/>
                         </group>
                     </group>
-                    <group string="加工图纸">
-                        <!--                         隐藏加工图纸字段名 -->
-                        <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
-                    </group>
                     <group string="预调程序信息">
                         <field name="preset_program_information" colspan="2" nolabel="1"
                                placeholder="如有预调程序信息请在此处输入....."/>
@@ -476,10 +455,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="获取数据"
-                                attrs='{"invisible": ["|", "|", "|", ("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", True)]}'/>
-                        <button type="object" class="oe_highlight" name="getcenter" string="计算定位"
-                                attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/>
+                        <!--                         <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)]}'/> -->
+                        <!--                         <button type="object" class="oe_highlight" name="getcenter" string="计算定位" -->
+                        <!--                                 attrs='{"invisible": ["|","|", "|",("material_center_point","!=",False),("state","!=","progress"),("user_permissions","=",False), ("data_state", "=", False)]}'/> -->
                     </div>
 
                     <group>
@@ -510,6 +489,12 @@
 
             </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"/>
@@ -558,9 +543,7 @@
                             <!--                            <field name="button_state" invisible="1"/>-->
                         </tree>
                     </field>
-                    <group>
-                        <field name="cnc_worksheet" string="工作指令" widget="pdf_viewer"/>
-                    </group>
+
                 </page>
                 <page string="CMM程序" attrs='{"invisible": [("routing_type","!=","CNC加工")]}'>
                     <field name="cmm_ids" widget="one2many" string="CMM程序" readonly="1">
@@ -589,33 +572,60 @@
 
                 </page>
             </xpath>
-            <xpath expr="//form//sheet//group//group//div[1]" position="after">
-                <label for="date_start" string="实际加工时间"/>
-                <div class="oe_inline">
-                    <field name="date_start" class="mr8 oe_inline"/>
-                    <strong class="mr8 oe_inline">到</strong>
-                    <field name="date_finished" class="oe_inline"/>
-                </div>
+            <!--            <xpath expr="//form//sheet//group//group//div[1]" position="after">-->
+            <!--                <label for="date_start" string="实际加工时间"/>-->
+            <!--                <div class="oe_inline">-->
+            <!--                    <field name="date_start" class="mr8 oe_inline"/>-->
+            <!--                    <strong class="mr8 oe_inline">到</strong>-->
+            <!--                    <field name="date_finished" class="oe_inline"/>-->
+            <!--                </div>-->
+            <!--            </xpath>-->
+            <xpath expr="//page[@name='time_tracking']//field[@name='time_ids']//tree//field[@name='date_end']"
+                   position="after">
+                <field name="duration" string="实际时长"/>
             </xpath>
-            <xpath expr="//form//sheet//group//group//div[3]" position="after">
-                <field name="save_name" widget="CopyClipboardChar"
-                       attrs="{'invisible':[('routing_type','!=','装夹预调')]}"/>
-                <label for="material_length" string="物料尺寸"/>
-                <div class="o_address_format">
-                    <label for="material_length" string="长"/>
-                    <field name="material_length" class="o_address_zip"/>
-                    <span>&amp;nbsp;</span>
-                    <label for="material_width" string="宽"/>
-                    <field name="material_width" class="o_address_zip"/>
-                    <span>&amp;nbsp;</span>
-                    <label for="material_height" string="高"/>
-                    <field name="material_height" class="o_address_zip"/>
-                </div>
-                <field name="part_number" string="成品的零件图号"/>
+            <xpath expr="//page[@name='time_tracking']" position="attributes">
+                <attribute name="groups">
+                    mrp.group_mrp_manager,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user,sf_base.group_sf_order_user
+                </attribute>
+            </xpath>
+            <xpath expr="//sheet//notebook" position="inside">
+                <page string="2D加工图纸">
+                    <field name="machining_drawings" widget="adaptive_viewer"
+                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
+                </page>
+            </xpath>
+            <xpath expr="//sheet//notebook" position="inside">
+                <page string="质检标准">
+                    <field name="quality_standard" widget="adaptive_viewer"
+                           attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}"/>
+                </page>
             </xpath>
         </field>
     </record>
 
+    <record id="view_mrp_production_workorder_tray_form_inherit_sf_1" model="ir.ui.view">
+        <field name="name">mrp.production.workorder.tray.form.inherit.sf.1</field>
+        <field name="model">mrp.workorder</field>
+        <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form//sheet//group//group[2]" position="replace">
+                <group string="装夹图纸" attrs="{'invisible': [('routing_type', '!=', '装夹预调')]}">
+                    <!--                         隐藏加工图纸字段名 -->
+                    <field name="processing_drawing" widget="pdf_viewer" string="" readonly="1"/>
+                    <!--                    <field name="production_id" invisible="0"/>-->
+                </group>
+                <group string="工作指令" attrs="{'invisible': [('routing_type', '!=', 'CNC加工')]}">
+                    <field name="cnc_worksheet" string="" widget="pdf_viewer"/>
+                </group>
+            </xpath>
+            <!--            <xpath expr="//form//sheet//group//group[1]" position="before">-->
+            <!--                <field name="production_id"/>-->
+            <!--            </xpath>-->
+        </field>
+    </record>
+
+
     <record id="workcenter_form_workorder_search" model="ir.ui.view">
         <field name="name">custom.workorder.search</field>
         <field name="model">mrp.workorder</field>
@@ -627,6 +637,12 @@
             <xpath expr="//filter[@name='progress']" position="after">
                 <filter string="待检测" name="state" domain="[('state','=','to be detected')]"/>
             </xpath>
+            <xpath expr="//filter[@name='date_start_filter']" position="before">
+                <separator/>
+                <filter string="预警" name="filter_order_warning" domain="[('delivery_warning', '=', 'warning')]"/>
+                <filter string="逾期" name="filter_order_overdue" domain="[('delivery_warning', '=', 'overdue')]"/>
+                <separator/>
+            </xpath>
         </field>
     </record>
 
@@ -656,9 +672,10 @@
         <field name="name">工件配送</field>
         <field name="model">sf.workpiece.delivery</field>
         <field name="arch" type="xml">
-            <tree string="工件配送" class="center" create="0" delete="0">
+            <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" 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 == '已配送'"
@@ -670,15 +687,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}"-->
-<!--                       domain="[('route_type','in',['上产线','下产线'])]"/>-->
+                <!--                <field name="route_id" options="{'no_create': True}"-->
+                <!--                       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_completion_time" readonly="1"/>-->
-<!--                <field name="delivery_duration" widget="float_time"/>-->
+                <!--                <field name="task_delivery_time" readonly="1"/>-->
+                <!--                <field name="task_completion_time" readonly="1"/>-->
+                <!--                <field name="delivery_duration" widget="float_time"/>-->
             </tree>
         </field>
     </record>
@@ -783,7 +800,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>
@@ -845,10 +862,10 @@
         <field name="domain">[('type','in',['运送空料架']),('name','not ilike','WDO')]</field>
     </record>
 
-     <menuitem id="mrp.menu_mrp_manufacturing"
-            name="Operations"
-            sequence="10"
-            parent="mrp.menu_mrp_root"
-            groups="sf_base.group_sf_order_user,sf_base.group_sf_mrp_manager,sf_base.group_sf_equipment_user"/>
+    <menuitem id="mrp.menu_mrp_manufacturing"
+              name="Operations"
+              sequence="10"
+              parent="mrp.menu_mrp_root"
+              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

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record id="res_config_settings_view_form_sf_sync" model="ir.ui.view">
+            <field name="name">res.config.settings.view.form.inherit.sf_sync</field>
+            <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">
+                                <field name="is_agv_task_dispatch"/>
+                            </div>
+                            <div class="o_setting_right_pane">
+                                <div class="text-muted">
+                                    <label for="is_agv_task_dispatch"/>
+                                </div>
+                            </div>
+                        </div>
+                </xpath>
+            </field>
+        </record>
+    </data>
+</odoo>