Merge branch 'hotfix/修复工件上下产线'

jikimo_account_process/__init__.py

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

jikimo_account_process/__manifest__.py

@@ -1,35 +0,0 @@
-# -*- coding: utf-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
-    """,
-
-    'author': "My Company",
-    'website': "https://www.yourcompany.com",
-
-    # Categories can be used to filter modules in modules listing
-    # Check https://github.com/odoo/odoo/blob/16.0/odoo/addons/base/data/ir_module_category_data.xml
-    # for the full list
-    'category': 'Uncategorized',
-    'version': '0.1',
-
-    # any module necessary for this one to work correctly
-    'depends': ['base', 'account'],
-
-    # always loaded
-    'data': [
-        # 'security/ir.model.access.csv',
-        # 'views/views.xml',
-        # 'views/templates.xml',
-    ],
-    # only loaded in demonstration mode
-    'demo': [
-        # 'demo/demo.xml',
-    ],
-}

jikimo_account_process/controllers/__init__.py

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

jikimo_account_process/controllers/controllers.py

@@ -1,21 +0,0 @@
-# -*- coding: utf-8 -*-
-# from odoo import http
-
-
-# class JikimoAccountProcess(http.Controller):
-#     @http.route('/jikimo_account_process/jikimo_account_process', auth='public')
-#     def index(self, **kw):
-#         return "Hello, world"
-
-#     @http.route('/jikimo_account_process/jikimo_account_process/objects', auth='public')
-#     def list(self, **kw):
-#         return http.request.render('jikimo_account_process.listing', {
-#             'root': '/jikimo_account_process/jikimo_account_process',
-#             'objects': http.request.env['jikimo_account_process.jikimo_account_process'].search([]),
-#         })
-
-#     @http.route('/jikimo_account_process/jikimo_account_process/objects/<model("jikimo_account_process.jikimo_account_process"):obj>', auth='public')
-#     def object(self, obj, **kw):
-#         return http.request.render('jikimo_account_process.object', {
-#             'object': obj
-#         })

jikimo_account_process/models/__init__.py

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

jikimo_account_process/models/account_move.py

@@ -1,15 +0,0 @@
-from odoo import models, fields, api
-
-from odoo.exceptions import ValidationError
-
-
-class CustomAccountMoveLine(models.Model):
-    _inherit = 'account.move'
-    _description = "account move line"
-
-    @api.model_create_multi
-    def create(self, vals):
-        for val in vals:
-            val['name'] = self.env['ir.sequence'].next_by_code('account.move') or '/'
-        # 因为供应商与客户支付创建流程是先创建move line在修改来填充account_payment与move line的关联
-        return super(CustomAccountMoveLine, self).create(vals)

jikimo_account_process/models/models.py

@@ -1,18 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# from odoo import models, fields, api
-
-
-# class jikimo_account_process(models.Model):
-#     _name = 'jikimo_account_process.jikimo_account_process'
-#     _description = 'jikimo_account_process.jikimo_account_process'
-
-#     name = fields.Char()
-#     value = fields.Integer()
-#     value2 = fields.Float(compute="_value_pc", store=True)
-#     description = fields.Text()
-#
-#     @api.depends('value')
-#     def _value_pc(self):
-#         for record in self:
-#             record.value2 = float(record.value) / 100

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -5,7 +5,7 @@ import {patch} from '@web/core/utils/patch';
 import {_t} from "@web/core/l10n/translation";
 import {FormStatusIndicator} from "@web/views/form/form_status_indicator/form_status_indicator";
 import {ListRenderer} from "@web/views/list/list_renderer";
-// import {StatusBarField} from "@web/views/fields/statusbar/statusbar_field";
+import {StatusBarField} from "@web/views/fields/statusbar/statusbar_field";
 
 import {Field} from "@web/views/fields/field";
 
@@ -53,23 +53,6 @@ const tableRequiredList = [
 ]
 
 patch(FormStatusIndicator.prototype, 'jikimo_frontend.FormStatusIndicator', {
-        setup() {
-            owl.onMounted(() => {
-                try {
-                    const dom = this.__owl__.bdom.el
-                    const buttonsDom = $(dom).find('.o_form_status_indicator_buttons ')
-                    if (buttonsDom) {
-                        const dom1 = buttonsDom.children('.o_form_button_save')
-                        const dom2 = buttonsDom.children('.o_form_button_cancel')
-                        dom1.append('保存')
-                        dom2.append('取消')
-                    }
-                } catch (e) {
-                    console.log(e)
-                }
-
-            });
-        },
         // 你可以重写或者添加一些方法和属性
         async _onDiscardChanges() {
             // var self = this;
@@ -170,36 +153,47 @@ patch(ListRenderer.prototype, 'jikimo_frontend.ListRenderer', {
 
 
 // 根据进度条设置水印
-// const statusbar_params = {
-//     '已完工': 'bg-primary',
-//     '完成': 'bg-primary',
-//     '采购订单': 'bg-primary',
-//     '作废': 'bg-danger',
-//     '封存(报废)': 'bg-danger',
-// }
-// patch(StatusBarField.prototype, 'jikimo_frontend.StatusBarField', {
-//    setup() {
-//         owl.onMounted(this.ribbons);
-//         return this._super(...arguments);
-//    },
-//    ribbons() {
-//        try {
-//            const dom = $('.o_form_sheet.position-relative')
-//            const status = statusbar_params[this.currentName]
-//            if(status && dom.length) {
-//                dom.prepend(`<div class="o_widget o_widget_web_ribbon">
-//                                 <div class="ribbon ribbon-top-right">
-//                                     <span class="bg-opacity-75 ${status}" title="">${this.currentName}</span>
-//                                 </div>
-//                             </div>`)
-//            }
-//        } catch (e) {
-//            console.log(e)
-//        }
-//    }
-// })
+const statusbar_params = {
+    '已完工': 'bg-primary',
+    '完成': 'bg-primary',
+    '采购订单': 'bg-primary',
+    '作废': 'bg-danger',
+    '封存(报废)': 'bg-danger',
+}
+patch(StatusBarField.prototype, 'jikimo_frontend.StatusBarField', {
+   setup() {
+        owl.onMounted(this.ribbons);
+        return this._super(...arguments);
+   },
+   ribbons() {
+       try {
+           const dom = $('.o_form_sheet.position-relative')
+           const status = statusbar_params[this.currentName]
+           if(status && dom.length) {
+               dom.prepend(`<div class="o_widget o_widget_web_ribbon">
+                                <div class="ribbon ribbon-top-right">
+                                    <span class="bg-opacity-75 ${status}" title="">${this.currentName}</span>
+                                </div>
+                            </div>`)
+           }
+       } catch (e) {
+           console.log(e)
+       }
+   }
+})
 
 $(function () {
+    document.addEventListener('click', function () {
+        const dom = $('.o_form_status_indicator_buttons ')
+        if (dom) {
+            const dom1 = dom.children().eq(0)
+            const dom2 = dom.children().eq(1)
+            if (!dom1.text()) {
+                dom1.append('保存')
+                dom2.append('取消')
+            }
+        }
+    })
 
     function customRequired() {
         let timer = null

jikimo_frontend/static/src/scss/custom_style.scss

@@ -521,14 +521,4 @@ div:has(.o_required_modifier) > label::before {
 .o_list_renderer.o_renderer  {
   max-width: 100%;
   overflow-x: auto;
-}
-
-// 设置表单页面label文本不换行
-.o_form_view .o_group .o_wrap_label .o_form_label {
-  white-space: nowrap;
-}
-// 修复表格内容覆盖表头bug
-.o_list_renderer .o_list_table tbody th {
-  position: unset;
-}
-
+}

jikimo_hide_options/models/models.py

@@ -301,27 +301,53 @@ def unlink(self):
     # This is used to restrict the access right to unlink a record
     current_model_id = self.env['ir.model'].sudo().search(
         [('model', '=', self._name)]).id
-    access_right_rec = self.env['access.right'].sudo().search_read(
-        [('model_id', '=', current_model_id)], ['model_id', 'is_delete',
-                                                'groups_id'])
-    if access_right_rec and not self.env.is_admin():
-        for rec in access_right_rec:
-            group_name = self.env['ir.model.data'].sudo().search([
-                ('model', '=', 'res.groups'),
-                ('res_id', '=', rec['groups_id'][0])
-            ]).name
-            module_name = self.env['ir.model.data'].sudo().search([
-                ('model', '=', 'res.groups'),
-                ('res_id', '=', rec['groups_id'][0])
-            ]).module
-            group = module_name + "." + group_name
-            if self.env.user.has_group(group):
-                if rec['is_delete']:
-                    raise UserError(_('You are restricted from performing this'
-                                      ' operation. Please contact the'
-                                      ' administrator.'))
+    # access_right_rec = self.env['access.right'].sudo().search_read(
+    #     [('model_id', '=', current_model_id)], ['model_id', 'is_delete',
+    #                                             'groups_id'])
+    # if access_right_rec and not self.env.is_admin():
+    #     for rec in access_right_rec:
+    #         group_name = self.env['ir.model.data'].sudo().search([
+    #             ('model', '=', 'res.groups'),
+    #             ('res_id', '=', rec['groups_id'][0])
+    #         ]).name
+    #         module_name = self.env['ir.model.data'].sudo().search([
+    #             ('model', '=', 'res.groups'),
+    #             ('res_id', '=', rec['groups_id'][0])
+    #         ]).module
+    #         group = module_name + "." + group_name
+    #         if self.env.user.has_group(group):
+    #             if rec['is_delete']:
+    #                 raise UserError(_('You are restricted from performing this'
+    #                                   ' operation. Please contact the'
+    #                                   ' administrator.'))
+    # 检查 'access.right' 模型是否存在于环境中
+    if 'access.right' in self.env:
+        # current_model_id = self.env['ir.model'].sudo().search([('model', '=', self._name)]).id
+        access_right_rec = self.env['access.right'].sudo().search_read(
+            [('model_id', '=', current_model_id)], ['model_id', 'is_delete', 'groups_id']
+        )
+
+        if access_right_rec and not self.env.is_admin():
+            for rec in access_right_rec:
+                group_data = self.env['ir.model.data'].sudo().search_read(
+                    [('model', '=', 'res.groups'), ('res_id', '=', rec['groups_id'][0])],
+                    ['name', 'module']
+                )
+
+                if group_data:
+                    group_name = group_data[0]['name']
+                    module_name = group_data[0]['module']
+                    group_xml_id = f"{module_name}.{group_name}"
+
+                    if self.env.user.has_group(group_xml_id) and rec['is_delete']:
+                        raise UserError(
+                            _('You are restricted from performing this operation. Please contact the administrator.'))
+    else:
+        # 如果 'access.right' 模型不存在，可以在这里定义备选逻辑
+        pass
+
     return True
 
 
 BaseModel._create = _create
-# BaseModel.unlink = unlink
+BaseModel.unlink = unlink

jikimo_system_order/__init__.py

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

jikimo_system_order/__manifest__.py

@@ -1,39 +0,0 @@
-# -*- coding: utf-8 -*-
-{
-    'name': "jikimo_system_order",
-
-    'summary': """
-        系统工单""",
-
-    'description': """
-        用于处理针对系统的工作任务；
-        员工可以通过系统工单发起申请，由维护人员处理以后，填写处理结果。
-    """,
-
-    'author': "机企猫",
-    'website': "http://www.jikimo.com",
-
-    # Categories can be used to filter modules in modules listing
-    # Check https://github.com/odoo/odoo/blob/master/odoo/addons/base/module/module_data.xml
-    # for the full list
-    'category': 'Uncategorized',
-    'version': '0.1',
-
-    # any module necessary for this one to work correctly
-    'depends': ['base','mail'],
-
-    # always loaded
-    'data': [
-        'security/account_security.xml',
-        'security/ir.model.access.csv',
-        'wizard/order_wizard.xml',
-        'views/notice_user_config.xml',
-        'views/yizuo_system_order_view.xml',
-        'views/work_order_number.xml',
-        'views/res_config_settings_views.xml',
-    ],
-    # only loaded in demonstration mode
-    'demo': [
-        'demo/demo.xml',
-    ],
-}

jikimo_system_order/controllers/__init__.py

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

jikimo_system_order/controllers/controllers.py

@@ -1,20 +0,0 @@
-# -*- coding: utf-8 -*-
-from odoo import http
-
-# class TopSystemOrder(http.Controller):
-#     @http.route('/jikimo_system_order/jikimo_system_order/', auth='public')
-#     def index(self, **kw):
-#         return "Hello, world"
-
-#     @http.route('/jikimo_system_order/jikimo_system_order/objects/', auth='public')
-#     def list(self, **kw):
-#         return http.request.render('jikimo_system_order.listing', {
-#             'root': '/jikimo_system_order/jikimo_system_order',
-#             'objects': http.request.env['jikimo_system_order.jikimo_system_order'].search([]),
-#         })
-
-#     @http.route('/jikimo_system_order/jikimo_system_order/objects/<model("jikimo_system_order.jikimo_system_order"):obj>/', auth='public')
-#     def object(self, obj, **kw):
-#         return http.request.render('jikimo_system_order.object', {
-#             'object': obj
-#         })

jikimo_system_order/demo/demo.xml

@@ -1,30 +0,0 @@
-<odoo>
-    <data>
-        <!--  -->
-        <!--   <record id="object0" model="jikimo_system_order.jikimo_system_order"> -->
-        <!--     <field name="name">Object 0</field> -->
-        <!--     <field name="value">0</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object1" model="jikimo_system_order.jikimo_system_order"> -->
-        <!--     <field name="name">Object 1</field> -->
-        <!--     <field name="value">10</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object2" model="jikimo_system_order.jikimo_system_order"> -->
-        <!--     <field name="name">Object 2</field> -->
-        <!--     <field name="value">20</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object3" model="jikimo_system_order.jikimo_system_order"> -->
-        <!--     <field name="name">Object 3</field> -->
-        <!--     <field name="value">30</field> -->
-        <!--   </record> -->
-        <!--  -->
-        <!--   <record id="object4" model="jikimo_system_order.jikimo_system_order"> -->
-        <!--     <field name="name">Object 4</field> -->
-        <!--     <field name="value">40</field> -->
-        <!--   </record> -->
-        <!--  -->
-    </data>
-</odoo>

jikimo_system_order/models/__init__.py

@@ -1,7 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import constant
-from . import order_classify
-from . import system_work_order
-from . import work_order_template
-from . import res_config_setting

jikimo_system_order/models/constant.py

@@ -1,7 +0,0 @@
-# -*- coding: utf-8 -*-
-
-# 工单状态
-STATE_SELECTION = [('draft', u'草稿'), ('unconfirmed', u'待确认'), ('pending', u'待处理'),
-                   ('processed', u'已处理待评分'), ('completed', u'已完成'), ('closed', u'已关闭')]
-
-GRADE = [('1', '1非常不满意'), ('2', '2不满意'), ('3', '3一般'), ('4', '4满意'), ('5', '5非常满意')]

jikimo_system_order/models/order_classify.py

@@ -1,25 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api
-from odoo.exceptions import ValidationError
-
-
-class OrderClassify(models.Model):
-    _name = 'order.classify'
-    _order = 'sequence, name'
-
-    
-    @api.constrains('name')
-    def check_base_name(self):
-        """类型名称唯一"""
-        name_obj = self.env['order.classify'].search([('name', '=', self.name)])
-        if len(name_obj) >= 2:
-            raise ValidationError(u'该类型已存在')
-
-    # 名称
-    name = fields.Char(string=u'名称', size=20)
-    # 排序
-    sequence = fields.Integer(default=10)
-    # 是否有效
-    state = fields.Boolean(default=True, string='是否有效')
-

jikimo_system_order/models/res_config_setting.py

@@ -1,32 +0,0 @@
-# -*- coding: utf-8 -*-
-
-import logging
-from odoo import api, fields, models, _
-
-_logger = logging.getLogger(__name__)
-
-
-class ResModelWeConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
-
-    lost_agent_id = fields.Char('企微通知应用ID')
-
-    @api.model
-    def get_values(self):
-        """
-        重载获取参数的方法，参数都存在系统参数中
-        :return:
-        """
-        values = super(ResModelWeConfigSettings, self).get_values()
-        config = self.env['ir.config_parameter'].sudo()
-        lost_agent_id = config.get_param('lost_agent_id', default='')
-        values.update(
-            lost_agent_id=lost_agent_id,
-        )
-        return values
-
-    def set_values(self):
-        super(ResModelWeConfigSettings, self).set_values()
-        ir_config = self.env['ir.config_parameter'].sudo()
-        ir_config.set_param("lost_agent_id", self.lost_agent_id or "")
-        

jikimo_system_order/models/system_work_order.py

@@ -1,183 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api
-from odoo.exceptions import ValidationError
-from odoo import exceptions
-from .constant import STATE_SELECTION, GRADE
-import datetime
-import logging
-
-
-class SystemWorkOrder(models.Model):
-    _name = 'system.work.order'
-    _inherit = ['mail.thread', 'mail.activity.mixin']
-    _order = 'date desc'
-    _description = u'系统工单'
-    _rec_name = 'order_number'
-
-    def get_is_technicist(self):
-        self._cr.execute(
-            "select u.id  from  res_users u left join res_groups_users_rel r on r.uid = u.id where r.gid in (select g.id  from res_groups g where g.name = '技术员权限') and u.id ='%s'",
-            (self.env.user.id,))
-        hr = self._cr.dictfetchall()
-        if len(hr) > 0:
-            return True
-        else:
-            return False
-
-    # def get_user_department_id(self):
-    #     """根据用户id系统员工id"""
-    #     employee = self.env['hr.employee'].sudo().search([('user_id', '=', self.env.uid)], limit=1)
-    #     if employee:
-    #         if len(employee) > 0:
-    #             if not employee.department_id:
-    #                 raise exceptions.Warning(u'您当前使用的用户没有所属部门')
-    #             return employee.department_id
-    #         else:
-    #             return False
-    #     else:
-    #         raise exceptions.Warning(u'您当前使用的用户没有关联员工')
-
-    @api.onchange('order_template_id')
-    def get_title(self):
-        """选择模板自动填充"""
-        if self.order_template_id:
-            self.title = self.order_template_id.title_template
-            self.text = self.order_template_id.text_template
-
-    # 工单编号
-    order_number = fields.Char(string=u'工单编号', default='/')
-    # 紧急程度
-    urgency_degree = fields.Selection([('0', u'0星'), ('1', u'一星'), ('2', u'二星'), ('3', u'三星'), ('4', u'四星'),
-                                       ('5', u'五星')], string=u'紧急程度', help='五星为最紧急!', default='5')
-    # 工单分类(可以配置,并调整优先级)
-    order_type = fields.Many2one('order.classify', string=u'工单分类', domain=[('state', '=', True)])
-    # 发起人所属公司(res.company)
-    initiator_company_id = fields.Many2one('res.company', string=u'发起人所属公司', default=lambda self: self.env.user.company_id)
-    # 发起人部门(hr.department)
-    # initiator_department_id = fields.Many2one('hr.department', string=u'发起人部门', default=get_user_department_id)
-    # 发起人(hr.employee)
-    initiator_id = fields.Many2one('res.users', string=u'发起人', default=lambda self: self.env.user)
-    # 发起时间
-    date = fields.Datetime(string=u'发起时间', default=lambda self: fields.datetime.now())
-    # 确认人
-    confirm_id = fields.Many2one('res.users', string=u'确认人')
-    # 确认日期
-    confirmation_date = fields.Datetime(string=u'确认时间')
-    # 模板
-    order_template_id = fields.Many2one('work.order.template', string=u'模板', domain=[('state', '=', True)])
-    # 标题
-    title = fields.Char(string=u'标题')
-    # 正文
-    text = fields.Html(string=u'正文')
-    # 状态[草稿\待确认\待处理\已处理\已关闭]
-    state = fields.Selection(STATE_SELECTION, default='draft', string=u'状态')
-    # 关闭原因
-    close_cause = fields.Text(string=u'关闭问题原因')
-    # 关闭时间
-    close_time = fields.Datetime(string=u'关闭问题时间')
-    # 关闭人
-    close_user_id = fields.Many2one('res.users', string=u'关闭人')
-    # 解决人
-    solve_people_id = fields.Many2one('res.users', string=u'解决人')
-    # 用户实际问题
-    users_problem = fields.Text(string=u'用户实际问题')
-    # 最终解决方案
-    solution = fields.Text(string=u'最终解决方案')
-    # 判断是否为技术人员
-    # is_technicist = fields.Boolean(string=u'是否为技术人员', default=get_is_technicist)
-    # 打分
-    grade = fields.Selection(GRADE, string=u'评分')
-    # 评价按钮的显示
-    is_display = fields.Boolean('控制显示评价按钮', compute='compute_is_display')
-
-    def compute_is_display(self):
-        for item in self:
-            if item.state == 'processed' and self.env.user.id == item.initiator_id.id:
-                item.is_display = True
-            else:
-                item.is_display = False
-
-    @api.onchange('order_type')
-    def _onchange_order_type(self):
-        self.order_template_id = None
-        self.title = None
-        self.text = None
-
-    @api.model
-    def create(self, vals):
-        # 创建编号
-        if vals.get('order_number', '/') == '/':
-            vals['order_number'] = self.env['ir.sequence'].get('system.work.order') or '/'
-        return super(SystemWorkOrder, self).create(vals)
-
-    def do_draft(self, order=None):
-        """状态草稿"""
-        bill = self
-        if order:
-            bill = order
-            if bill.state == 'unconfirmed':
-                state_remark = u'待确认 --> 草稿'
-                # bill.message_post(u'操作人：%s，操作时间：%s，状态变更过程：%s' % (self.env.user.name,
-                #     (datetime.datetime.now() + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'), state_remark))
-        bill.state = 'draft'
-
-    def do_unconfirmed(self):
-        """状态待确认"""
-        if self.state == 'draft':
-            state_remark = u'草稿 --> 待确认'
-            # self.message_post(u'操作人：%s，操作时间：%s，状态变更过程：%s' % (
-            #     self.env.user.name,
-            #     (datetime.datetime.now() + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'), state_remark))
-            self.state = 'unconfirmed'
-            # 获取通知人
-            objs = self.env['system.order.notice'].search([])
-            user_ids = objs.notice_user_ids.filtered(lambda item: item.we_employee_id not in ['', False])
-            we_employee_ids = user_ids.mapped('we_employee_id')
-            lost_agent_id = self.env['ir.config_parameter'].sudo().get_param('lost_agent_id')
-            wechat = self.env['we.config'].sudo().get_wechat(agent_id=lost_agent_id)
-            # agent_id, user_ids, content
-            content = """您有一张工单<font color=\"warning\">待处理</font>:**工单标题:{2}**
-                                                    >创建人:{1}
-                                                    >提交时间:{3}
-                                                    >紧急程度:{0}星
-                                                    请查看工单消息,并及时处理!
-                                                     """.format(self.urgency_degree,
-                                                                self.initiator_id.name, self.title, (self.date + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M'))
-            for we_employee_id in we_employee_ids:
-                try:
-                    wechat.message.send_markdown(agent_id=lost_agent_id, user_ids=we_employee_id, content=content)
-                except Exception as e:
-                    logging.error('工单处理发送消息异常%s' % str(e))
-
-        return True
-
-    def do_pending(self):
-        """状态待处理"""
-        if self.state == 'unconfirmed':
-            state_remark = u'待确认 --> 待处理'
-            # self.message_post(u'操作人：%s，操作时间：%s，状态变更过程：%s' % (
-            #     self.env.user.name,
-            #     (datetime.datetime.now() + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'), state_remark))
-        self.state = 'pending'
-        self.confirm_id = self.env.user
-        self.confirmation_date = fields.datetime.now()
-        return True
-
-    def urned_off(self):
-        """状态关闭"""
-        if self.close_cause:
-            self.state = 'closed'
-            self.close_time = fields.datetime.now()
-        else:
-            raise ValidationError(u'请注明关闭原因')
-        return True
-
-    def unlink(self):
-        for item in self:
-            if item.state != "draft":
-                raise ValidationError(u'只能删除状态为【草稿】的工单。')
-            elif item.env.uid != item.initiator_id.id:
-                raise ValidationError(u'非本人不能删除')
-            else:
-                super(SystemWorkOrder, item).unlink()

jikimo_system_order/models/work_order_template.py

@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api
-
-
-class WorkOrderTemplate(models.Model):
-    _name = 'work.order.template'
-    _order = 'num'
-
-    # 编号
-    num = fields.Char(string=u'编号', default='/')
-    # 名称
-    name = fields.Char(string=u'模板名称', required="1")
-    # 分类
-    work_order_type = fields.Many2one('order.classify', string=u'系统工单分类', domain=[('state', '=', True)])
-    # 模板标题
-    title_template = fields.Char(string=u'模板标题')
-    # 模板正文
-    text_template = fields.Html(string=u'模板正文')
-    # 模板说明
-    template_explain = fields.Text(string=u'模板说明')
-    # 是否有效
-    state = fields.Boolean(default=True, string=u'是否有效')
-
-    @api.model
-    def create(self, vals):
-        # 创建编号
-        if vals.get('num', '/') == '/':
-            vals['num'] = self.env['ir.sequence'].get('work.order.template') or '/'
-        return super(WorkOrderTemplate, self).create(vals)
-
-
-class SystemOrderNotice(models.Model):
-    _name = 'system.order.notice'
-    _description = '工单处理人设置'
-
-    notice_user_ids = fields.Many2many('res.users', string='工单处理人')
-

jikimo_system_order/security/account_security.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="0"> <!-- noupdate表示，当模块升级时是否更新本条数据-->
-        <!--运维权限组-->
-        <record id="group_operations_permissions_rwc" model="res.groups">
-            <field name="name">运维权限</field>
-        </record>
-
-        <record id="system_order_user_rule" model="ir.rule">
-            <field name="name">用户访问工单信息</field>
-            <field name="model_id" ref="model_system_work_order"/>
-            <field name="groups" eval="[(4, ref('base.group_user'))]"/>
-            <field name="domain_force">[('initiator_id', '=', user.id)]</field>
-        </record>
-
-        <record id="system_order_group_operations_rule" model="ir.rule">
-            <field name="name">运维访问工单信息</field>
-            <field name="model_id" ref="model_system_work_order"/>
-            <field name="groups" eval="[(4, ref('jikimo_system_order.group_operations_permissions_rwc'))]"/>
-            <field name="domain_force">[(1, '=', 1)]</field>
-        </record>
-
-    </data>
-</odoo>

jikimo_system_order/security/ir.model.access.csv

@@ -1,16 +0,0 @@
-id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-
-inside_system_order_classify_r,jikimo_system_order.order_classify,model_order_classify,,1,1,1,1
-inside_system_work_order_rc,jikimo_system_order.system_work_order,model_system_work_order,,1,1,1,1
-inside_work_order_template_r,jikimo_system_order.work_order_template,model_work_order_template,,1,1,1,1
-
-inside_system_order_classify_rwc,jikimo_system_order.order_classify,model_order_classify,group_operations_permissions_rwc,1,1,1,0
-inside_system_work_order_rwc,jikimo_system_order.system_work_order,model_system_work_order,group_operations_permissions_rwc,1,1,1,0
-inside_work_order_template_rwc,jikimo_system_order.work_order_template,model_work_order_template,group_operations_permissions_rwc,1,1,1,0
-
-order_close_wizard_group_user,jikimo_system_order.order_close_wizard,model_order_close_wizard,base.group_user,1,1,1,1
-order_other_wizard_group_user,jikimo_system_order.order_other_wizard,model_order_other_wizard,base.group_user,1,1,1,1
-order_technician_wizard_group_user,jikimo_system_order.order_technician_wizard,model_order_technician_wizard,base.group_user,1,1,1,1
-system_work_order_wizard_group_user,jikimo_system_order.system_work_order_wizard,model_system_work_order_wizard,base.group_user,1,1,1,1
-
-system_order_notice_group_user,jikimo_system_order.system_order_notice,model_system_order_notice,base.group_user,1,1,1,1

jikimo_system_order/views/notice_user_config.xml

@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<odoo>
-    <data>
-        # ---------- 工单通知处理人设置 ------------
-
-        <record model="ir.ui.view" id="tree_system_order_notice_view">
-            <field name="name">tree.system.order.notice</field>
-            <field name="model">system.order.notice</field>
-            <field name="arch" type="xml">
-                <tree string="工单处理人设置" editable="top">
-                    <field name="notice_user_ids" widget="many2many_tags" required="1" options="{'no_create': True, 'no_edit': True}"/>
-                </tree>
-            </field>
-        </record>
-
-
-        <record model="ir.ui.view" id="search_system_order_notice_view">
-            <field name="name">search.system.order.notice</field>
-            <field name="model">system.order.notice</field>
-            <field name="arch" type="xml">
-                <search string="工单处理人设置">
-                    <field name="notice_user_ids" string="模糊搜索"
-                           filter_domain="[('notice_user_ids', 'ilike', self)]"/>
-                    <separator></separator>
-
-                    <field name="notice_user_ids" string="处理人"/>
-
-                </search>
-            </field>
-        </record>
-
-
-        <record model="ir.actions.act_window" id="action_system_order_notice_view">
-            <field name="name">工单处理人</field>
-            <field name="res_model">system.order.notice</field>
-            <field name="view_mode">tree</field>
-            <field name="domain">[]</field>
-            <field name="context">{}</field>
-            <field name="help" type="html">
-                <p class="o_view_nocontent_smiling_face">
-                    [工单处理人] 还没有哦！点左上角的[创建]按钮，沙发归你了!
-                </p>
-                <p>
-                </p>
-            </field>
-        </record>
-
-
-
-
-
-
-
-
-
-
-    </data>
-</odoo>

jikimo_system_order/views/res_config_settings_views.xml

@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <record id="res_config_settings_we_view_form_inherit" model="ir.ui.view">
-            <field name="name">res.config.settings.we.view.form.inherit.bpm</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[6]" position="after">
-                <div>
-                        <h2>企微通知应用ID</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="lost_agent_id"/>
-                                        <field name="lost_agent_id"/>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>

jikimo_system_order/views/work_order_number.xml

@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<odoo>
-    <data noupdate="True">
-        <!-- 工单流水号 -->
-        <record id="seq_work_order" model="ir.sequence">
-            <field name="name">seq_work_order</field>
-            <field name="company_id"/>
-            <field name="code">system.work.order</field>
-            <field name="prefix">SO%(year)s%(month)s%(day)s</field>
-            <field name="padding">1</field>
-        </record>
-
-        <!-- 模板编号 -->
-        <record id="seq_order_template" model="ir.sequence">
-            <field name="name">seq_order_template</field>
-            <field name="company_id"/>
-            <field name="code">work.order.template</field>
-            <field name="prefix">TL</field>
-            <field name="padding">1</field>
-        </record>
-    </data>
-</odoo>

jikimo_system_order/views/yizuo_system_order_view.xml

@@ -1,243 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<odoo>
-    <data>
-        <!--工单信息-->
-        <record model="ir.ui.view" id="work_order_tree">
-            <field name="name">工单信息</field>
-            <field name="model">system.work.order</field><!--对应表单名称-->
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="state" widget="badge" decoration-primary="state == 'draft'"
-                                       decoration-success="state in ('processed', 'completed')"
-                                       decoration-danger="state == 'pending'" decoration-warning="state in ('unconfirmed')"/>
-                    <field name="order_number"/>
-                    <field name="title"/>
-                    <field name="initiator_id"/>
-                    <field name="date"/>
-                </tree>
-            </field>
-        </record>
-
-        <!--新建系统工单-->
-        <record model="ir.ui.view" id="ork_order_form">
-            <field name="name">新建系统工单</field>
-            <field name="model">system.work.order</field>
-            <field name="arch" type="xml">
-                <form>
-                    <header>
-                        <field name="is_display" invisible="1"/>
-                        <button string='提交' class="oe_highlight" states="draft"
-                                type="object" name="do_unconfirmed"
-                                attrs="{'invisible': [('state', '!=', 'draft')]}"/>
-                        <button string='追回编辑' states="unconfirmed"
-                                type="action" name="%(system_work_order_wizard_view_act_window)d"
-                                context="{'explain':'确认要执行此操作吗？','object_name':'system.work.order','function_name':'do_draft','object_id':id}"/>
-
-                        <button name="do_pending" states="unconfirmed"
-                                string="确认可处理" type="object" class="oe_highlight"
-                                groups="jikimo_system_order.group_operations_permissions_rwc"/>
-
-                        <button string='处理工单' class="oe_highlight" states="pending"
-                                type="action" name="%(launch_order_technician_wizard)d"
-                                groups="jikimo_system_order.group_operations_permissions_rwc"/>
-                        <button string='评价' class="oe_highlight" attrs="{'invisible': [('is_display', '=', False)]}"
-                                type="action" name="%(launch_order_other_wizard)d" context="{'active_id':id}"/>
-                        <button name="%(launch_order_close_wizard)d" string="关闭该工单"
-                                attrs="{'invisible': ['|',('state', '=', 'draft'),'|',('state','=','completed'),('state','=','closed')]}"
-                                type="action" context="{'active_id':id}"/>
-
-                        <field name="state" widget="statusbar"/>
-                    </header>
-                    <sheet>
-                        <group>
-<!--                            <label for="order_number" class="oe_edit_only"/>-->
-                            <group>
-                                <field name="order_number" required="True" readonly="1"/>
-                                <field name="order_type" required="True" attrs="{'readonly': [('state', '!=', 'draft')]}" options="{'no_create': True}"/>
-                                <field name="date" required="True" readonly="True"/>
-                                <field name="order_template_id" attrs="{'readonly': [('state', '!=', 'draft')]}"
-                                       domain="[('work_order_type','=',order_type),('state','=',True)]" options="{'no_create': True}"/>
-                                <field name="confirmation_date" readonly="True"/>
-                                <field name="urgency_degree" required="True" attrs="{'readonly': [('state','!=','draft')]}" widget="priority"/>
-                            </group>
-                            <group>
-                                <field name="initiator_company_id" required="True" readonly="True"/>
-<!--                                <field name="initiator_department_id" required="True" readonly="True"/>-->
-                                <field name="initiator_id" required="True" readonly="True"/>
-                                <field name="confirm_id" readonly="True"/>
-                                <field name="solve_people_id" readonly="True"/>
-                                <field name="close_user_id" readonly="True"/>
-                            </group>
-                            <group>
-                                <field name="title" attrs="{'readonly': [('state', '!=', 'draft')]}" required="True"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page string="工单内容">
-                                <field name="text" attrs="{'readonly': [('state','!=','draft')]}" required="True"/>
-                            </page>
-                            <page string="解决方案">
-                                <group>
-                                    <field name="users_problem" readonly="True"/>
-                                    <field name="solution" readonly="True"/>
-                                </group>
-                            </page>
-                            <page string="其他">
-                                <group>
-                                    <field name="close_cause" readonly="True"/>
-                                    <field name="close_time" readonly="True"/>
-                                    <field name="grade" readonly="True"/>
-                                </group>
-                            </page>
-                        </notebook>
-                    </sheet>
-<!--                    <div class="oe_chatter">-->
-<!--                        <field name="message_follower_ids" widget="mail_followers"/>-->
-<!--                        <field name="message_ids" widget="mail_thread"/>-->
-<!--                    </div>-->
-                </form>
-            </field>
-        </record>
-
-        <!-- 搜索工单 -->
-        <record model="ir.ui.view" id="restaurant_search">
-            <field name="name">搜索工单</field>
-            <field name="model">system.work.order</field>
-            <field name="arch" type="xml">
-                <search>
-                    <field string='发起人' name="initiator_id" widget="char" required="True"/>
-                    <field string='标题' name="title" widget="char"/>
-                    <field string='正文' name="text" widget="html"/>
-                    <field string='实际问题' name="users_problem" widget="text"/>
-                    <field string='解决方案' name="solution" widget="text"/>
-                    <filter name="today" string="今日工单" domain="[('date','=',time.strftime('%%Y-%%m-%%d'))]"/>
-                    <filter name="yesterday" string="昨日工单"
-                            domain="[('date', '=', (context_today() - relativedelta(days=1)).strftime('%Y-%m-%d'))]"/>
-                    <filter name="month" string="本月工单"
-                            domain="[('date','&gt;=', time.strftime('%Y-%m-01')),('date','&lt;',  (context_today() + relativedelta(months=1)).strftime('%Y-%m-01'))]"/>
-                    <filter name="last_month" string="上月工单"
-                            domain="[('date','&lt;', time.strftime('%Y-%m-01')),('date','&gt;=',  (context_today() - relativedelta(months=1)).strftime('%Y-%m-01'))]"/>
-                    <filter name="unconfirmed" string="待确认" domain="[('state','=','unconfirmed')]"/>
-                    <filter name="pending" string="待处理" domain="[('state','=','pending')]"/>
-                    <filter name="processed" string="已处理"
-                            domain="['|', ('state','=','processed'), ('state','=','closed')]"/>
-                    <group>
-                        <filter string='发起人' name="initiator_id" context='{"group_by":"initiator_id"}'/>
-                        <filter string='工单分类' name="order_type" context='{"group_by":"order_type"}'/>
-                        <filter string='模板' name="order_template_id" context='{"group_by":"order_template_id"}'/>
-                        <filter string='状态' name="state" context='{"group_by":"state"}'/>
-                        <filter string='紧急情况' name="state" context='{"group_by":"urgency_degree"}'/>
-                    </group>
-                </search>
-            </field>
-        </record>
-
-        <record model="ir.ui.view" id="graph_tree">
-            <field name="name">工单图表</field>
-            <field name="model">system.work.order</field><!--对应表单名称-->
-            <field name="arch" type="xml">
-                <pivot>
-                    <field name="date" type="row" interval="day"/>
-                    <field name="order_type" type="col"/>
-                    <field name="state" type="row"/>
-                </pivot>
-            </field>
-        </record>
-
-        <!-- 工单 -->
-        <record model="ir.actions.act_window" id="system_order">
-            <field name="name">工单</field>
-            <field name="res_model">system.work.order</field>
-            <field name="view_mode">tree,form,search,graph,pivot</field>
-        </record>
-
-        <!--工单模板信息-->
-        <record model="ir.ui.view" id="order_template_tree">
-            <field name="name">工单模板信息</field>
-            <field name="model">work.order.template</field><!--对应表单名称-->
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="num"/>
-                    <field name="name"/>
-                    <field name="work_order_type"/>
-                    <field name="title_template"/>
-                    <field name="template_explain"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <!--新建系统工单模板-->
-        <record model="ir.ui.view" id="order_template_form">
-            <field name="name">新建系统工单模板</field>
-            <field name="model">work.order.template</field>
-            <field name="arch" type="xml">
-                <form>
-                    <sheet>
-                        <group>
-                            <field name="num" required="True" readonly="True"/>
-                            <field name="name" required="True"/>
-                            <field name="work_order_type" required="True"/>
-                            <field name="template_explain" required="True" style="height: 50px;"/>
-                            <field name="title_template" required="True"/>
-                            <field name="state"/>
-                            <field name="text_template" required="True"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- 工单模板 -->
-        <record model="ir.actions.act_window" id="work_template">
-            <field name="name">工单模板</field>
-            <field name="res_model">work.order.template</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-        <!--工单分类信息-->
-        <record model="ir.ui.view" id="order_type_tree">
-            <field name="name">工单分类信息</field>
-            <field name="model">order.classify</field><!--对应表单名称-->
-            <field name="arch" type="xml">
-                <tree>
-                    <field name="sequence" widget="handle"/>
-                    <field name="name"/>
-                    <field name="state"/>
-                </tree>
-            </field>
-        </record>
-
-        <!--新建系统分类信息-->
-        <record model="ir.ui.view" id="order_type_form">
-            <field name="name">新建系统分类信息</field>
-            <field name="model">order.classify</field>
-            <field name="arch" type="xml">
-                <form>
-                    <sheet>
-                        <group>
-                            <field name="name" required="True"/>
-                            <field name="sequence" invisible="True"/>
-                            <field name="state"/>
-                        </group>
-                    </sheet>
-                </form>
-            </field>
-        </record>
-
-        <!-- 工单分类 -->
-        <record model="ir.actions.act_window" id="classify">
-            <field name="name">工单分类</field>
-            <field name="res_model">order.classify</field>
-            <field name="view_mode">tree,form</field>
-        </record>
-
-
-        <menuitem name="系统工单" id="work_order_1_list" web_icon="jikimo_system_order,static/description/icon.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"/>
-        <menuitem name="工单设置" id="system_order_notice_user_config" parent="work_order_1_list" action="action_system_order_notice_view" groups="jikimo_system_order.group_operations_permissions_rwc"/>
-    </data>
-</odoo>

jikimo_system_order/wizard/__init__.py

@@ -1,6 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from . import order_other_wizard
-from . import order_technician_wizard
-from . import order_close_wizard
-from . import system_work_order_wizard

jikimo_system_order/wizard/order_close_wizard.py

@@ -1,79 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api
-from odoo.addons.jikimo_system_order.models.constant import STATE_SELECTION
-from odoo.exceptions import ValidationError
-import datetime, logging
-
-
-class OrderCloseWizard(models.TransientModel):
-    _name = 'order.close.wizard'
-
-    
-    def get_context(self):
-        if self._context.get('active_id'):
-            obj = self.env['system.work.order'].browse(self._context.get('active_id'))
-            if obj.initiator_id.id != self.env.user.id:
-                raise ValidationError(u'非本人无法操作')
-        return obj
-
-    order_id = fields.Many2one('system.work.order', string=u'工单ID',
-                               default=lambda self: self.get_context().id)
-    # 关闭原因
-    close_cause = fields.Text(string=u'关闭问题原因', default=lambda self: self.get_context().close_cause)
-    # 关闭时间
-    close_time = fields.Datetime(string=u'关闭问题时间', default=fields.datetime.now())
-    # 状态
-    state = fields.Selection(STATE_SELECTION, default='closed', string=u'状态')
-    # 关闭人
-    close_user_id = fields.Many2one('res.users', string=u'关闭人', default=lambda self: self.env.user)
-
-    
-    def sure(self):
-        self.order_id.close_cause = self.close_cause
-        self.order_id.close_time = self.close_time
-        if self.order_id.state == 'unconfirmed':
-            state_remark = u'待确认 --> 已关闭'
-        if self.order_id.state == 'pending':
-            state_remark = u'待处理 --> 已关闭'
-        if self.order_id.state == 'processed':
-            state_remark = u'已处理待评分 --> 已关闭'
-        # self.order_id.message_post(u'操作人：%s，操作时间：%s，状态变更过程：%s' % (
-        #     self.env.user.name,
-        #     (datetime.datetime.now() + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'), state_remark))
-        self.order_id.state = self.state
-        self.order_id.close_user_id = self.close_user_id
-        we_employee_ids = []
-        if self.order_id.initiator_id.we_employee_id:
-            we_employee_ids.append(self.order_id.initiator_id.we_employee_id)
-        lost_agent_id = self.env['ir.config_parameter'].sudo().get_param('lost_agent_id')
-        wechat = self.env['we.config'].sudo().get_wechat(agent_id=lost_agent_id)
-        # agent_id, user_ids, content
-        content = """您提交的工单-**工单标题:{0}**-<font color=\"#FF0000\">**已关闭**</font>
-                                                >提交时间：{1}
-                                                >处理时间：{2}
-                                                >处理人：{3}
-                                                如有问题,请联系系统管理员!
-                                                 """.format(self.order_id.title,
-                                                            (self.order_id.date + datetime.timedelta(hours=8)).strftime(
-                                                                '%Y-%m-%d %H:%M'), (datetime.datetime.now() + datetime.timedelta(
-                                                                                      hours=8)).strftime('%Y-%m-%d %H:%M'), self.env.user.name or '')
-        # wechat.message.send_markdown(agent_id=lost_agent_id, user_ids=we_employee_ids, content=content)
-        for we_employee_id in we_employee_ids:
-            try:
-                wechat.message.send_markdown(agent_id=lost_agent_id, user_ids=we_employee_id, content=content)
-            except Exception as e:
-                logging.error('工单关闭发送消息异常%s' % str(e))
-        return {}
-
-
-
-
-
-
-
-
-
-
-
-

jikimo_system_order/wizard/order_other_wizard.py

@@ -1,42 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api
-from odoo.exceptions import ValidationError
-from odoo.addons.jikimo_system_order.models.constant import STATE_SELECTION, GRADE
-import datetime
-
-
-class OrderOtherWizard(models.TransientModel):
-    _name = 'order.other.wizard'
-
-    
-    def get_context(self):
-        if self._context.get('active_id'):
-            obj = self.env['system.work.order'].browse(self._context.get('active_id'))
-            if obj.initiator_id.id != self.env.user.id:
-                raise ValidationError(u'非本人无法操作')
-        return obj
-
-    order_id = fields.Many2one('system.work.order', string=u'工单ID',
-                               default=lambda self: self.get_context().id)
-    # 关闭时间
-    close_time = fields.Datetime(string=u'关闭时间', default=fields.datetime.now())
-    # 状态
-    state = fields.Selection(STATE_SELECTION, default='completed', string=u'状态')
-    # 打分
-    grade = fields.Selection(GRADE, string=u'评分')
-    # 关闭人
-    close_user_id = fields.Many2one('res.users', string=u'关闭人', default=lambda self: self.env.user)
-
-    
-    def sure(self):
-        self.order_id.close_time = self.close_time
-        self.order_id.grade = self.grade
-        if self.order_id.state == 'processed':
-            state_remark = u'已处理待评分 --> 已完成'
-            # self.order_id.message_post(u'操作人：%s，操作时间：%s，状态变更过程：%s' % (
-            #     self.env.user.name,
-            #     (datetime.datetime.now() + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'), state_remark))
-        self.order_id.state = self.state
-        self.order_id.close_user_id = self.close_user_id
-        return {}

jikimo_system_order/wizard/order_technician_wizard.py

@@ -1,59 +0,0 @@
-# -*- coding: utf-8 -*-
-
-from odoo import models, fields, api
-from odoo.addons.jikimo_system_order.models.constant import STATE_SELECTION
-import datetime
-import logging
-
-
-class OrderTechnicianWizard(models.TransientModel):
-    _name = 'order.technician.wizard'
-
-    order_id = fields.Many2one('system.work.order', string=u'工单ID',
-                               default=lambda self: self.env.context.get('active_id'))
-    # 解决人
-    solve_people_id = fields.Many2one('res.users', string=u'解决人', default=lambda self: self.env.user)
-    # 用户实际问题
-    users_problem = fields.Text(string=u'用户实际问题')
-    # 最终解决方案
-    solution = fields.Text(string=u'最终解决方案')
-    # 状态
-    state = fields.Selection(STATE_SELECTION, default='processed', string=u'状态')
-
-    def sure(self):
-        self.order_id.solve_people_id = self.solve_people_id
-        self.order_id.users_problem = self.users_problem
-        self.order_id.solution = self.solution
-        if self.order_id.state == 'pending':
-            state_remark = u'待处理 --> 已处理待评分'
-            # self.order_id.message_post(u'操作人：%s，操作时间：%s，状态变更过程：%s' % (
-            #     self.env.user.name,
-            #     (datetime.datetime.now() + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M:%S'), state_remark))
-            self.order_id.state = self.state
-            # 获取通知人
-            # objs = self.env['system.order.notice'].search([])
-            # user_ids = objs.notice_user_ids.filtered(lambda item: item.we_employee_id not in ['', False])
-            # we_employee_ids = user_ids.mapped('we_employee_id')
-            we_employee_ids = []
-            if self.order_id.initiator_id.we_employee_id:
-                we_employee_ids.append(self.order_id.initiator_id.we_employee_id)
-            print(we_employee_ids)
-            lost_agent_id = self.env['ir.config_parameter'].sudo().get_param('lost_agent_id')
-            wechat = self.env['we.config'].sudo().get_wechat(agent_id=lost_agent_id)
-            # agent_id, user_ids, content
-            content = """您提交的工单-**工单标题:{0}**-<font color=\"info\">**已处理**</font>
-                                                    >提交时间：{1}
-                                                    >处理反馈：{4}
-                                                    >处理时间：{2}
-                                                    >处理人：{3}
-                                                    如有问题,请联系系统管理员!
-                                                     """.format(self.order_id.title,
-                                                                (self.order_id.date + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M'), (datetime.datetime.now() + datetime.timedelta(hours=8)).strftime('%Y-%m-%d %H:%M'), self.env.user.name or '', self.solution or '')
-            # wechat.message.send_markdown(agent_id=lost_agent_id, user_ids=we_employee_ids, content=content)
-            for we_employee_id in we_employee_ids:
-                try:
-                    wechat.message.send_markdown(agent_id=lost_agent_id, user_ids=we_employee_id, content=content)
-                except Exception as e:
-                    logging.error('工单处理发送消息异常%s' % str(e))
-
-        return {}

jikimo_system_order/wizard/order_wizard.xml

@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data>
-        <!-- 技术员向导form-->
-        <record model="ir.ui.view" id="wizard_technician_form_view">
-            <field name="name">技术员向导</field>
-            <field name="model">order.technician.wizard</field>
-            <field name="arch" type="xml">
-                <form string="技术员编辑">
-                    <group>
-                        <field name="order_id" required="1" readonly="1"/>
-                        <field name="solve_people_id" required="1"/>
-                        <field name="users_problem" required="1" style="height: 50px;"/>
-                        <field name="solution" required="1" style="height: 50px;"/>
-                    </group>
-                    <footer>
-                        <button name="sure" string="确定" type="object" class="oe_highlight"/>
-                        or
-                        <button string="取消" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="launch_order_technician_wizard">
-            <field name="name">技术员编辑</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">order.technician.wizard</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="wizard_technician_form_view"/>
-            <field name="context">{'display_default_code':False}</field>
-            <field name="target">new</field>
-        </record>
-
-
-
-        <!-- 其它向导form-->
-        <record model="ir.ui.view" id="wizard_other_form_view">
-            <field name="name">其它向导</field>
-            <field name="model">order.other.wizard</field>
-            <field name="arch" type="xml">
-                <form string="其它编辑">
-                    <group>
-                        <field name="order_id" required="1" readonly="1"/>
-                        <field name="close_time" required="1" readonly="1"/>
-                        <field name="grade" required="1"/>
-                        <field name="close_user_id" required="1" readonly="1"/>
-                    </group>
-                    <footer>
-                        <button name="sure" string="确定" type="object" class="oe_highlight"/>
-                        or
-                        <button string="取消" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="launch_order_other_wizard">
-            <field name="name">其它编辑</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">order.other.wizard</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="wizard_other_form_view"/>
-            <field name="context">{'display_default_code':False}</field>
-            <field name="target">new</field>
-        </record>
-
-        <!--关闭向导form-->
-        <record model="ir.ui.view" id="wizard_close_form_view">
-            <field name="name">关闭向导</field>
-            <field name="model">order.close.wizard</field>
-            <field name="arch" type="xml">
-                <form string="关闭工单">
-                    <group>
-                        <field name="order_id" required="1" readonly="1"/>
-                        <field name="close_cause" required="1" style="height: 50px;"/>
-                        <field name="close_time" required="1" readonly="1"/>
-                        <field name="close_user_id" required="1" readonly="1"/>
-                    </group>
-                    <footer>
-                        <button name="sure" string="确定" type="object" class="oe_highlight"/>
-                        or
-                        <button string="取消" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="launch_order_close_wizard">
-            <field name="name">关闭工单</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">order.close.wizard</field>
-            <field name="view_mode">form</field>
-            <field name="view_id" ref="wizard_close_form_view"/>
-            <field name="context">{'display_default_code':False}</field>
-            <field name="target">new</field>
-        </record>
-
-        <record id="system_work_order_wizard_view" model="ir.ui.view">
-            <field name="name">system_work_order_wizard_view</field>
-            <field name="model">system.work.order.wizard</field>
-            <field name="arch" type="xml">
-                <form string="二次确认">
-                    <field name="explain" readonly="1"/>
-                    <footer>
-                        <button name="sure" string="确定" type="object" class="oe_highlight"/>
-                        or
-                        <button string="取消" class="oe_link" special="cancel"/>
-                    </footer>
-                </form>
-            </field>
-        </record>
-
-        <record model="ir.actions.act_window" id="system_work_order_wizard_view_act_window">
-            <field name="name">二次确认</field>
-            <field name="type">ir.actions.act_window</field>
-            <field name="res_model">system.work.order.wizard</field>
-            <field name="view_mode">form</field>
-            <field name="target">new</field>
-        </record>
-    </data>
-</odoo>

jikimo_system_order/wizard/system_work_order_wizard.py

@@ -1,42 +0,0 @@
-#!/usr/bin/env python
-# -*- coding: utf-8 -*-
-# @Time    : 2017/12/12 9:46
-# @Author  : GuoXiang
-# @Site    :  
-# @File    : system_work_order_wizard.py
-# @Software: PyCharm
-# @Desc    : 
-# @license : Copyright©2018 www.dasmaster.com All Rights Reserved. 
-# @Contact : xg1230205321@163.com
-from odoo import models, api, fields
-from odoo.exceptions import ValidationError
-
-
-class SystemWorkOrderWizard(models.TransientModel):
-    _name = "system.work.order.wizard"
-    _description = u"追回确认"
-
-    
-    def _get_explain(self):
-        if self._context.get('object_id'):
-            obj = self.env['system.work.order'].browse(self._context.get('object_id'))
-            if obj.initiator_id.id != self.env.user.id:
-                raise ValidationError(u'非本人无法操作')
-        if self._context.get('explain'):
-            return self._context["explain"]
-
-    explain = fields.Char(default=_get_explain)
-
-    
-    def sure(self):
-        """
-        确认
-        :return:
-        """
-        if self._context.get('object_id') and self._context.get('object_name') and self._context.get(
-                'explain') and self._context.get('function_name'):
-            work_sheet_obj = self.env[self._context["object_name"]].search([('id', '=', int(self._context["object_id"]))])
-            class_name = self._context.get('object_name')  # 获得对象类名
-            method_name = self._context.get('function_name')  # 获得对象的方法
-            obj_function = getattr(self.env[class_name], method_name)
-            obj_function(work_sheet_obj)

mrp_workorder/models/mrp_workorder.py

@@ -27,7 +27,7 @@ class MrpWorkcenter(models.Model):
 
 class MrpProductionWorkcenterLine(models.Model):
     _name = 'mrp.workorder'
-    _inherit = ['mrp.workorder', 'barcodes.barcode_events_mixin', 'mail.thread', 'mail.activity.mixin']
+    _inherit = ['mrp.workorder', 'barcodes.barcode_events_mixin']
 
     quality_point_ids = fields.Many2many('quality.point', compute='_compute_quality_point_ids', store=True)
     quality_point_count = fields.Integer('Steps', compute='_compute_quality_point_count')
@@ -47,17 +47,14 @@ class MrpProductionWorkcenterLine(models.Model):
 
     is_last_lot = fields.Boolean('Is Last lot', compute='_compute_is_last_lot')
     is_first_started_wo = fields.Boolean('Is The first Work Order', compute='_compute_is_last_unfinished_wo')
-    is_last_unfinished_wo = fields.Boolean('Is Last Work Order To Process', compute='_compute_is_last_unfinished_wo',
-                                           store=False)
+    is_last_unfinished_wo = fields.Boolean('Is Last Work Order To Process', compute='_compute_is_last_unfinished_wo', store=False)
     lot_id = fields.Many2one(related='current_quality_check_id.lot_id', readonly=False)
     move_id = fields.Many2one(related='current_quality_check_id.move_id', readonly=False)
     move_line_id = fields.Many2one(related='current_quality_check_id.move_line_id', readonly=False)
     move_line_ids = fields.One2many(related='move_id.move_line_ids')
-    quality_state = fields.Selection(related='current_quality_check_id.quality_state', string="Quality State",
-                                     readonly=False)
+    quality_state = fields.Selection(related='current_quality_check_id.quality_state', string="Quality State", readonly=False)
     qty_done = fields.Float(related='current_quality_check_id.qty_done', readonly=False)
-    test_type_id = fields.Many2one('quality.point.test_type', 'Test Type',
-                                   related='current_quality_check_id.test_type_id')
+    test_type_id = fields.Many2one('quality.point.test_type', 'Test Type', related='current_quality_check_id.test_type_id')
     test_type = fields.Char(related='test_type_id.technical_name')
     user_id = fields.Many2one(related='current_quality_check_id.user_id', readonly=False)
     worksheet_page = fields.Integer('Worksheet page')
@@ -68,8 +65,7 @@ class MrpProductionWorkcenterLine(models.Model):
     def _compute_quality_point_ids(self):
         for workorder in self:
             quality_points = workorder.operation_id.quality_point_ids
-            quality_points = quality_points.filtered(
-                lambda qp: not qp.product_ids or workorder.production_id.product_id in qp.product_ids)
+            quality_points = quality_points.filtered(lambda qp: not qp.product_ids or workorder.production_id.product_id in qp.product_ids)
             workorder.quality_point_ids = quality_points
 
     @api.depends('operation_id')
@@ -95,8 +91,7 @@ class MrpProductionWorkcenterLine(models.Model):
     @api.depends('check_ids')
     def _compute_finished_product_check_ids(self):
         for wo in self:
-            wo.finished_product_check_ids = wo.check_ids.filtered(
-                lambda c: c.finished_product_sequence == wo.qty_produced)
+            wo.finished_product_check_ids = wo.check_ids.filtered(lambda c: c.finished_product_sequence == wo.qty_produced)
 
     def write(self, values):
         res = super().write(values)
@@ -143,8 +138,7 @@ class MrpProductionWorkcenterLine(models.Model):
         self.finished_lot_id = self.env['stock.lot'].create({
             'product_id': self.product_id.id,
             'company_id': self.company_id.id,
-            'name': self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env[
-                'ir.sequence'].next_by_code('stock.lot.serial'),
+            'name': self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env['ir.sequence'].next_by_code('stock.lot.serial'),
         })
 
     def _create_subsequent_checks(self):
@@ -158,7 +152,7 @@ class MrpProductionWorkcenterLine(models.Model):
         """
         # Create another quality check if necessary
         next_check = self.current_quality_check_id.next_check_id
-        if next_check.component_id != self.current_quality_check_id.product_id or \
+        if next_check.component_id != self.current_quality_check_id.product_id or\
                 next_check.point_id != self.current_quality_check_id.point_id:
             # TODO: manage reservation here
 
@@ -285,8 +279,7 @@ class MrpProductionWorkcenterLine(models.Model):
         if self.current_quality_check_id:
             team = self.current_quality_check_id.team_id
         else:
-            team = self.env['quality.alert.team'].search(
-                ['|', ('company_id', '=', self.company_id.id), ('company_id', '=', False)], limit=1)
+            team = self.env['quality.alert.team'].search(['|', ('company_id', '=', self.company_id.id), ('company_id', '=', False)], limit=1)
         return {
             'type': 'ir.actions.act_window',
             'res_model': 'quality.check',
@@ -327,8 +320,7 @@ class MrpProductionWorkcenterLine(models.Model):
             production = wo.production_id
 
             move_raw_ids = wo.move_raw_ids.filtered(lambda m: m.state not in ('done', 'cancel'))
-            move_finished_ids = wo.move_finished_ids.filtered(
-                lambda m: m.state not in ('done', 'cancel') and m.product_id != wo.production_id.product_id)
+            move_finished_ids = wo.move_finished_ids.filtered(lambda m: m.state not in ('done', 'cancel') and m.product_id != wo.production_id.product_id)
             previous_check = self.env['quality.check']
             for point in wo.quality_point_ids:
                 # Check if we need a quality control for this point
@@ -350,13 +342,11 @@ class MrpProductionWorkcenterLine(models.Model):
                     if point.test_type == 'register_byproducts':
                         moves = move_finished_ids.filtered(lambda m: m.product_id == point.component_id)
                         if not moves:
-                            moves = production.move_finished_ids.filtered(
-                                lambda m: not m.operation_id and m.product_id == point.component_id)
+                            moves = production.move_finished_ids.filtered(lambda m: not m.operation_id and m.product_id == point.component_id)
                     elif point.test_type == 'register_consumed_materials':
                         moves = move_raw_ids.filtered(lambda m: m.product_id == point.component_id)
                         if not moves:
-                            moves = production.move_raw_ids.filtered(
-                                lambda m: not m.operation_id and m.product_id == point.component_id)
+                            moves = production.move_raw_ids.filtered(lambda m: not m.operation_id and m.product_id == point.component_id)
                     else:
                         check = self.env['quality.check'].create(values)
                         previous_check.next_check_id = check
@@ -373,10 +363,8 @@ class MrpProductionWorkcenterLine(models.Model):
                     processed_move |= moves
 
             # Generate quality checks associated with unreferenced components
-            moves_without_check = ((move_raw_ids | move_finished_ids) - processed_move).filtered(lambda move: (
-                                                                                                                          move.has_tracking != 'none' and not move.raw_material_production_id.use_auto_consume_components_lots) or move.operation_id)
-            quality_team_id = self.env['quality.alert.team'].search(
-                ['|', ('company_id', '=', wo.company_id.id), ('company_id', '=', False)], limit=1).id
+            moves_without_check = ((move_raw_ids | move_finished_ids) - processed_move).filtered(lambda move: (move.has_tracking != 'none' and not move.raw_material_production_id.use_auto_consume_components_lots) or move.operation_id)
+            quality_team_id = self.env['quality.alert.team'].search(['|', ('company_id', '=', wo.company_id.id), ('company_id', '=', False)], limit=1).id
             for move in moves_without_check:
                 values = {
                     'production_id': production.id,
@@ -424,8 +412,7 @@ class MrpProductionWorkcenterLine(models.Model):
 
         backorder = False
         # Trigger the backorder process if we produce less than expected
-        if float_compare(self.qty_producing, self.qty_remaining,
-                         precision_rounding=self.product_uom_id.rounding) == -1 and self.is_first_started_wo:
+        if float_compare(self.qty_producing, self.qty_remaining, precision_rounding=self.product_uom_id.rounding) == -1 and self.is_first_started_wo:
             backorder = self.production_id._split_productions()[1:]
             for workorder in backorder.workorder_ids:
                 if workorder.product_tracking == 'serial':
@@ -436,8 +423,7 @@ class MrpProductionWorkcenterLine(models.Model):
         else:
             if self.operation_id:
                 backorder = (self.production_id.procurement_group_id.mrp_production_ids - self.production_id).filtered(
-                    lambda p: p.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_id).state not in (
-                    'cancel', 'done')
+                    lambda p: p.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_id).state not in ('cancel', 'done')
                 )[:1]
             else:
                 index = list(self.production_id.workorder_ids).index(self)
@@ -456,8 +442,7 @@ class MrpProductionWorkcenterLine(models.Model):
                     wo.current_quality_check_id._update_component_quantity()
             if not self.env.context.get('no_start_next'):
                 if self.operation_id:
-                    return backorder.workorder_ids.filtered(
-                        lambda wo: wo.operation_id == self.operation_id).open_tablet_view()
+                    return backorder.workorder_ids.filtered(lambda wo: wo.operation_id == self.operation_id).open_tablet_view()
                 else:
                     index = list(self.production_id.workorder_ids).index(self)
                     return backorder.workorder_ids[index].open_tablet_view()
@@ -481,8 +466,7 @@ class MrpProductionWorkcenterLine(models.Model):
 
     def open_tablet_view(self):
         self.ensure_one()
-        if not self.is_user_working and self.working_state != 'blocked' and self.state in (
-        'ready', 'waiting', 'progress', 'pending'):
+        if not self.is_user_working and self.working_state != 'blocked' and self.state in ('ready', 'waiting', 'progress', 'pending'):
             self.button_start()
         action = self.env["ir.actions.actions"]._for_xml_id("mrp_workorder.tablet_client_action")
         action['target'] = 'fullscreen'
@@ -537,8 +521,7 @@ class MrpProductionWorkcenterLine(models.Model):
         data = {
             'mrp.workorder': self.read(self._get_fields_for_tablet(), load=False)[0],
             'quality.check': self.check_ids._get_fields_for_tablet(sorted_check_list),
-            'operation': self.operation_id.read(self.operation_id._get_fields_for_tablet())[
-                0] if self.operation_id else {},
+            'operation': self.operation_id.read(self.operation_id._get_fields_for_tablet())[0] if self.operation_id else {},
             'working_state': self.workcenter_id.working_state,
             'views': {
                 'workorder': self.env.ref('mrp_workorder.mrp_workorder_view_form_tablet').id,
@@ -570,8 +553,7 @@ class MrpProductionWorkcenterLine(models.Model):
 
         return {
             'duration': self.duration,
-            'position': bisect_left(last30op, self.duration),
-            # which position regarded other workorders ranked by duration
+            'position': bisect_left(last30op, self.duration), # which position regarded other workorders ranked by duration
             'quality_score': score,
             'show_rainbow': show_rainbow,
         }

mrp_workorder/views/mrp_workorder_views.xml

@@ -27,13 +27,6 @@
                     </field>
                 </page>
             </page>
-            <xpath expr="//sheet" position="after">
-               <div class="oe_chatter">
-                    <field name="message_follower_ids"/>
-                    <field name="activity_ids"/>
-                    <field name="message_ids" options="{'post_refresh': 'recipients'}"/>
-                </div>
-            </xpath>
         </field>
     </record>
 

sf_base/__manifest__.py

@@ -35,7 +35,6 @@
         ],
         'web.assets_backend': [
             'sf_base/static/src/scss/*.scss',
-            'sf_base/static/src/js/*.js',
         ],
 
     },

sf_base/models/__init__.py

@@ -5,4 +5,3 @@ from . import fixture
 from . import functional_fixture
 from . import tool_other_features
 from . import basic_parameters_fixture
-from . import ir_sequence

sf_base/models/basic_parameters_fixture.py

@@ -13,7 +13,7 @@ class BasicParametersFixture(models.Model):
     diameter = fields.Float('直径(mm)', digits=(16, 2))
 
     # '零点卡盘' 字段
-    weight = fields.Float('重量(kg)', digits=(16, 2))
+    weight = fields.Float('重量(mm)', digits=(16, 2))
     orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2))
     clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2))
     clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数')

sf_base/models/common.py

@@ -61,10 +61,12 @@ class MrsMaterialModel(models.Model):
     supplier_ids = fields.One2many('sf.supplier.sort', 'materials_model_id', string='供应商')
     active = fields.Boolean('有效', default=True)
 
-    @api.constrains("gain_way")
-    def _check_supplier_ids(self):
-        for item in self:
-            if item.gain_way in ('外协', '采购') and not item.supplier_ids:
+    @api.onchange('gain_way')
+    def _check_gain_way(self):
+        if not self.gain_way:
+            raise UserError("请选择获取方式")
+        if self.gain_way in ['外协', '采购']:
+            if not self.supplier_ids:
                 raise UserError("请添加供应商")
 
 
@@ -84,21 +86,17 @@ 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)
     parameter_ids = fields.One2many('sf.production.process.parameter', 'process_id', string='可选参数')
-    category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别')
+    category_id = fields.Many2one('sf.production.process.category')
     # workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_process', required=True)
-    processing_day = fields.Float('加工天数/d')
-    travel_day = fields.Float('路途天数/d')
-    sequence = fields.Integer('排序')
+
 
 # class MrsProcessingTechnology(models.Model):
 #     _name = 'sf.processing.technology'
@@ -145,12 +143,8 @@ class MrsProductionProcessParameter(models.Model):
     is_check = fields.Boolean(default=False)
     # price = fields.Float('单价')
     process_id = fields.Many2one('sf.production.process', string='表面工艺')
-    process_description = fields.Char(string='工艺描述')
     materials_model_ids = fields.Many2many('sf.materials.model', 'applicable_material', string='适用材料')
-    processing_day = fields.Float('加工天数/d')
-    travel_day = fields.Float('路途天数/d')
     active = fields.Boolean('有效', default=True)
-    processing_mm = fields.Char('加工厚度/mm')
 
     def name_get(self):
         result = []

sf_base/models/ir_sequence.py

@@ -1,74 +0,0 @@
-import calendar
-from datetime import timedelta
-
-from odoo import models, fields
-
-
-class IrSequence(models.Model):
-    _inherit = 'ir.sequence'
-
-    date_range_period = fields.Selection(
-        [('day', '每日'), ('month', '每月'), ('year', '每年')],
-        string='日期期间',
-    )
-
-    def _next(self, sequence_date=None):
-        """ Returns the next number in the preferred sequence in all the ones given in self."""
-        if not self.use_date_range:
-            return self._next_do()
-        # 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),
-                ('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)
-            else:
-                seq_date = self._create_date_range_seq(dt)
-        return seq_date.with_context(ir_sequence_date_range=seq_date.date_from)._next()
-
-    def _create_date_range_seq_by_period(self, date, period):
-        if period == 'year':
-            year = fields.Date.from_string(date).strftime('%Y')
-            date_from = '{}-01-01'.format(year)
-            date_to = '{}-12-31'.format(year)
-        if period == 'month':
-            # 计算当前月份的第一天和最后一天
-            year = fields.Date.from_string(date).strftime('%Y')
-            month = fields.Date.from_string(date).strftime('%m')
-            date_from = fields.Date.from_string(date).strftime('%Y-%m-01')
-            date_to = '{}-{}-{}'.format(year, month, calendar.monthrange(int(year), int(month))[1])
-        if period == 'day':
-            date_from = date
-            date_to = date
-        date_range = self.env['ir.sequence.date_range'].search(
-            [
-                ('sequence_id', '=', self.id),
-                ('date_to', '>=', date_from),
-                ('date_to', '<=', date),
-                ('date_range_period', '=', period)
-            ],
-            order='date_to desc', limit=1)
-        if date_range:
-            date_from = date_range.date_to + timedelta(days=1)
-        seq_date_range = self.env['ir.sequence.date_range'].sudo().create({
-            'date_from': date_from,
-            'date_to': date_to,
-            'sequence_id': self.id,
-            'date_range_period': period,
-        })
-        return seq_date_range
-
-
-class IrSequenceDateRange(models.Model):
-    _inherit = 'ir.sequence.date_range'
-
-    date_range_period = fields.Selection(
-        [('day', '每日'), ('month', '每月'), ('year', '每年')],
-        string='日期期间',
-    )

sf_base/models/tool_base_new.py

@@ -331,7 +331,7 @@ class ToolInventory(models.Model):
     work_material = fields.Selection([('钢', '钢'), ('铝', '铝')], string='加工材料')
     life_span = fields.Float('寿命(min)')
 
-    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组', required=True)
+    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组')
 
     active = fields.Boolean('已归档', default=True)
 

sf_base/models/tool_base_new.py.rej

@@ -0,0 +1,10 @@
+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/security/ir.model.access.csv

@@ -11,8 +11,8 @@ access_sf_machine_control_system,sf_machine_control_system,model_sf_machine_cont
 access_sf_machine_control_system_admin,sf_machine_control_system_admin,model_sf_machine_control_system,base.group_system,1,1,1,0
 access_sf_production_process_group_sale_director,sf_production_process_group_sale_director,model_sf_production_process,sf_base.group_sale_director,1,0,0,0
 access_sf_production_process_group_sale_salemanager,sf_production_process_group_sale_salemanager,model_sf_production_process,sf_base.group_sale_salemanager,1,0,0,0
-access_res_partner_category_group_sale_salemanager,res_partner_category_group_sale_salemanager,base.model_res_partner_category,sf_base.group_sale_salemanager,1,1,1,0
-access_res_partner_category_group_sale_director,res_partner_category_group_sale_director,base.model_res_partner_category,sf_base.group_sale_director,1,1,1,0
+access_res_partner_category_group_sale_salemanager,res_partner_category_group_sale_salemanager,base.model_res_partner_category,sf_base.group_sale_salemanager,1,0,1,0
+access_res_partner_category_group_sale_director,res_partner_category_group_sale_director,base.model_res_partner_category,sf_base.group_sale_director,1,0,1,0
 access_sf_production_process,sf_production_process,model_sf_production_process,base.group_user,1,1,1,0
 access_sf_production_process_admin,sf_production_process_admin,model_sf_production_process,base.group_system,1,1,1,0
 access_sf_production_materials,sf_production_materials,model_sf_production_materials,base.group_user,1,1,1,0

sf_base/static/src/js/remove_focus.js

@@ -1,23 +0,0 @@
-/** @odoo-module **/
-
-import { registry } from '@web/core/registry';
-
-import { formView } from '@web/views/form/form_view';
-import { FormController } from '@web/views/form/form_controller';
-
-import { onRendered, onMounted } from "@odoo/owl";
-
-export class RemoveFocusController extends FormController {
-    setup() {
-        super.setup();
-
-        onMounted(() => {
-            this.__owl__.bdom.el.querySelectorAll(':focus').forEach(element => element.blur());
-        })
-    }
-}
-
-registry.category('views').add('remove_focus_view', {
-    ...formView,
-    Controller: RemoveFocusController,
-});

sf_base/views/common_view.xml

@@ -16,7 +16,7 @@
         <record model="ir.ui.view" id="mrs_production_process_parameter_form">
             <field name="model">sf.production.process.parameter</field>
             <field name="arch" type="xml">
-                <form string="表面工艺可选参数" create="0" delete="0" >
+                <form string="表面工艺可选参数" create="0" delete="0">
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -27,18 +27,13 @@
                             <group>
                                 <field name="code" readonly="1"/>
                                 <field name="process_id" readonly="1"/>
-                                <field name="process_description" readonly="1"/>
                                 <field name="gain_way"/>
                             </group>
-                            <group>
-                                <field name="processing_day" readonly="1"/>
-                                <field name="travel_day" readonly="1"/>
-                                <field name="processing_mm" readonly="1"/>
-                            </group>
+
                         </group>
                         <notebook>
                             <page string="适用材料">
-                                <field name="materials_model_ids" readonly="1"></field>
+                                <field name="materials_model_ids"></field>
                             </page>
                         </notebook>
                     </sheet>
@@ -53,7 +48,7 @@
                 <search>
                     <filter name="filter_active" string="已归档" domain="[('active','=',False)]"/>
                     <field name="name" string="名称" filter_domain="[('name','ilike',self)]"/>
-                    <field name="code" string="编码" filter_domain="[('code','ilike',self)]"/>
+                    <field name="code" string="编码" filter_domain="[('codeNum','ilike',self)]"/>
                     <searchpanel class="account_root">
                         <field name="process_id" icon="fa-filter"/>
                     </searchpanel>
@@ -141,7 +136,7 @@
             <field name="model">sf.production.process.category</field>
             <field name="arch" type="xml">
                 <tree string="表面工艺类别" default_order="sequence, id" create="0" edit="0" delete="1">
-                    <field name="sequence" widget="handle" string="序号" readonly="1"/>
+                    <field name="sequence" widget="handle" string="序号"/>
                     <field name="code"/>
                     <field name="name" string="名称"/>
                 </tree>
@@ -164,8 +159,7 @@
         <record model="ir.ui.view" id="sf_production_process_tree">
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
-                <tree string="表面工艺" create="0" edit="0" delete="0">
-                    <field name="sequence"  string="加工顺序"  readonly="1"/>
+                <tree string="表面工艺" create="0" edit="0" delete="1">
                     <field name="code"/>
                     <field name="name" string="名称"/>
                     <field name="remark"/>
@@ -176,7 +170,7 @@
         <record model="ir.ui.view" id="sf_production_process_form">
             <field name="model">sf.production.process</field>
             <field name="arch" type="xml">
-                <form string="表面工艺" create="0"  delete="0">
+                <form string="表面工艺" create="0" edit="1" delete="1">
                     <sheet>
                         <div class="oe_title">
                             <h1>
@@ -185,46 +179,41 @@
                         </div>
                         <group>
                             <group>
-                                <field name="code" readonly="1"/>
-                                <field name="category_id" readonly="1"/>
+                                <field name="code"/>
                             </group>
-                            <group>
-                                <field name="processing_day" readonly="1"/>
-                                <field name="travel_day" readonly="1"/>
-                            </group>
-                        </group>
-                        <notebook>
-                            <page string="可选参数" >
-                                <field name="parameter_ids" >
-                                    <tree force_save="1" create="0">
-                                        <field name="code" readonly="1" force_save="1"/>
-                                        <field name="name" readonly="1"/>
-                                        <field name="gain_way"/>
-                                        <field name='process_id' default="default"/>
-                                    </tree>
-                                    <form>
-                                        <sheet>
-                                            <group>
+                            <notebook>
+                                <page string="可选参数">
+                                    <field name="parameter_ids">
+                                        <tree force_save="1">
+                                            <field name="code" readonly="1" force_save="1"/>
+                                            <field name="name"/>
+                                            <field name="gain_way"/>
+                                            <field name='process_id' default="default"/>
+                                        </tree>
+                                        <form>
+                                            <sheet>
                                                 <group>
-                                                    <field name="code"/>
-                                                    <field name="name" string="参数名"/>
+                                                    <group>
+                                                        <field name="code"/>
+                                                        <field name="name" string="参数名"/>
+                                                    </group>
+                                                    <group>
+                                                        <field name='process_id'/>
+                                                        <field name="gain_way"/>
+                                                    </group>
                                                 </group>
-                                                <group>
-                                                    <field name='process_id'/>
-                                                    <field name="gain_way"/>
-                                                </group>
-                                            </group>
-                                            <notebook>
-                                                <page string="适用材料">
-                                                    <field name="materials_model_ids"/>
-                                                </page>
-                                            </notebook>
-                                        </sheet>
-                                    </form>
-                                </field>
-                            </page>
+                                                <notebook>
+                                                    <page string="适用材料">
+                                                        <field name="materials_model_ids"/>
+                                                    </page>
+                                                </notebook>
+                                            </sheet>
+                                        </form>
+                                    </field>
+                                </page>
 
-                        </notebook>
+                            </notebook>
+                        </group>
                         <group>
                             <group>
                                 <field name="remark"/>
@@ -262,7 +251,7 @@
                         <group>
                             <group>
                                 <field name="materials_no" readonly="1" force_save="1"/>
-                                <field name="gain_way" required="0"/>
+                                <field name="gain_way" required="1"/>
                                 <field name="tensile_strength" required="1"/>
                                 <field name="hardness" required="1"/>
                                 <field name="density" readonly="1"/>
@@ -281,9 +270,9 @@
                         <notebook>
                             <page string="供应商">
                                 <field name='supplier_ids' class="supplier_ids_set_css">
-                                    <tree editable='bottom' delete="1">
+                                    <tree editable='bottom'>
                                         <field name="sequence" widget="handle" string="序号"/>
-                                        <field name="partner_id" string="名称" options="{'no_create': True}"/>
+                                        <field name="partner_id" string="名称"/>
                                     </tree>
                                 </field>
                             </page>

sf_base/views/fixture_view.xml

@@ -171,7 +171,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="diameter"/>
-                                    <field name="weight"  string="重量(kg)"/>
+                                    <field name="weight"/>
                                     <field name="orientation_dish_diameter"/>
                                     <field name="clamping_diameter"/>
                                     <field name="clamping_num"/>
@@ -197,7 +197,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="diameter"/>
-                                    <field name="weight"  string="重量(kg)"/>
+                                    <field name="weight"/>
                                     <field name="clamping_diameter"/>
                                     <field name="connector_diameter"/>
                                     <field name="chucking_power_max"/>
@@ -220,7 +220,7 @@
                                     <field name="length"/>
                                     <field name="width"/>
                                     <field name="height"/>
-                                    <field name="weight"  string="重量(kg)"/>
+                                    <field name="weight"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -248,7 +248,7 @@
                                     <field name="length"/>
                                     <field name="width"/>
                                     <field name="height"/>
-                                    <field name="weight"  string="重量(kg)"/>
+                                    <field name="weight"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -278,7 +278,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="height_tolerance_value"/>
-                                    <field name="weight"  string="重量(kg)"/>
+                                    <field name="weight"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -307,7 +307,7 @@
                                     <field name="length"/>
                                     <field name="width"/>
                                     <field name="height"/>
-                                    <field name="weight"  string="重量(kg)"/>
+                                    <field name="weight"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>
@@ -335,7 +335,7 @@
                                     <field name="width"/>
                                     <field name="height"/>
                                     <field name="diameter"/>
-                                    <field name="weight" string="重量(kg)"/>
+                                    <field name="weight"/>
                                     <field name="gripper_length_min"/>
                                     <field name="gripper_width_min"/>
                                     <field name="gripper_height_min"/>

sf_base/views/tool_views.xml

@@ -555,9 +555,9 @@
         <field name="model">sf.tool.inventory</field>
         <field name="arch" type="xml">
             <tree string="功能刀具清单" create="1" edit="1" delete="0" editable="bottom">
-                <field name="name" attrs="{'readonly': [('id', '!=', False)]}"/>
+                <field name="name"/>
                 <field name="functional_cutting_tool_model_id"/>
-                <field name="tool_groups_id" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
+                <field name="tool_groups_id"/>
                 <field name="work_material"/>
                 <field name="life_span"/>
                 <field name="prefix" optional="hide"/>

sf_bf_connect/models/http.py

@@ -21,7 +21,6 @@ class Http(models.AbstractModel):
     def _auth_method_sf_token(cls):
         # 从headers.environ中获取对方传过来的token,timestamp,加密的校验字符串
         datas = request.httprequest.headers.environ
-        _logger.info('datas:%s' % datas)
         if 'HTTP_TOKEN' in datas:
             _logger.info('token:%s' % datas['HTTP_TOKEN'])
             # 查询密钥
@@ -36,7 +35,7 @@ class Http(models.AbstractModel):
             post_time = int(datas['HTTP_TIMESTAMP'])
             datetime_post = datetime.fromtimestamp(post_time)
             datetime_now = datetime.now().replace(microsecond=0)
-            datetime_del = datetime_now + timedelta(seconds=30)
+            datetime_del = datetime_now + timedelta(seconds=5)
             if datetime_post > datetime_del:
                 raise AuthenticationError('请求已过期')
             check_str = '%s%s%s' % (datas['HTTP_TOKEN'], post_time, factory_secret.sf_secret_key)

sf_bf_connect/models/jd_eclp.py

@@ -5,7 +5,7 @@ import requests
 import cpca
 # from odoo.exceptions import UserError
 # from odoo.exceptions import ValidationError
-from odoo import api, fields, models, _
+from odoo import api, fields, models
 from odoo.exceptions import ValidationError
 
 _logger = logging.getLogger(__name__)
@@ -14,7 +14,7 @@ _logger = logging.getLogger(__name__)
 class JdEclp(models.Model):
     _inherit = 'stock.picking'
 
-    senderNickName = fields.Char(string='寄件工厂简称', required=True, default='XT')
+    senderNickName = fields.Char(string='寄件工厂简称', required=True, default='MW')
 
     # receiverName = fields.Char(string='收件人姓名')
     # receiverMobile = fields.Char(string='收件人电话')
@@ -67,10 +67,9 @@ class JdEclp(models.Model):
         """
         判断是否为出库单
         """
-        for record in self:
-            if record.name:
-                is_check_out = record.name.split('/')
-                record.check_out = is_check_out[1]
+        if self.name:
+            is_check_out = self.name.split('/')
+            self.check_out = is_check_out[1]
 
     @api.depends('carrier_tracking_ref')
     def query_bill_pdf(self):
@@ -149,7 +148,7 @@ class JdEclp(models.Model):
             },
         }
         _logger.info('准备调接口1')
-        url1 = config['bfm_url_new'] + '/api/create/jd/order'
+        url1 = config['bfm_url'] + '/api/create/jd/order'
         requests.post(url1, json=json1, data=None)
         _logger.info('调用成功1')
         _logger.info('准备调接口2')
@@ -158,31 +157,18 @@ class JdEclp(models.Model):
                 'orderNo': self.origin,
             },
         }
-        url2 = config['bfm_url_new'] + '/api/get/jd/no'
+        url2 = config['bfm_url'] + '/api/get/jd/no'
         response = requests.post(url2, json=json2, data=None)
         # _logger.info('调用成功2', response.json()['result']['wbNo'])
-        tem_ret = response.json().get('result')
-        if not tem_ret:
-            raise ValidationError('京东物流返回异常，请联系管理员')
-        self.carrier_tracking_ref = response.json()['result'].get('wbNo')
-        if not self.carrier_tracking_ref:
-            raise ValidationError('物流下单未成功，请联系管理员')
+        self.carrier_tracking_ref = response.json()['result']['wbNo']
         self.is_bill = True
         self.logistics_status = '1'
 
-        notification = {
-            'type': 'ir.actions.client',
-            'tag': 'display_notification',
-            'params': {
-                'title': _('成功'),
-                'type': 'success',
-                'message': '物流下单成功',
-                'sticky': False,
-                'next': {'type': 'ir.actions.client', 'tag': 'reload'}
-            }
-        }
+        # # 京东物流下单后，销售订单状态改为待收货
+        # self.env['sale.order'].search([('name', '=', self.origin)]).write({'scheduled_status': 'to receive'})
 
-        return notification
+        # else:
+        #     raise UserError("选择京东物流才能下单呦")
 
     def get_bill(self):
         """
@@ -196,7 +182,7 @@ class JdEclp(models.Model):
                 'no': self.origin,
             },
         }
-        url1 = config['bfm_url_new'] + '/api/create/jd/bill'
+        url1 = config['bfm_url'] + '/api/create/jd/bill'
         response = requests.post(url1, json=json1, data=None)
         # _logger.info('调用成功2', response.json())
 

sf_bf_connect/models/process_status.py

@@ -1,8 +1,7 @@
 from datetime import datetime
 import logging
 import requests
-from odoo.exceptions import UserError
-from odoo import fields, models, _
+from odoo import fields, models
 
 _logger = logging.getLogger(__name__)
 
@@ -15,49 +14,26 @@ class StatusChange(models.Model):
     def action_confirm(self):
         # 在原有方法执行前记录日志和执行其他操作
         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(
-                        [('server_product_process_parameters_id', '=', item.id),
-                         ('detailed_type', '=', 'service')])
-                    if not server_product:
-                        server_product_none.append(item.name)
-        if server_product_none:
-            raise UserError(_("请先至【产品】中创建【表面工艺参数】为【%s】的服务产品", ", ".join(server_product_none)))
 
         # 使用super()来调用原始方法（在本例中为'sale.order'模型的'action_confirm'方法）
-        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:
-                logging.error('工厂加工同步订单状态失败 {}'.format(ret.text))
-                raise UserError('工厂加工同步订单状态失败')
-        except UserError as e:
-            logging.error('工厂加工同步订单状态失败 {}'.format(e))
-            raise UserError('工厂加工同步订单状态失败')
+        res = super(StatusChange, self).action_confirm()
+
+        # 原有方法执行后，进行额外的操作（如调用外部API）
+        process_start_time = str(datetime.now())
+        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'] + '/api/get/state/get_order'
+        requests.post(url1, json=json1, data=None)
+        logging.info('接口已经执行=============')
+
         return res
 
     def action_cancel(self):
@@ -78,7 +54,7 @@ class StatusChange(models.Model):
                 'state': '待派单',
             },
         }
-        url1 = config['bfm_url_new'] + '/api/get/state/cancel_order'
+        url1 = config['bfm_url'] + '/api/get/state/cancel_order'
         requests.post(url1, json=json1, data=None)
 
         return res
@@ -226,12 +202,12 @@ class FinishStatusChange(models.Model):
                     [('id', 'child_of', self.picking_type_id.warehouse_id.view_location_id.id),
                      ('usage', '!=', 'supplier')])
                 if self.env['stock.move'].search([
-                    ('state', 'in', ['confirmed', 'partially_available', 'waiting', 'assigned']),
-                    ('product_qty', '>', 0),
-                    ('location_id', 'in', wh_location_ids),
-                    ('move_orig_ids', '=', False),
-                    ('picking_id', 'not in', self.ids),
-                    ('product_id', 'in', lines.product_id.ids)], limit=1):
+                        ('state', 'in', ['confirmed', 'partially_available', 'waiting', 'assigned']),
+                        ('product_qty', '>', 0),
+                        ('location_id', 'in', wh_location_ids),
+                        ('move_orig_ids', '=', False),
+                        ('picking_id', 'not in', self.ids),
+                        ('product_id', 'in', lines.product_id.ids)], limit=1):
                     action = self.action_view_reception_report()
                     action['context'] = {'default_picking_ids': self.ids}
                     return action

sf_bf_connect/views/view.xml

@@ -32,7 +32,7 @@
                 <field name="is_bill" invisible="True"/>
                 <field name="logistics_status" invisible="True"/>
                 <field name="logistics_way" invisible="True"/>
-                <button string="物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"
+                <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"
                 attrs="{'invisible': ['|', '|', '|', ('check_out', '!=', 'OUT'), ('state', '!=', 'assigned'), ('is_bill', '=', True), ('logistics_way', '=', '自提')]}"/>
                 <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"
                 attrs="{'invisible': ['|', '|', '|', '|', ('check_out', '!=', 'OUT'), ('state', '!=', 'assigned'), ('logistics_status', '=', '2'), ('is_bill', '=', False), ('logistics_way', '=', '自提')]}"/>
@@ -45,50 +45,42 @@
         <field name="model">stock.picking</field>
         <field name="inherit_id" ref="delivery.view_picking_withcarrier_out_form"/>
         <field name="arch" type="xml">
+
             <field name="location_id" position="after">
                 <field name="logistics_status" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
                 <field name="logistics_way" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
             </field>
-        </field>
-    </record>
 
-    <record id="tracking_only_view" model="ir.ui.view">
-        <field name="name">tracking only</field>
-        <field name="model">stock.picking</field>
-        <field name="inherit_id" ref="stock.view_picking_form"/>
-        <field name="arch" type="xml">
-            <xpath expr="//form//sheet//notebook//page[@name='operations']" position="after">
-                <page string="发货信息" name="tracking">
-                    <group>
-                        <group>
-                        <field name="senderNickName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="expressItemName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="grossWeight" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="grossVolume" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="deliveryType" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="receiverName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="receiverMobile" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="receiverProvinceName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="receiverCityName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="receiverCountyName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="receiverTownName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="receiverCompany" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        <field name="remark" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-
-                        <field name="pickupBeginTime" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-                        </group>
-                        <group>
-                        <field name="logistics_status"/>
-                        <field name="carrier_id"/>
-                        <field name="carrier_tracking_ref"/>
-
-                        <field name="bill_show" attrs="{'invisible': [('check_out', '!=', 'OUT')]}" string='面单下载'/>
-                        <field name="bill_show" widget="pdf_viewer" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
-
-                        </group>
-                    </group>
-                </page>
+            <xpath expr="//group//field[@name='carrier_id']" position="after">
+<!--                 <field name="senderNickName" domain="[('self.name', 'like', '%OUT%')]"/> -->
+                <field name="senderNickName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="expressItemName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="deliveryType" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverMobile" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverProvinceName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverCityName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverCountyName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverTownName" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="receiverCompany" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="remark" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="grossWeight" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="grossVolume" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="pickupBeginTime" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="bill_show" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+                <field name="logistics_status"/>
             </xpath>
+            <xpath expr="//group//field[@name='group_id']" position="after">
+                <field name="bill_show" widget="pdf_viewer" attrs="{'invisible': [('check_out', '!=', 'OUT')]}"/>
+            </xpath>
+<!--             <xpath expr="//group[@name='other_infos']" position="after"> -->
+<!--                 <div> -->
+<!--                     <button string="京东物流下单" name="create_order" type="object" confirm="是否确认物流下单" class="btn-primary"/> -->
+<!--                 </div> -->
+<!--                 <div> -->
+<!--                     <button string="获取物流面单" name="get_bill" type="object" confirm="是否获取物流面单" class="btn-primary"/> -->
+<!--                 </div> -->
+<!--             </xpath> -->
         </field>
     </record>
 </odoo>

sf_dlm/models/product_supplierinfo.py

@@ -122,7 +122,7 @@ class ResMrpBomMo(models.Model):
     # 查bom的原材料
     def get_raw_bom(self, product):
         raw_bom = self.env['product.product'].search(
-            [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)],limit=1)
+            [('categ_id.type', '=', '原材料'), ('materials_type_id', '=', product.materials_type_id.id)])
         return raw_bom
 
 

sf_dlm_management/data/stock_data.xml

@@ -22,16 +22,6 @@
             <field name="company_id" ref="base.main_company"/>
         </record>
 
-        <record id="stock_location_tool_dismantle" model="stock.location">
-            <field name="name">拆解</field>
-            <field name="location_id" ref="stock.stock_location_locations_virtual"/>
-            <field name="usage">internal</field>
-            <field name="barcode">DJCJ</field>
-            <field name="scrap_location">true</field>
-            <field name="active">true</field>
-            <field name="company_id" ref="base.main_company"/>
-        </record>
-
 
         <record id="after_assembly_picking_in" model="stock.picking.type">
             <field name="name">刀具组装入库</field>

sf_dlm_management/views/product_template_management_view.xml

@@ -10,7 +10,6 @@
                     <field name='categ_id' class="custom_required" attrs="{'readonly': [('id', '!=', False)]}"/>
                     <field name='is_bfm' invisible="1"/>
                     <field name='categ_type' invisible="1"/>
-                    <field name='part_number' attrs="{'invisible': [('categ_type', '!=', '成品')]}"/>
                     <field name='manual_quotation' attrs="{'invisible':[('upload_model_file', '=', [])]}"/>
                     <field name="upload_model_file"
                            widget="many2many_binary"
@@ -32,11 +31,9 @@
                            options="{'no_create': True}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"
                            placeholder="请选择"/>
-                    <field name="brand_id" options="{'no_create': True}" placeholder="请选择"
-                           attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"/>
                     <field name="cutting_tool_model_id" placeholder="请选择" class="custom_required"
                            options="{'no_create': True}"
-                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id),('brand_id', '=', brand_id)]"
+                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"
                            context="{'default_cutting_tool_material_id': cutting_tool_material_id}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}">
                     </field>
@@ -50,10 +47,10 @@
                     <field name="fixture_material_id"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            placeholder="请选择" options="{'no_create': True}"/>
-                    <field name="fixture_model_id" string="型号名称" placeholder="请选择" options="{'no_create': True}"
+                    <field name="fixture_model_id" string="型号" placeholder="请选择" options="{'no_create': True}"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_material_id','=',fixture_material_id)]"/>
-                    <field name="specification_fixture_id" string="物料号" placeholder="请选择"
+                    <field name="specification_fixture_id" string="规格" placeholder="请选择"
                            options="{'no_create': True}"
                            attrs="{'invisible': [('categ_type', '!=', '夹具')],'required': [('categ_type', '=', '夹具')]}"
                            domain="[('fixture_model_id','=',fixture_model_id)]"/>
@@ -88,7 +85,7 @@
                                 </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="加工面板"/>
                                 <field name="model_machining_precision"/>
                                 <field name="model_process_parameters_ids" string="表面工艺参数"
                                        widget="many2many_tags"
@@ -98,16 +95,6 @@
                         </group>
                     </page>
                 </xpath>
-                <xpath expr="//field[@name='name']" position="attributes">
-                    <attribute name="attrs">{'readonly': ['|',('id','!=',False),('categ_type', '=',
-                        '刀具')], '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>-->
             </field>
         </record>
 
@@ -305,7 +292,7 @@
                                 <field name="cutting_tool_blade_type"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
                                 <field name="cutting_tool_coarse_medium_fine" string="粗/中/精" placeholder="请选择"
-                                       attrs="{'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/>
+                                       attrs="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/>
                                 <!--整体式刀具-->
                                 <field name="cutting_tool_shank_diameter" string="柄部直径(mm)" class="diameter"
                                        attrs="{'invisible': [('cutting_tool_type', '!=', '整体式刀具')],'readonly': [('id', '!=', False)]}"/>
@@ -468,8 +455,7 @@
                                     <tree editable="bottom">
                                         <!--                                        <field name="cutting_speed"-->
                                         <!--                                               attrs="{'readonly': [('materials_type_id','!=',False)]}"/>-->
-                                        <field name="materials_type_id" options="{'no_create': True}"
-                                               placeholder="请选择"/>
+                                        <field name="materials_type_id" options="{'no_create': True}" placeholder="请选择"/>
                                         <field name="blade_diameter"/>
                                         <field name="feed_per_tooth"/>
                                     </tree>

sf_hr/__init__.py

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

sf_hr/__manifest__.py

@@ -1,22 +0,0 @@
-# -*- 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': ['hr'],
-    'data': [
-        'views/hr_employee.xml',
-    ],
-    'demo': [
-    ],
-    'qweb': [
-    ],
-    'license': 'LGPL-3',
-    'installable': True,
-    'application': False,
-    'auto_install': False,
-}

sf_hr/models/__init__.py

@@ -1,2 +0,0 @@
-# -*- coding: utf-8 -*-
-

sf_hr/views/hr_employee.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<odoo>
-    <data>
-        <record id="view_form_employee_extend" model="ir.ui.view">
-            <field name="name">employee_form</field>
-            <field name="model">hr.employee</field>
-            <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>
-                </xpath>
-            </field>
-        </record>
-    </data>
-</odoo>

sf_machine_connect/__init__.py

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

sf_machine_connect/__manifest__.py

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

sf_machine_connect/controllers/__init__.py

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

sf_machine_connect/controllers/controllers.py

@@ -1,832 +0,0 @@
-# -*- coding: utf-8 -*-
-import re
-import ast
-import json
-import base64
-import logging
-import psycopg2
-from datetime import datetime, timedelta
-from odoo import http
-from odoo.http import request
-
-# 数据库连接配置
-db_config = {
-    "database": "timeseries_db",
-    "user": "postgres",
-    "password": "postgres",
-    "port": "5432",
-    "host": "172.16.10.98"
-}
-
-
-def convert_to_seconds(time_str):
-    # 修改正则表达式，使 H、M、S 部分可选
-
-    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 Sf_Dashboard_Connect(http.Controller):
-
-    @http.route('/api/get_machine_datas/list', type='http', auth='public', methods=['GET', 'POST'], csrf=False,
-                cors="*")
-    def get_machine_datas_list(self, **kw):
-        """
-        拿到机床数据返回给大屏展示
-        :param kw:
-        :return:
-        """
-        res = {'status': 1, 'message': '成功', 'data': []}
-        logging.info('前端请求机床数据的参数为:%s' % kw)
-
-        # 获取当前时间的时间戳
-        current_timestamp = datetime.now().timestamp()
-        print(current_timestamp)
-
-        # tem_list = [
-        #     "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-1", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-3",
-        #     "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-4", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-5",
-        #     "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-6", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-7",
-        #     "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-8", "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-2",
-        #     "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-9", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-10",
-        #     "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-11", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-12",
-        #     "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-13", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-14"
-        # ]
-        try:
-            equipment_obj = request.env['maintenance.equipment'].sudo()
-            # 获取请求的机床数据
-            machine_list = ast.literal_eval(kw['machine_list'])
-            for item in machine_list:
-                machine_data = equipment_obj.search([('code', '=', item)])
-
-                # 机床上线时间段
-                first_online_duration = current_timestamp - int(machine_data.first_online_time.timestamp())
-
-                power_off_time = None
-                power_off_rate = None
-                if machine_data.machine_power_on_time:
-                    power_off_time = first_online_duration - convert_to_seconds(machine_data.machine_power_on_time)
-                    power_off_rate = round((power_off_time / first_online_duration), 3)
-                else:
-                    power_off_time = False
-                    power_off_rate = False
-                if machine_data:
-                    res['data'].append({
-                        'active': machine_data.status,
-                        'id': machine_data.id,
-                        'name': machine_data.name,
-                        'brand': machine_data.type_id.name,
-                        'code': machine_data.code,
-                        'status': machine_data.status,
-                        'run_status': machine_data.run_status,
-                        'run_time': machine_data.run_time,
-                        'system_date': machine_data.system_date,
-                        'system_time': machine_data.system_time,
-                        'cut_time': machine_data.cut_time,
-                        'cut_status': machine_data.cut_status,
-                        'program': machine_data.program,
-                        'program_name': machine_data.program_name,
-                        'program_status': machine_data.program_status,
-                        'tool_num': machine_data.tool_num,
-                        'machine_power_on_time': machine_data.machine_power_on_time,
-                        'product_counts': machine_data.product_counts,
-                        'mode': machine_data.mode,
-                        'start_time': machine_data.start_time,
-                        'end_time': machine_data.end_time,
-                        'program_start_time': machine_data.program_start_time,
-                        'program_end_time': machine_data.program_end_time,
-                        'standby_start_time': machine_data.standby_start_time,
-                        'standby_end_time': machine_data.standby_end_time,
-                        'offline_start_time': machine_data.offline_start_time,
-                        'offline_end_time': machine_data.offline_end_time,
-                        'emg_status': machine_data.emg_status,
-                        'current_program': machine_data.current_program,
-                        'current_program_seq': machine_data.current_program_seq,
-                        'x_abs_pos': machine_data.x_abs_pos,
-                        'y_abs_pos': machine_data.y_abs_pos,
-                        'z_abs_pos': machine_data.z_abs_pos,
-                        'feed_speed_set': machine_data.feed_speed_set,
-                        'act_feed_speed': machine_data.act_feed_speed,
-                        'spindle_speed_set': machine_data.spindle_speed_set,
-                        'act_spindle_speed': machine_data.act_spindle_speed,
-                        'spindle_load': machine_data.spindle_load,
-                        'x_axis_load': machine_data.x_axis_load,
-                        'y_axis_load': machine_data.y_axis_load,
-                        'z_axis_load': machine_data.z_axis_load,
-                        'rapid_feed': machine_data.rapid_feed,
-                        'feed_rate': machine_data.feed_rate,
-                        'x_mach_coord': machine_data.x_mach_coord,
-                        'y_mach_coord': machine_data.y_mach_coord,
-                        'z_mach_coord': machine_data.z_mach_coord,
-                        'x_rel_coord': machine_data.x_rel_coord,
-                        'y_rel_coord': machine_data.y_rel_coord,
-                        'z_rel_coord': machine_data.z_rel_coord,
-                        'x_dis_coord': machine_data.x_dis_coord,
-                        'y_dis_coord': machine_data.y_dis_coord,
-                        'z_dis_coord': machine_data.z_dis_coord,
-                        'alarm_time': machine_data.alarm_time,
-                        'alarm_msg': machine_data.alarm_msg,
-                        'clear_time': machine_data.clear_time,
-                        # 计算出来的数据
-                        # 开动率：运行时间/通电时间
-                        'run_rate': machine_data.run_rate,
-                        # 关机时长：初次上线时间 - 通电时间
-                        'power_off_time': power_off_time,
-                        # 关机率：关机时长/初次上线时间
-                        'power_off_rate': power_off_rate,
-                        'first_online_duration': first_online_duration,
-                        # 停机时间：关机时间 - 运行时间
-                        # 停机时长：关机时间 - 初次上线时间
-                        'img': f'data:image/png;base64,{machine_data.machine_tool_picture.decode("utf-8")}',
-                        'equipment_type': machine_data.category_id.name,
-                    })
-
-            return json.dumps(res)
-        except Exception as e:
-            logging.info('前端请求机床数据失败，原因:%s' % e)
-            res['status'] = -1
-            res['message'] = '前端请求机床数据失败，原因:%s' % e
-            return json.JSONEncoder().encode(res)
-
-    @http.route('/api/logs/list', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def logs_list(self, **kw):
-        """
-        拿到日志数据返回给大屏展示
-        :param kw:
-        :return:
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        logging.info('前端请求日志数据的参数为:%s' % kw)
-
-        try:
-            # 连接数据库
-            conn = psycopg2.connect(**db_config)
-            cur = conn.cursor()
-            machine_list = ast.literal_eval(kw['machine_list'])
-            begin_time_str = kw['begin_time'].strip('"')
-            end_time_str = kw['end_time'].strip('"')
-
-            begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
-            end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-
-            print('begin_time: %s' % begin_time)
-
-            for item in machine_list:
-                sql = '''
-                       SELECT time, device_state, program_name 
-                       FROM device_data 
-                       WHERE device_name = %s AND time >= %s AND time <= %s 
-                       ORDER BY time DESC;
-                    '''
-                # 执行SQL命令，使用参数绑定
-                cur.execute(sql, (item, begin_time, end_time))
-                results = cur.fetchall()
-
-                # 将数据按照 equipment_code 进行分组
-                if item not in res['data']:
-                    res['data'][item] = []
-
-                for result in results:
-                    res['data'][item].append({
-                        'time': result[0].strftime('%Y-%m-%d %H:%M:%S'),
-                        'state': result[1],
-                        'production_name': result[2],
-                    })
-
-            return json.dumps(res)  # 注意使用 json.dumps 而不是直接用 json.JSONEncoder().encode()
-
-        except Exception as e:
-            logging.info('前端请求日志数据失败，原因:%s' % e)
-            res['status'] = -1
-            res['message'] = '前端请求日志数据失败，原因:%s' % e
-            return json.dumps(res)
-
-    # 返回CNC机床列表
-    @http.route('/api/CNCList', type='http', auth='public', methods=['GET', 'POST'], csrf=False,
-                cors="*")
-    def CNCList(self, **kw):
-        """
-        获取CNC机床列表
-        :param kw:
-        :return:
-        """
-
-        # logging.info('CNCList:%s' % kw)
-        try:
-            res = {'Succeed': True}
-            # cnc_list = request.env['sf.cnc.equipment'].sudo().search([])
-            # cnc_list = ["XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-1", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-3",
-            #             "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-4", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-5",
-            #             "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-6", "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-7",
-            #             "XT-GNJC-LSZX-X800-Y550-Z550-T24-A3-8", "XT-GNJC-WZZX-X800-Y550-Z550-T24-A5-2",
-            #             "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-9", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-10",
-            #             "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-11", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-12",
-            #             "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-13", "XT-GNJC-GSZG-X600-Y400-Z350-T21-A3-14"]
-
-            cnc_list_obj = request.env['maintenance.equipment'].sudo().search(
-                [('function_type', '!=', False), ('active', '=', True)])
-            cnc_list = list(map(lambda x: x.code, cnc_list_obj))
-            print('cnc_list: %s' % cnc_list)
-            res['CNCList'] = cnc_list
-
-        except Exception as e:
-            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
-            logging.info('CNCList error:%s' % e)
-        return json.JSONEncoder().encode(res)
-
-    # 返回产线列表
-
-    @http.route('/api/LineList', type='http', auth='public', methods=['GET', 'POST'], csrf=False,
-
-                cors="*")
-    def LineList(self, **kw):
-        """
-        获取产线列表
-        :param kw:
-        :return:
-        """
-
-        try:
-            res = {'Succeed': True}
-            line_list_obj = request.env['sf.production.line'].sudo().search([('name', 'ilike', 'CNC')])
-            line_list = list(map(lambda x: x.name, line_list_obj))
-            print('line_list: %s' % line_list)
-            res['LineList'] = line_list
-
-        except Exception as e:
-            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
-            logging.info('LineList error:%s' % e)
-
-        return json.JSONEncoder().encode(res)
-
-    # 获取产线产量相关
-
-    @http.route('/api/LineProduct', type='http', auth='public', methods=['GET', 'POST'], csrf=False,
-
-                cors="*")
-    def LineProduct(self, **kw):
-        """
-        获取产线产量相关
-        :param kw:
-        :return:
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        logging.info('前端请求产线产量数据的参数为:%s' % kw)
-
-        try:
-            plan_obj = request.env['sf.production.plan'].sudo()
-            line_list = ast.literal_eval(kw['line_list'])
-            print('line_list: %s' % line_list)
-            for line in line_list:
-                plan_data = plan_obj.search([('production_line_id.name', '=', line)])
-                # 工单总量
-                plan_data_total_counts = plan_obj.search_count([('production_line_id.name', '=', line)])
-                # 工单完成量
-                plan_data_finish_counts = plan_obj.search_count(
-                    [('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
-                # 工单计划量
-                plan_data_plan_counts = plan_obj.search_count(
-                    [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
-                # 工单不良累计
-                plan_data_fault_counts = plan_obj.search_count(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['scrap', 'cancel'])])
-
-                # 工单返工数量
-
-                plan_data_rework_counts = plan_obj.search_count(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['rework'])])
-
-                # 工单完成率
-                finishe_rate = round(
-                    (plan_data_finish_counts / plan_data_total_counts if plan_data_total_counts > 0 else 0), 3)
-
-                # 工单进度偏差
-                plan_data_progress_deviation = plan_data_finish_counts - plan_data_plan_counts
-
-                if plan_data:
-                    data = {
-                        'plan_data_total_counts': plan_data_total_counts,
-                        'plan_data_finish_counts': plan_data_finish_counts,
-                        'plan_data_plan_counts': plan_data_plan_counts,
-                        'plan_data_fault_counts': plan_data_fault_counts,
-                        'finishe_rate': finishe_rate,
-                        'plan_data_progress_deviation': plan_data_progress_deviation,
-                        'plan_data_rework_counts': plan_data_rework_counts
-                    }
-                    res['data'][line] = data
-
-            return json.dumps(res)  # 注意使用 json.dumps 而不是直接用 json.JSONEncoder().encode()
-
-        except Exception as e:
-            logging.info('前端请求产线产量数据失败，原因:%s' % e)
-            res['status'] = -1
-            res['message'] = '前端请求产线产量数据失败，原因:%s' % e
-            return json.dumps(res)
-
-    # 日完成量统计
-    @http.route('/api/DailyFinishCount', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def DailyFinishCount(self, **kw):
-        """
-        获取日完成量统计
-        :param kw:
-        :return:
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        plan_obj = request.env['sf.production.plan'].sudo()
-        line_list = ast.literal_eval(kw['line_list'])
-        begin_time_str = kw['begin_time'].strip('"')
-        end_time_str = kw['end_time'].strip('"')
-        begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
-        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-        print('line_list: %s' % line_list)
-
-        def get_date_list(start_date, end_date):
-            date_list = []
-            current_date = start_date
-            while current_date <= end_date:
-                date_list.append(current_date)
-                current_date += timedelta(days=1)
-            return date_list
-
-        for line in line_list:
-            date_list = get_date_list(begin_time, end_time)
-            order_counts = []
-
-            date_field_name = 'actual_end_time'  # 替换为你模型中的实际字段名
-
-            for date in date_list:
-                next_day = date + timedelta(days=1)
-                orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                                          (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                                          (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                                          ])
-
-                rework_orders = plan_obj.search(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['rework']),
-                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                     ])
-                not_passed_orders = plan_obj.search(
-                    [('production_line_id.name', '=', line), ('production_id.state', 'in', ['scrap', 'cancel']),
-                     (date_field_name, '>=', date.strftime('%Y-%m-%d 00:00:00')),
-                     (date_field_name, '<', next_day.strftime('%Y-%m-%d 00:00:00'))
-                     ])
-                order_counts.append({
-                    'date': date.strftime('%Y-%m-%d'),
-                    'order_count': len(orders),
-                    'rework_orders': len(rework_orders),
-                    'not_passed_orders': len(not_passed_orders)
-                })
-            # 外面包一层，没什么是包一层不能解决的，包一层就能区分了，类似于包一层div
-            # 外面包一层的好处是，可以把多个数据结构打包在一起，方便前端处理
-
-            # date_list_dict = {line: order_counts}
-
-            res['data'][line] = order_counts
-        return json.dumps(res)
-
-    # 实时产量
-    @http.route('/api/RealTimeProduct', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def RealTimeProduct(self, **kw):
-        """
-        获取实时产量
-        :param kw:
-        :return:
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        plan_obj = request.env['sf.production.plan'].sudo()
-        line_list = ast.literal_eval(kw['line_list'])
-        begin_time_str = kw['begin_time'].strip('"')
-        end_time_str = kw['end_time'].strip('"')
-        begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
-        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-
-        def get_hourly_intervals(start_time, end_time):
-            intervals = []
-            current_time = start_time
-            while current_time < end_time:
-                next_hour = current_time + timedelta(hours=1)
-                intervals.append((current_time, min(next_hour, end_time)))
-                current_time = next_hour
-            return intervals
-
-        # 当班计划量
-        for line in line_list:
-            plan_order_nums = plan_obj.search_count(
-                [('production_line_id.name', '=', line), ('state', 'not in', ['draft']),
-                 ('date_planned_start', '>=', begin_time),
-                 ('date_planned_start', '<', end_time)
-                 ])
-            finish_order_nums = plan_obj.search_count(
-                [('production_line_id.name', '=', line), ('state', 'in', ['finished']),
-                 ('date_planned_start', '>=', begin_time),
-                 ('date_planned_start', '<', end_time)
-                 ])
-            hourly_intervals = get_hourly_intervals(begin_time, end_time)
-            production_counts = []
-
-            for start, end in hourly_intervals:
-                orders = plan_obj.search([
-                    ('actual_end_time', '>=', start.strftime('%Y-%m-%d %H:%M:%S')),
-                    ('actual_end_time', '<', end.strftime('%Y-%m-%d %H:%M:%S')),
-                    ('production_line_id.name', '=', line)
-                ])
-                production_counts.append({
-                    'start_time': start.strftime('%Y-%m-%d %H:%M:%S'),
-                    'end_time': end.strftime('%Y-%m-%d %H:%M:%S'),
-                    'production_count': len(orders)
-                })
-            production_counts_dict = {'production_counts': production_counts,
-                                      'plan_order_nums': plan_order_nums,
-                                      'finish_order_nums': finish_order_nums,
-                                      }
-
-            res['data'][line] = production_counts_dict
-            # res['data'].append({line: production_counts})
-        return json.dumps(res)
-
-    # 工单明细
-    @http.route('/api/OrderDetail', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def OrderDetail(self, **kw):
-        """
-        获取工单明细
-        :param kw:
-        :return:
-        """
-
-        # res = {'status': 1, 'message': '成功', 'not_done_data': [], 'done_data': []}
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        plan_obj = request.env['sf.production.plan'].sudo()
-        line_list = ast.literal_eval(kw['line_list'])
-        begin_time_str = kw['begin_time'].strip('"')
-        end_time_str = kw['end_time'].strip('"')
-        begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
-        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-        print('line_list: %s' % line_list)
-        not_done_data = []
-        done_data = []
-        final_data = {}
-
-        for line in line_list:
-            # 未完成订单
-            not_done_orders = plan_obj.search(
-                [('production_line_id.name', '=', line), ('state', 'not in', ['finished'])])
-            print(not_done_orders)
-            # 完成订单
-            finish_orders = plan_obj.search([('production_line_id.name', '=', line), ('state', 'in', ['finished'])])
-            print(finish_orders)
-
-            # 获取所有未完成订单的ID列表
-            order_ids = [order.id for order in not_done_orders]
-            # 获取所有已完成订单的ID列表
-            finish_order_ids = [order.id for order in finish_orders]
-
-            # 对ID进行排序
-            sorted_order_ids = sorted(order_ids)
-
-            finish_sorted_order_ids = sorted(finish_order_ids)
-
-            # 创建ID与序号的对应关系
-            id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(sorted_order_ids)}
-
-            finish_id_to_sequence = {order_id: index + 1 for index, order_id in enumerate(finish_sorted_order_ids)}
-
-            # # 输出结果或进一步处理
-            # for order_id, sequence in id_to_sequence.items():
-            #     print(f"Order ID: {order_id} - Sequence: {sequence}")
-
-            for order in not_done_orders:
-                blank_name = ''
-                try:
-                    blank_name = order.production_id.move_raw_ids[0].product_id.name
-                except:
-                    continue
-                # blank_name = 'R-S00109-1 [碳素结构钢 Q235-118.0 * 72.0 * 21.0]'
-                # 正则表达式
-                material_pattern = r'\[(.*?)-'  # 从 [ 开始，碰到 - 停止
-                dimensions = blank_name.split('-')[-1].split(']')[0]
-
-                # 匹配材料名称
-                material_match = re.search(material_pattern, blank_name)
-                material = material_match.group(1) if material_match else 'No match found'
-
-                state_dict = {
-                    'draft': '待排程',
-                    'done': '已排程',
-                    'processing': '生产中',
-                    'finished': '已完成'
-                }
-
-                line_dict = {
-                    'sequence': id_to_sequence[order.id],
-                    'workorder_name': order.name,
-                    'blank_name': blank_name,
-                    'material': material,
-                    'dimensions': dimensions,
-                    'order_qty': order.product_qty,
-                    'state': state_dict[order.state],
-
-                }
-                not_done_data.append(line_dict)
-
-            for finish_order in finish_orders:
-                blank_name = ''
-                try:
-                    blank_name = finish_order.production_id.move_raw_ids[0].product_id.name
-                except:
-                    continue
-
-                material_pattern = r'\[(.*?)-'  # 从 [ 开始，碰到 - 停止
-                dimensions = blank_name.split('-')[-1].split(']')[0]
-
-                # 匹配材料名称
-                material_match = re.search(material_pattern, blank_name)
-                material = material_match.group(1) if material_match else 'No match found'
-
-                line_dict = {
-                    'sequence': finish_id_to_sequence[finish_order.id],
-                    'workorder_name': finish_order.name,
-                    'blank_name': blank_name,
-                    'material': material,
-                    'dimensions': dimensions,
-                    'order_qty': finish_order.product_qty,
-                    'finish_time': finish_order.actual_end_time.strftime('%Y-%m-%d %H:%M:%S'),
-
-                }
-                done_data.append(line_dict)
-
-            # 开始包一层
-            res['data'][line] = {'not_done_data': not_done_data, 'done_data': done_data}
-        return json.dumps(res)
-
-    # 查询pg库来获得待机次数
-    @http.route('/api/IdleAlarmCount', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def idle_alarm_count(self, **kw):
-        """
-        查询设备的待机次数
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        logging.info('前端请求机床数据的参数为:%s' % kw)
-
-        # 连接数据库
-        conn = psycopg2.connect(**db_config)
-        cur = conn.cursor()
-        try:
-            # 获取请求的机床数据
-            machine_list = ast.literal_eval(kw['machine_list'])
-            total_alarm_time = 0
-            alarm_count_num = 0
-            for item in machine_list:
-                sql = '''
-                    SELECT COUNT(*) 
-                    FROM (
-                    SELECT DISTINCT ON (idle_start_time) idle_start_time 
-                    FROM device_data 
-                    WHERE device_name = %s AND idle_start_time IS NOT NULL 
-                    ORDER BY idle_start_time, time
-                    ) subquery;
-                '''
-
-                sql2 = '''
-                    SELECT DISTINCT ON (alarm_time) alarm_time, alarm_repair_time
-                    FROM device_data
-                    WHERE device_name = %s AND alarm_time IS NOT NULL
-                    ORDER BY alarm_time, time;
-                    
-                '''
-                # 执行SQL命令
-                cur.execute(sql, (item,))
-                result = cur.fetchall()
-                print('result========', result)
-
-                cur.execute(sql2, (item,))
-                result2 = cur.fetchall()
-                print('result2========', result2)
-                #
-                for row in result:
-                    res['data'][item] = {'idle_count': row[0]}
-                alarm_count = []
-                for row in result2:
-                    alarm_count.append(row[0])
-                    total_alarm_time += abs(float(row[0]))
-                if len(list(set(alarm_count))) == 1:
-                    if list(set(alarm_count))[0] is None:
-                        alarm_count_num = 0
-                    else:
-                        alarm_count_num = 1
-                else:
-                    alarm_count_num = len(list(set(alarm_count)))
-                res['data'][item]['total_alarm_time'] = total_alarm_time / 3600
-                res['data'][item]['alarm_count_num'] = alarm_count_num
-
-            # 返回统计结果
-            return json.dumps(res)
-        except Exception as e:
-            print(f"An error occurred: {e}")
-            return json.dumps(res)
-        finally:
-            cur.close()
-            conn.close()
-
-    # 查询pg库来获得异常情况
-    @http.route('/api/alarm/logs', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def alarm_logs(self, **kw):
-        """
-        查询设备的异常情况
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        logging.info('前端请求机床数据的参数为:%s' % kw)
-
-        # 连接数据库
-        conn = psycopg2.connect(**db_config)
-        cur = conn.cursor()
-        try:
-            # 获取请求的机床数据
-            # machine_list = ast.literal_eval(kw['machine_list'])
-            # idle_times = []
-            # idle_dict = {}
-
-            # for item in machine_list:
-            sql = '''
-                SELECT DISTINCT ON (alarm_time) alarm_time, alarm_message, system_date, system_time, alarm_repair_time
-                FROM device_data
-                WHERE alarm_time IS NOT NULL
-                ORDER BY alarm_time, time;
-
-            '''
-            # 执行SQL命令
-            cur.execute(sql)
-            result = cur.fetchall()
-            print('result', result)
-
-            # 将查询结果转换为字典列表
-            data = []
-            for row in result:
-                record = {
-                    'alarm_time': row[0],
-                    'alarm_message': row[1],
-                    'system_date': row[2],
-                    'system_time': row[3],
-                    'alarm_repair_time': row[4]
-                }
-                data.append(record)
-
-            # 将数据填充到返回结果中
-            res['data'] = data
-
-            # 返回统计结果
-            return json.dumps(res, ensure_ascii=False)
-        except Exception as e:
-            print(f"An error occurred: {e}")
-            return json.dumps(res)
-        finally:
-            cur.close()
-            conn.close()
-
-    # 设备oee
-    @http.route('/api/OEE', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def OEE(self, **kw):
-        """
-        获取产线等oee
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        logging.info('前端请求oee数据的参数为:%s' % kw)
-
-        try:
-            count_oee = 1
-            workcenter_obj = request.env['mrp.workcenter'].sudo()
-            workcenter_list = ast.literal_eval(kw['workcenter_list'])
-            print('workcenter_list: %s' % workcenter_list)
-            for line in workcenter_list:
-                res['data'][line] = workcenter_obj.search([('name', '=', line)]).oee
-                count_oee *= workcenter_obj.search([('name', '=', line)]).oee
-            res['data']['综合oee'] = count_oee / 1000000
-        except Exception as e:
-            print(f"An error occurred: {e}")
-
-        return json.dumps(res)
-
-    # # 查询某段时间的设备oee
-    # @http.route('/api/OEEByTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    # def OEEByTime(self, **kw):
-    #     """
-    #     获取某段时间的oee
-    #     """
-    #     res = {'status': 1, 'message': '成功', 'data': {}}
-    #     logging.info('前端请求获取某段时间的oee的参数为:%s' % kw)
-    #     workcenter_list = ast.literal_eval(kw['workcenter_list'])
-    #     begin_time_str = kw['begin_time'].strip('"')
-    #     end_time_str = kw['end_time'].strip('"')
-    #     begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
-    #     end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-    #     print('workcenter_list: %s' % workcenter_list)
-    #     # 连接数据库
-    #     conn = psycopg2.connect(**db_config)
-    #     cur = conn.cursor()
-    #     # 查询并计算OEE平均值
-    #     oee_data = {}
-    #     for workcenter in workcenter_list:
-    #         cur.execute("""
-    #                    SELECT AVG(oee) as avg_oee
-    #                    FROM oee_data
-    #                    WHERE workcenter_name = %s
-    #                    AND time BETWEEN %s AND %s
-    #                """, (workcenter, begin_time, end_time))
-    #
-    #         result = cur.fetchone()
-    #         avg_oee = result[0] if result else 0.0
-    #         oee_data[workcenter] = avg_oee
-    #
-    #     # 返回数据
-    #     res['data'] = oee_data
-    #     return json.dumps(res)
-
-    @http.route('/api/OEEByTime', type='http', auth='public', methods=['GET', 'POST'], csrf=False, cors="*")
-    def OEEByTime(self, **kw):
-        """
-        获取某段时间的OEE，根据用户指定的时间单位（day或hour）返回对应的平均值。
-        如果不传time_unit，则默认按天返回，并补全没有数据的时间段，填充0值。
-        """
-        res = {'status': 1, 'message': '成功', 'data': {}}
-        logging.info('前端请求获取某段时间的OEE的参数为:%s' % kw)
-
-        # 获取并解析参数
-        workcenter_list = ast.literal_eval(kw['workcenter_list'])
-        begin_time_str = kw['begin_time'].strip('"')
-        end_time_str = kw['end_time'].strip('"')
-        time_unit = kw.get('time_unit', 'day')  # 默认单位为天
-        begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
-        end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
-
-        # 连接数据库
-        conn = psycopg2.connect(**db_config)
-        cur = conn.cursor()
-
-        # 根据时间单位选择不同的时间格式
-        if time_unit == 'hour':
-            time_format = 'YYYY-MM-DD HH24:00:00'
-            time_delta = timedelta(hours=1)
-        else:  # 默认为'day'
-            time_format = 'YYYY-MM-DD'
-            time_delta = timedelta(days=1)
-
-        # 查询并计算OEE平均值
-        oee_data = {}
-        for workcenter in workcenter_list:
-            cur.execute(f"""
-                    SELECT to_char(time, '{time_format}') as time_unit, AVG(oee) as avg_oee
-                    FROM oee_data
-                    WHERE workcenter_name = %s
-                    AND time BETWEEN %s AND %s
-                    GROUP BY time_unit
-                    ORDER BY time_unit
-                """, (workcenter, begin_time, end_time))
-
-            results = cur.fetchall()
-            # 初始化当前产线的OEE数据字典
-            workcenter_oee = {row[0]: row[1] for row in results}
-
-            # 补全缺失的时间段
-            current_time = begin_time
-            if time_unit != 'hour':
-                while current_time <= end_time:
-                    time_key = current_time.strftime('%Y-%m-%d')
-                    if time_key not in workcenter_oee:
-                        workcenter_oee[time_key] = 0
-                    current_time += time_delta
-
-            # 按时间排序
-            oee_data[workcenter] = dict(sorted(workcenter_oee.items()))
-
-        # 关闭数据库连接
-        cur.close()
-        conn.close()
-
-        # 返回数据
-        res['data'] = oee_data
-        return json.dumps(res)

sf_machine_connect/models/__init__.py

@@ -2,4 +2,3 @@ from . import ftp_client
 from . import ftp_operate
 from . import py2opcua
 from . import res_config_setting
-from . import mrp_workorder

sf_machine_connect/models/ftp_client.py

@@ -121,189 +121,130 @@ class Machine_ftp(models.Model):
     """
     _inherit = 'maintenance.equipment'
 
-    # 机床首次上线时间(默认取值2024年08月01日零点)
-
-    def _get_default_online_time(self):
-        return datetime(2024, 1, 1, 0, 0, 0)
-
-    first_online_time = fields.Datetime(string='首次上线时间', default=_get_default_online_time)
-
     # workorder_ids = fields.One2many('mrp.workorder', 'machine_tool_id', string='工单')
 
-    # # 机床配置项目
-    # # ftp相关
-    # ftp_num = fields.Char('ftp账号')
-    # ftp_pwd = fields.Char('ftp密码')
-    # ftp_host = fields.Char('ftp地址')
-    # ftp_port = fields.Integer('ftp端口')
-    # ftp_remote_path = fields.Char('机床ftp路径')
-    # # 补偿值写入相关
-    # x_compensation_node = fields.Char('x补偿值节点')
-    # y_compensation_node = fields.Char('y补偿值节点')
-    # # 数采配置相关
-    # machine_ip = fields.Char('机床IP')
-    # machine_signed = fields.Char('机床刷新间隔')
-    # machine_status = fields.Char('机床在线状态')
-    # machine_cnc_type = fields.Char('机床CNC型号')
-    # machine_axis_count = fields.Char('机床轴总数')
-    # machine_run_status = fields.Char('机床运行状态')
-    # machine_emg_status = fields.Char('机床急停状态')
-    # machine_cut_status = fields.Char('机床当前切削状态')
-    # machine_mode = fields.Char('机床当前操作模式')
-    # machine_spindle_load = fields.Char('机床主轴负载')
-    # machine_x_mach = fields.Char('机床X轴机械坐标')
-    # machine_x_abs_mach = fields.Char('机床X轴当前位置')
-    # machine_x_rel_mach = fields.Char('机床X轴相对工件坐标')
-    # machine_x_dis_mach = fields.Char('机床X轴目标距离')
-    # machine_x_axis_load = fields.Char('机床X轴伺服轴负载')
-    # machine_y_mach = fields.Char('机床Y轴机械坐标')
-    # machine_y_abs_mach = fields.Char('机床Y轴当前位置')
-    # machine_y_rel_mach = fields.Char('机床Y轴相对工件坐标')
-    # machine_y_dis_mach = fields.Char('机床Y轴目标距离')
-    # machine_y_axis_load = fields.Char('机床Y轴伺服轴负载')
-    # machine_z_mach = fields.Char('机床Z轴机械坐标')
-    # machine_z_abs_mach = fields.Char('机床Z轴当前位置')
-    # machine_z_rel_mach = fields.Char('机床Z轴相对工件坐标')
-    # machine_z_dis_mach = fields.Char('机床Z轴目标距离')
-    # machine_z_axis_load = fields.Char('机床Z轴伺服轴负载')
-    # machine_tool_num = fields.Char('机床当前刀位号')
-    # machine_program = fields.Char('机床主程序名称')
-    # machine_current_prg = fields.Char('机床当前执行指令')
-    # machine_prg_seq = fields.Char('机床当前执行语句号')
-    # machine_spindle_speed_set = fields.Char('机床设定主轴速度')
-    # machine_act_spindle_speed = fields.Char('机床实际主轴转速')
-    # machine_feed_speed_set = fields.Char('机床设定进给速度')
-    # machine_act_feed_speed = fields.Char('机床实际进给速度')
-    # machine_spindle_feed = fields.Char('机床主轴倍率')
-    # machine_feed_rate = fields.Char('机床进给倍率')
-    # machine_rapid_feed = fields.Char('机床快速移动倍率')
-    # machine_run_time = fields.Char('机床运行时间')
-    # machine_cut_time = fields.Char('机床切削时间')
-    # machine_keep_alive_time = fields.Char('机床上电时间')
-    # machine_circle_time = fields.Char('机床循环时间')
-    # machine_product_counts = fields.Char('机床加工件数')
-    # machine_system_date = fields.Char('机床系统日期')
-    # machine_system_time = fields.Char('机床系统时间')
-    # machine_alarm_msg = fields.Char('机床系统报警')
+    # 机床配置项目
+    # ftp相关
+    ftp_num = fields.Char('ftp账号')
+    ftp_pwd = fields.Char('ftp密码')
+    ftp_host = fields.Char('ftp地址')
+    ftp_port = fields.Integer('ftp端口')
+    ftp_remote_path = fields.Char('机床ftp路径')
+    # 补偿值写入相关
+    x_compensation_node = fields.Char('x补偿值节点')
+    y_compensation_node = fields.Char('y补偿值节点')
+    # 数采配置相关
+    machine_ip = fields.Char('机床IP')
+    machine_signed = fields.Char('机床刷新间隔')
+    machine_status = fields.Char('机床在线状态')
+    machine_cnc_type = fields.Char('机床CNC型号')
+    machine_axis_count = fields.Char('机床轴总数')
+    machine_run_status = fields.Char('机床运行状态')
+    machine_emg_status = fields.Char('机床急停状态')
+    machine_cut_status = fields.Char('机床当前切削状态')
+    machine_mode = fields.Char('机床当前操作模式')
+    machine_spindle_load = fields.Char('机床主轴负载')
+    machine_x_mach = fields.Char('机床X轴机械坐标')
+    machine_x_abs_mach = fields.Char('机床X轴当前位置')
+    machine_x_rel_mach = fields.Char('机床X轴相对工件坐标')
+    machine_x_dis_mach = fields.Char('机床X轴目标距离')
+    machine_x_axis_load = fields.Char('机床X轴伺服轴负载')
+    machine_y_mach = fields.Char('机床Y轴机械坐标')
+    machine_y_abs_mach = fields.Char('机床Y轴当前位置')
+    machine_y_rel_mach = fields.Char('机床Y轴相对工件坐标')
+    machine_y_dis_mach = fields.Char('机床Y轴目标距离')
+    machine_y_axis_load = fields.Char('机床Y轴伺服轴负载')
+    machine_z_mach = fields.Char('机床Z轴机械坐标')
+    machine_z_abs_mach = fields.Char('机床Z轴当前位置')
+    machine_z_rel_mach = fields.Char('机床Z轴相对工件坐标')
+    machine_z_dis_mach = fields.Char('机床Z轴目标距离')
+    machine_z_axis_load = fields.Char('机床Z轴伺服轴负载')
+    machine_tool_num = fields.Char('机床当前刀位号')
+    machine_program = fields.Char('机床主程序名称')
+    machine_current_prg = fields.Char('机床当前执行指令')
+    machine_prg_seq = fields.Char('机床当前执行语句号')
+    machine_spindle_speed_set = fields.Char('机床设定主轴速度')
+    machine_act_spindle_speed = fields.Char('机床实际主轴转速')
+    machine_feed_speed_set = fields.Char('机床设定进给速度')
+    machine_act_feed_speed = fields.Char('机床实际进给速度')
+    machine_spindle_feed = fields.Char('机床主轴倍率')
+    machine_feed_rate = fields.Char('机床进给倍率')
+    machine_rapid_feed = fields.Char('机床快速移动倍率')
+    machine_run_time = fields.Char('机床运行时间')
+    machine_cut_time = fields.Char('机床切削时间')
+    machine_keep_alive_time = fields.Char('机床上电时间')
+    machine_circle_time = fields.Char('机床循环时间')
+    machine_product_counts = fields.Char('机床加工件数')
+    machine_system_date = fields.Char('机床系统日期')
+    machine_system_time = fields.Char('机床系统时间')
+    machine_alarm_msg = fields.Char('机床系统报警')
 
-    # # 刀位配置
-    # tool_num1 = fields.Char('刀位1')
-    # tool_num2 = fields.Char('刀位2')
-    # tool_num3 = fields.Char('刀位3')
-    # tool_num4 = fields.Char('刀位4')
-    # tool_num5 = fields.Char('刀位5')
-    # tool_num6 = fields.Char('刀位6')
-    # tool_num7 = fields.Char('刀位7')
-    # tool_num8 = fields.Char('刀位8')
-    # tool_num9 = fields.Char('刀位9')
-    # tool_num10 = fields.Char('刀位10')
-    # tool_num11 = fields.Char('刀位11')
-    # tool_num12 = fields.Char('刀位12')
-    # tool_num13 = fields.Char('刀位13')
-    # tool_num14 = fields.Char('刀位14')
-    # tool_num15 = fields.Char('刀位15')
-    # tool_num16 = fields.Char('刀位16')
-    # tool_num17 = fields.Char('刀位17')
-    # tool_num18 = fields.Char('刀位18')
-    # tool_num19 = fields.Char('刀位19')
-    # tool_num20 = fields.Char('刀位20')
-    # tool_num21 = fields.Char('刀位21')
-    # tool_num22 = fields.Char('刀位22')
-    # tool_num23 = fields.Char('刀位23')
-    # tool_num24 = fields.Char('刀位24')
+    # 刀位配置
+    tool_num1 = fields.Char('刀位1')
+    tool_num2 = fields.Char('刀位2')
+    tool_num3 = fields.Char('刀位3')
+    tool_num4 = fields.Char('刀位4')
+    tool_num5 = fields.Char('刀位5')
+    tool_num6 = fields.Char('刀位6')
+    tool_num7 = fields.Char('刀位7')
+    tool_num8 = fields.Char('刀位8')
+    tool_num9 = fields.Char('刀位9')
+    tool_num10 = fields.Char('刀位10')
+    tool_num11 = fields.Char('刀位11')
+    tool_num12 = fields.Char('刀位12')
+    tool_num13 = fields.Char('刀位13')
+    tool_num14 = fields.Char('刀位14')
+    tool_num15 = fields.Char('刀位15')
+    tool_num16 = fields.Char('刀位16')
+    tool_num17 = fields.Char('刀位17')
+    tool_num18 = fields.Char('刀位18')
+    tool_num19 = fields.Char('刀位19')
+    tool_num20 = fields.Char('刀位20')
+    tool_num21 = fields.Char('刀位21')
+    tool_num22 = fields.Char('刀位22')
+    tool_num23 = fields.Char('刀位23')
+    tool_num24 = fields.Char('刀位24')
 
     # 机床采集项目
     timestamp = fields.Datetime('时间戳', readonly=True)
-    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_time = fields.Char('机床累计运行时长', readonly=True)
-    # 机床系统日期
-    system_date = fields.Char('机床系统日期', readonly=True)
-    # 机床系统时间
-    system_time = fields.Char('机床系统时间', readonly=True)
-    cut_time = fields.Char('机床累计切削时间', readonly=True)
-    # cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')], string='机床当前切削状态',
-    #                               readonly=True, default='0')
-    cut_status = fields.Char('机床当前切削状态', readonly=True)
-    # 当前程序名
-    program = fields.Char('机床当前程序', readonly=True)
-    # 当前刀具号
-    tool_num = fields.Integer('机床当前刀具号', readonly=True)
-    # 机床通电开机时间, 机床加工件数, 机床当前操作模式, 开始加工时间, 结束加工时间, 加工程序开始时间, 加工程序结束时间, 待机开始时间,
-    # 待机结束时间, 机床离线开始时间, 机床离线结束时间, 机床急停状态, 机床主程序名称, 程序运行的状态, 机床当前执行指令, 机床当前执行语句号
-    # 机床X轴当前位置, 机床Y轴当前位置, 机床Z轴当前位置
-    machine_power_on_time = fields.Char('机床通电开机时间', readonly=True)
-    product_counts = fields.Char('机床加工件数', readonly=True)
-    mode = fields.Char('机床当前操作模式', readonly=True)
-    start_time = fields.Char('开始加工时间', readonly=True)
-    end_time = fields.Char('结束加工时间', readonly=True)
-    program_start_time = fields.Char('加工程序开始时间', readonly=True)
-    program_end_time = fields.Char('加工程序结束时间', readonly=True)
-    standby_start_time = fields.Char('待机开始时间', readonly=True)
-    standby_end_time = fields.Char('待机结束时间', readonly=True)
-    offline_start_time = fields.Char('机床离线开始时间', readonly=True)
-    offline_end_time = fields.Char('机床离线结束时间', readonly=True)
-    emg_status = fields.Char('机床急停状态', readonly=True)
-    program_name = fields.Char('机床主程序名称', readonly=True)
-    program_status = fields.Char('程序运行状态', readonly=True)
-    current_program = fields.Char('机床当前执行指令', readonly=True)
-    current_program_seq = fields.Char('机床当前执行语句号', readonly=True)
-    x_abs_pos = fields.Char('机床X轴当前位置(mm)', readonly=True)
-    y_abs_pos = fields.Char('机床Y轴当前位置(mm)', readonly=True)
-    z_abs_pos = fields.Char('机床Z轴当前位置(mm)', readonly=True)
+    signed = fields.Integer('刷新间隔', readonly=True)
+    status = fields.Boolean('在线状态', readonly=True)
+    time_on = fields.Char('总在线时长', readonly=True)
+    time_on_now = fields.Char('本次在线时长', readonly=True)
+    tool_num = fields.Integer('当前刀具', readonly=True)
+    program = fields.Char('当前程序', readonly=True)
+    run_status = fields.Selection([('0', '空闲中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')], string='运行状态',
+                                  readonly=True, default='0')
+    run_time = fields.Char('总运行时长', readonly=True)
+    cut_time = fields.Char('总切削时长', readonly=True)
+    cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')], string='切削状态',
+                                  readonly=True, default='0')
+    spindle_speed = fields.Char('主轴转速', readonly=True)
 
-    # 机床设定进给速度, 机床实际进给速度, 机床设定主轴转速, 机床实际主轴转速, 机床主轴负载, 机床X轴伺服轴负载, 机床Y轴伺服轴负载
-    # 机床Z轴伺服轴负载, 机床快速移动倍率, 机床进给倍率, 机床X轴机械坐标, 机床Y轴机械坐标, 机床Z轴机械坐标, 机床X轴相对工件坐标
-    # 机床Y轴相对工件坐标, 机床Z轴相对工件坐标, 机床X轴目标距离, 机床Y轴目标距离, 机床Z轴目标距离
-    feed_speed_set = fields.Char('机床设定进给速度(mm/min)', readonly=True)
-    act_feed_speed = fields.Char('机床实际进给速度(mm/min)', readonly=True)
-    spindle_speed_set = fields.Char('机床设定主轴转速(r/min)', readonly=True)
-    act_spindle_speed = fields.Char('机床实际主轴转速(r/min)', readonly=True)
-    spindle_load = fields.Char('机床主轴负载(%)', readonly=True)
-    x_axis_load = fields.Char('机床X轴伺服轴负载(%)', readonly=True)
-    y_axis_load = fields.Char('机床Y轴伺服轴负载(%)', readonly=True)
-    z_axis_load = fields.Char('机床Z轴伺服轴负载(%)', readonly=True)
-    rapid_feed = fields.Char('机床快速移动倍率(%)', readonly=True)
-    feed_rate = fields.Char('机床进给倍率(%)', readonly=True)
-    x_mach_coord = fields.Char('机床X轴机械坐标(mm)', readonly=True)
-    y_mach_coord = fields.Char('机床Y轴机械坐标(mm)', readonly=True)
-    z_mach_coord = fields.Char('机床Z轴机械坐标(mm)', readonly=True)
-    x_rel_coord = fields.Char('机床X轴相对工件坐标(mm)', readonly=True)
-    y_rel_coord = fields.Char('机床Y轴相对工件坐标(mm)', readonly=True)
-    z_rel_coord = fields.Char('机床Z轴相对工件坐标(mm)', readonly=True)
-    x_dis_coord = fields.Char('机床X轴目标距离(mm)', readonly=True)
-    y_dis_coord = fields.Char('机床Y轴目标距离(mm)', readonly=True)
-    z_dis_coord = fields.Char('机床Z轴目标距离(mm)', readonly=True)
-
-    # 故障报警时间, 故障报警信息, 故障消除时间(复原时间)
-    alarm_time = fields.Char('故障报警时间', readonly=True)
-    alarm_msg = fields.Char('故障报警信息', readonly=True)
-    clear_time = fields.Char('故障消除时间(复原时间)', readonly=True)
-
-    # # 开动率
-    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)
+    tool_num_process_time1 = fields.Char('刀位1', readonly=True, default='0')
+    tool_num_process_time2 = fields.Char('刀位2', readonly=True, default='0')
+    tool_num_process_time3 = fields.Char('刀位3', readonly=True, default='0')
+    tool_num_process_time4 = fields.Char('刀位4', readonly=True, default='0')
+    tool_num_process_time5 = fields.Char('刀位5', readonly=True, default='0')
+    tool_num_process_time6 = fields.Char('刀位6', readonly=True, default='0')
+    tool_num_process_time7 = fields.Char('刀位7', readonly=True, default='0')
+    tool_num_process_time8 = fields.Char('刀位8', readonly=True, default='0')
+    tool_num_process_time9 = fields.Char('刀位9', readonly=True, default='0')
+    tool_num_process_time10 = fields.Char('刀位10', readonly=True, default='0')
+    tool_num_process_time11 = fields.Char('刀位11', readonly=True, default='0')
+    tool_num_process_time12 = fields.Char('刀位12', readonly=True, default='0')
+    tool_num_process_time13 = fields.Char('刀位13', readonly=True, default='0')
+    tool_num_process_time14 = fields.Char('刀位14', readonly=True, default='0')
+    tool_num_process_time15 = fields.Char('刀位15', readonly=True, default='0')
+    tool_num_process_time16 = fields.Char('刀位16', readonly=True, default='0')
+    tool_num_process_time17 = fields.Char('刀位17', readonly=True, default='0')
+    tool_num_process_time18 = fields.Char('刀位18', readonly=True, default='0')
+    tool_num_process_time19 = fields.Char('刀位19', readonly=True, default='0')
+    tool_num_process_time20 = fields.Char('刀位20', readonly=True, default='0')
+    tool_num_process_time21 = fields.Char('刀位21', readonly=True, default='0')
+    tool_num_process_time22 = fields.Char('刀位22', readonly=True, default='0')
+    tool_num_process_time23 = fields.Char('刀位23', readonly=True, default='0')
+    tool_num_process_time24 = fields.Char('刀位24', readonly=True, default='0')
 
 
 class WorkCenterBarcode(models.Model):
@@ -318,59 +259,39 @@ class WorkCenterBarcode(models.Model):
     button_compensation_state = fields.Boolean(string='是否已经补偿', readonly=True)
     button_up_all_state = fields.Boolean(string='是否已经全部下发', readonly=True)
     machine_tool_id = fields.Many2one('sf.machine_tool.type', string='机床')
-    # machine_tool_name = fields.Char(string='机床名称', default='未知机床', compute='_run_info', readonly=True)
-    # machine_tool_type_id = fields.Char(string='机床型号', default='未知型号', compute='_run_info', readonly=True)
-    # machine_tool_status = fields.Boolean(string='在线状态', compute='_run_info', readonly=True)
-    # machine_tool_run_status = fields.Selection([('0', '关机中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')],
-    #                                            string='运行状态', compute='_run_info', readonly=True, default='0')
-    # machine_tool_timestamp = fields.Datetime('时间戳', compute='_run_info', readonly=True)
-    # machine_tool_time_on = fields.Char('总在线时长', compute='_run_info', readonly=True)
-    # machine_tool_time_on_now = fields.Char('本次在线时长', compute='_run_info', readonly=True)
-    # machine_tool_tool_num = fields.Integer('当前刀具', compute='_run_info', readonly=True)
-    # machine_tool_program = fields.Char('当前程序', compute='_run_info', readonly=True)
-    # machine_tool_machine_ip = fields.Char('机床IP', compute='_run_info', readonly=True)
-    # machine_tool_cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')],
-    #                                            string='切削状态', compute='_run_info', readonly=True, default='0')
-    # machine_tool_compensation_value_x = fields.Char('x补偿值', compute='_run_info', readonly=True)
-    # machine_tool_compensation_value_y = fields.Char('y补偿值', compute='_run_info', readonly=True)
-
-    machine_tool_name = fields.Char(string='机床名称', default='未知机床', readonly=True)
-    machine_tool_type_id = fields.Char(string='机床型号', default='未知型号', readonly=True)
-    machine_tool_status = fields.Boolean(string='在线状态', readonly=True)
+    machine_tool_name = fields.Char(string='机床名称', default='未知机床', compute='_run_info', readonly=True)
+    machine_tool_type_id = fields.Char(string='机床型号', default='未知型号', compute='_run_info', readonly=True)
+    machine_tool_status = fields.Boolean(string='在线状态', compute='_run_info', readonly=True)
     machine_tool_run_status = fields.Selection([('0', '关机中'), ('1', '加工中'), ('2', '加工中'), ('3', '加工中')],
-                                               string='运行状态', readonly=True, default='0')
-    machine_tool_timestamp = fields.Datetime('时间戳', readonly=True)
-    machine_tool_time_on = fields.Char('总在线时长', readonly=True)
-    machine_tool_time_on_now = fields.Char('本次在线时长', readonly=True)
-    machine_tool_tool_num = fields.Integer('当前刀具', readonly=True)
-    machine_tool_program = fields.Char('当前程序', readonly=True)
-    machine_tool_machine_ip = fields.Char('机床IP', readonly=True)
+                                               string='运行状态', compute='_run_info', readonly=True, default='0')
+    machine_tool_timestamp = fields.Datetime('时间戳', compute='_run_info', readonly=True)
+    machine_tool_time_on = fields.Char('总在线时长', compute='_run_info', readonly=True)
+    machine_tool_time_on_now = fields.Char('本次在线时长', compute='_run_info', readonly=True)
+    machine_tool_tool_num = fields.Integer('当前刀具', compute='_run_info', readonly=True)
+    machine_tool_program = fields.Char('当前程序', compute='_run_info', readonly=True)
+    machine_tool_machine_ip = fields.Char('机床IP', compute='_run_info', readonly=True)
     machine_tool_cut_status = fields.Selection([('0', '未切削'), ('1', '切削中'), ('2', '切削中'), ('3', '切削中')],
-                                               string='切削状态', readonly=True, default='0')
-    machine_tool_compensation_value_x = fields.Char('x补偿值', readonly=True)
-    machine_tool_compensation_value_y = fields.Char('y补偿值', readonly=True)
-
-    # 工单状态
-
+                                               string='切削状态', compute='_run_info', readonly=True, default='0')
+    machine_tool_compensation_value_x = fields.Char('x补偿值', compute='_run_info', readonly=True)
+    machine_tool_compensation_value_y = fields.Char('y补偿值', compute='_run_info', readonly=True)
     delivery_records = fields.One2many('delivery.record', 'workorder_id', string="下发记录")
 
     @api.depends('equipment_id.timestamp')
     def _run_info(self):
         # self.machine_tool_name = '1号机床'
-        # self.machine_tool_name = self.equipment_id.name
-        # self.machine_tool_type_id = self.equipment_id.type_id.name
-        # self.machine_tool_status = self.equipment_id.status
-        # self.machine_tool_run_status = self.equipment_id.run_status
-        # self.machine_tool_timestamp = self.equipment_id.timestamp
-        # self.machine_tool_time_on = self.equipment_id.time_on
-        # self.machine_tool_time_on_now = self.equipment_id.time_on_now
-        # self.machine_tool_tool_num = self.equipment_id.tool_num
-        # self.machine_tool_program = self.equipment_id.program
-        # self.machine_tool_machine_ip = self.equipment_id.machine_ip
-        # self.machine_tool_cut_status = self.equipment_id.cut_status
-        # self.machine_tool_compensation_value_x = self.compensation_value_x
-        # self.machine_tool_compensation_value_y = self.compensation_value_y
-        pass
+        self.machine_tool_name = self.equipment_id.name
+        self.machine_tool_type_id = self.equipment_id.type_id.name
+        self.machine_tool_status = self.equipment_id.status
+        self.machine_tool_run_status = self.equipment_id.run_status
+        self.machine_tool_timestamp = self.equipment_id.timestamp
+        self.machine_tool_time_on = self.equipment_id.time_on
+        self.machine_tool_time_on_now = self.equipment_id.time_on_now
+        self.machine_tool_tool_num = self.equipment_id.tool_num
+        self.machine_tool_program = self.equipment_id.program
+        self.machine_tool_machine_ip = self.equipment_id.machine_ip
+        self.machine_tool_cut_status = self.equipment_id.cut_status
+        self.machine_tool_compensation_value_x = self.compensation_value_x
+        self.machine_tool_compensation_value_y = self.compensation_value_y
 
     def compensation(self):
 

sf_machine_connect/models/mrp_workorder.py

@@ -1,38 +0,0 @@
-import re
-
-from odoo import fields, models, api
-
-
-class ResMrpWorkOrder(models.Model):
-    _inherit = 'mrp.workorder'
-
-    mixed_search_field = fields.Char(string='坯料产品名称/RFID')
-
-    @api.model
-    def web_read_group(self, domain, fields, groupby, limit=None, offset=0, orderby=False,
-                       lazy=True, expand=False, expand_limit=None, expand_orderby=False):
-        domain = domain or []
-        for index, item in enumerate(domain):
-            if isinstance(item, list):
-                if item[0] == 'mixed_search_field':
-                    if self._is_rfid_code(item[2]):
-                        domain[index] = ['rfid_code', item[1], item[2]]
-                    else:
-                        domain[index] = ['product_tmpl_name', item[1], item[2]]
-
-        return super(ResMrpWorkOrder, self).web_read_group(domain, fields, groupby, limit=limit, offset=offset, orderby=orderby,
-                       lazy=lazy, expand=expand, expand_limit=expand_limit, expand_orderby=expand_orderby)
-
-    def _is_rfid_code(self, tag):
-        """
-        判断是否是rfid_code
-        """
-        # 基于长度判断（假设RFID标签长度为10到16个字符）
-        if not 10 <= len(tag) <= 16:
-            return False
-
-        # 基于字符集判断（仅包含数字和字母）
-        if not re.match("^[0-9]*$", tag):
-            return False
-
-        return True

sf_machine_connect/models/res_config_setting.py

@@ -8,14 +8,11 @@ _logger = logging.getLogger(__name__)
 class ResBFMConfigSettings(models.TransientModel):
     _inherit = 'res.config.settings'
 
-    # bfm_url = fields.Selection(
-    #     [("https://bfm.cs.jikimo.com", "开发环境(https://bfm.cs.jikimo.com)"),
-    #      ("https://bfm.t.jikimo.com", "测试环境(https://bfm.t.jikimo.com)"),
-    #      ("https://bfm.r.jikimo.com", "预发布环境(https://bfm.r.jikimo.com)"),
-    #      # ("正式环境", "https://bfm.jikimo.com")], string='bfm环境', store=True)
-    #      ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
-
-    bfm_url_new = fields.Char('业务平台环境路径', placeholder='请输入当前对应的业务平台环境路径')
+    bfm_url = fields.Selection(
+        [("https://bfm.cs.jikimo.com", "开发环境(https://bfm.cs.jikimo.com)"),
+         ("https://bfm.t.jikimo.com", "测试环境(https://bfm.t.jikimo.com)"),
+         # ("正式环境", "https://bfm.jikimo.com")], string='bfm环境', store=True)
+         ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
 
     @api.model
     def get_values(self):
@@ -25,14 +22,14 @@ 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='')
+        bfm_url = config.get_param('bfm_url', default='')
 
         values.update(
-            bfm_url_new=bfm_url_new,
+            bfm_url=bfm_url,
         )
         return values
 
     def set_values(self):
         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("bfm_url", self.bfm_url or "")

sf_machine_connect/views/WorkCenterBarcodes.xml

@@ -25,11 +25,6 @@
                 <filter string="人工编程" name="manual_quotation" domain="[('manual_quotation', '=', True)]"/>
                 <filter string="自动编程" name="no_manual_quotation" domain="[('manual_quotation', '=', False)]"/>
             </xpath>
-            <xpath expr="//field[@name='production_id']" position="before">
-                <field name="mixed_search_field"/>
-                <field name="product_tmpl_name"/>
-                <field name="rfid_code"/>
-            </xpath>
         </field>
     </record>
 </odoo>

sf_machine_connect/views/compensation.xml

@@ -5,46 +5,39 @@
         <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="//header" position="inside">&ndash;&gt;-->
-<!--               <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",-->
-<!--                                   ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>-->
-<!--           </xpath>-->
-            <xpath expr="//page//field[@name='cnc_ids']" position="before">
-                <group>
-                    <group>
-                        <field name="compensation_value_x"/>
-                        <field name="compensation_value_y"/>
-                    </group>
-                    <div>
-                        <div>
-<!--                            <field name="button_compensation_state" attrs='{"invisible": ["|",-->
-<!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            <!--                                <span>&#32;</span>-->
-<!--                            <button name="button_send_program_again" type="object" string="重新下发NC程序"-->
-<!--                                    class="btn-primary"-->
-<!--                                    confirm="是否确认重新下发NC程序？"-->
-<!--                                    groups="sf_base.group_sf_order_user,sf_base.group_sf_equipment_user"-->
-<!--                                    attrs="{'invisible': ['|', '|', '|',('routing_type','!=','装夹预调'),('state','in',['done', 'cancel',-->
-<!--                                                                                                   'progress']),('processing_drawing','=',False),('is_send_program_again','=',True)]}"/>-->
-                            <!--                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"-->
-                            <!--                                    class="btn-primary" attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            <!--                                <span>&#32;</span>-->
-                            <!--                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"-->
-                            <!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            <!--                                <span>&#32;</span>-->
-                            <!--                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"-->
-                            <!--                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                            <!--                                <span>&#32;</span>-->
-                            <!--                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"-->
-                            <!--                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",-->
-                            <!--                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>-->
-                        </div>
-                    </div>
-                </group>
+            <xpath expr="//header" position="inside">
+                <button string="程序下载" name="cnc_file_download" type="object" class="oe_highlight" attrs='{"invisible": ["|",
+                                    ("user_permissions","=",False),("routing_type","!=","CNC加工")]}'/>
             </xpath>
+                <xpath expr="//page//field[@name='cnc_ids']" position="before">
+                    <group>
+                        <group>
+                            <field name="compensation_value_x"/>
+                            <field name="compensation_value_y"/>
+                        </group>
+                        <div>
+                            <div>
+                                <field name="button_compensation_state" attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <button string="一键补偿" name="compensation" type="object" confirm="是否确认下发补偿"
+                                    class="btn-primary" attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <span>&#32;</span>
+                                <button string="一键下发" name="up_all" type="object" style="text-align: right;" confirm="是否确认一键下发"
+                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <span>&#32;</span>
+                                <button string="合并下发" id="action_up_select" name="%(sf_machine_connect.action_up_select)d"
+                                type="action" class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                                <span>&#32;</span>
+                                <button string="一键合并下发" name="up_merge_all" type="object" style="text-align: right;" confirm="是否确认一键合并下发"
+                                    class="btn-primary" context="{'default_workorder_id': id}"  attrs='{"invisible": ["|",
+                                    ("state","!=","progress"),("user_permissions","=",False)]}'/>
+                            </div>
+                        </div>
+                    </group>
+                </xpath>
 
         </field>
     </record>

sf_machine_connect/views/default_delivery.xml

@@ -9,9 +9,9 @@
             <tree>
                 <field name="sequence_number"/>
                 <field name="program_name"/>
+                <field name="cnc_id" string="文件"/>
                 <field name="functional_tool_type_id"/>
                 <field name="cutting_tool_name"/>
-                <field name="tool_state"/>
                 <field name="cutting_tool_no"/>
                 <field name="processing_type"/>
                 <field name="margin_x_y"/>

sf_machine_connect/views/ftp_button.xml

@@ -19,7 +19,7 @@
 <!-- 							attrs='{"invisible": ["|",("state","!=","progress"), -->
 <!-- 							("user_permissions","!=",True)]}'/>					 -->
 <!-- 							<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序" context="{'default_cnc_ids': cnc_ids}"/> -->
-<!--    					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->
+    					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"
     					context="{'default_sf_cnc_processing_id': id}" attrs='{"invisible": ["|",("state","!=","progress"),
 							("user_permissions","!=",True)]}'/>
 <!--					<button string="下发" name="up" type="object" class="btn-primary" confirm="是否确认下发此程序"-->

sf_machine_connect/views/machine_monitor.xml

@@ -13,139 +13,294 @@
                 <page string="机床运行状态" attrs="{'invisible': [('equipment_type', '!=', '机床')]}">
                     <group string='状态监控'>
                         <group>
-<!--                             <field name="timestamp"/> -->
+                            <field name="timestamp"/>
+                            <field name="signed"/>
                             <field name="status"/>
-                            <field name="run_status"/>
-                            <field name="run_time"/>
-                            <field name="system_date"/>
-                            <field name="first_online_time"/>
+                            <field name="time_on"/>
+                            <field name="time_on_now"/>
                         </group>
                         <group>
+                            <field name="run_status"/>
+                            <field name="run_time"/>
                             <field name="cut_status"/>
-                            <field name="cut_time"/>
                             <!-- <field name="cut_time"/> -->
                             <field name="program"/>
                             <field name="tool_num"/>
+                            <field name="spindle_speed"/>
                         </group>
                     </group>
+<!--                     <group string='刀位统计'> -->
+<!--                         <group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num_process_time1"/> -->
+<!--                                 <field name="tool_num_process_time5"/> -->
+<!--                                 <field name="tool_num_process_time9"/> -->
+<!--                                 <field name="tool_num_process_time13"/> -->
+<!--                                 <field name="tool_num_process_time17"/> -->
+<!--                                 <field name="tool_num_process_time21"/> -->
+<!--                             </group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num_process_time2"/> -->
+<!--                                 <field name="tool_num_process_time6"/> -->
+<!--                                 <field name="tool_num_process_time10"/> -->
+<!--                                 <field name="tool_num_process_time14"/> -->
+<!--                                 <field name="tool_num_process_time18"/> -->
+<!--                                 <field name="tool_num_process_time22"/> -->
+<!--                             </group> -->
+<!--                         </group> -->
+<!--                         <group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num_process_time3"/> -->
+<!--                                 <field name="tool_num_process_time7"/> -->
+<!--                                 <field name="tool_num_process_time11"/> -->
+<!--                                 <field name="tool_num_process_time15"/> -->
+<!--                                 <field name="tool_num_process_time19"/> -->
+<!--                                 <field name="tool_num_process_time23"/> -->
+<!--                             </group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num_process_time4"/> -->
+<!--                                 <field name="tool_num_process_time8"/> -->
+<!--                                 <field name="tool_num_process_time12"/> -->
+<!--                                 <field name="tool_num_process_time16"/> -->
+<!--                                 <field name="tool_num_process_time20"/> -->
+<!--                                 <field name="tool_num_process_time24"/> -->
+<!--                             </group> -->
+<!--                         </group> -->
+<!--                     </group> -->
+
+<!--                         <div class="o_address_format"> -->
+<!--                            <label for="tool_num_process_time1" string="刀位1"/> -->
+<!--                            <field name="tool_num_process_time1" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time2" string="刀位2"/> -->
+<!--                            <field name="tool_num_process_time2" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time3" string="刀位3"/> -->
+<!--                            <field name="tool_num_process_time3" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time4" string="刀位4"/> -->
+<!--                            <field name="tool_num_process_time4" class="o_form_label"/> -->
+<!--                            <div></div> -->
+<!--                            <label for="tool_num_process_time5" string="刀位5"/> -->
+<!--                            <field name="tool_num_process_time5" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time6" string="刀位6"/> -->
+<!--                            <field name="tool_num_process_time6" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time7" string="刀位7"/> -->
+<!--                            <field name="tool_num_process_time7" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time8" string="刀位8"/> -->
+<!--                            <field name="tool_num_process_time8" class="o_form_label"/> -->
+<!--                            <div></div> -->
+<!--                            <label for="tool_num_process_time9" string="刀位9"/> -->
+<!--                            <field name="tool_num_process_time9" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time10" string="刀位10"/> -->
+<!--                            <field name="tool_num_process_time10" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time11" string="刀位11"/> -->
+<!--                            <field name="tool_num_process_time11" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time12" string="刀位12"/> -->
+<!--                            <field name="tool_num_process_time12" class="o_form_label"/> -->
+<!--                            <div></div> -->
+<!--                            <label for="tool_num_process_time13" string="刀位13"/> -->
+<!--                            <field name="tool_num_process_time13" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time14" string="刀位14"/> -->
+<!--                            <field name="tool_num_process_time14" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time15" string="刀位15"/> -->
+<!--                            <field name="tool_num_process_time15" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time16" string="刀位16"/> -->
+<!--                            <field name="tool_num_process_time16" class="o_form_label"/> -->
+<!--                            <div></div> -->
+<!--                            <label for="tool_num_process_time17" string="刀位17"/> -->
+<!--                            <field name="tool_num_process_time17" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time18" string="刀位18"/> -->
+<!--                            <field name="tool_num_process_time18" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time19" string="刀位19"/> -->
+<!--                            <field name="tool_num_process_time19" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time20" string="刀位20"/> -->
+<!--                            <field name="tool_num_process_time20" class="o_form_label"/> -->
+<!--                            <div></div> -->
+<!--                            <label for="tool_num_process_time21" string="刀位21"/> -->
+<!--                            <field name="tool_num_process_time21" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time22" string="刀位22"/> -->
+<!--                            <field name="tool_num_process_time22" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time23" string="刀位23"/> -->
+<!--                            <field name="tool_num_process_time23" class="o_form_label"/> -->
+<!--                            <span>&amp;nbsp;</span> -->
+<!--                            <label for="tool_num_process_time24" string="刀位24"/> -->
+<!--                            <field name="tool_num_process_time24" class="o_form_label"/> -->
+<!--                        </div> -->
+<!--                     </group> -->
                 </page>
                 <page string="机床运行数据" attrs="{'invisible': [('equipment_type', '!=', '机床')]}">
-                     <group string="运行数据">
-                        <group>
-                            <field name="machine_power_on_time"/>
-                            <field name="product_counts"/>
-                            <field name="mode"/>
-                            <field name="start_time"/>
-                            <field name="end_time"/>
-                            <field name="program_start_time"/>
-                            <field name="program_end_time"/>
-                            <field name="standby_start_time"/>
-                            <field name="standby_end_time"/>
-                            <field name="offline_start_time"/>
-                            <field name="offline_end_time"/>
-                            <field name="emg_status"/>
-                            <field name="program_name"/>
-                            <field name="program_status"/>
-                            <field name="current_program"/>
-                            <field name="current_program_seq"/>
-                            <field name="x_abs_pos"/>
-                            <field name="y_abs_pos"/>
-                            <field name="z_abs_pos"/>
+<!--                    <group string="机床配置">--> -->
+                        <group string="ftp相关">
+                            <group>
+                                <field name="ftp_num"/>
+                                <field name="ftp_pwd"/>
+                                <field name="ftp_host"/>
+                            </group>
+                            <group>
+                                <field name="ftp_port"/>
+                                <field name="ftp_remote_path"/>
+                            </group>
                         </group>
-                        <group>
-                            <field name="feed_speed_set"/>
-                            <field name="act_feed_speed"/>
-                            <field name="spindle_speed_set"/>
-                            <field name="act_spindle_speed"/>
-                            <field name="spindle_load"/>
-                            <field name="x_axis_load"/>
-                            <field name="y_axis_load"/>
-                            <field name="z_axis_load"/>
-                            <field name="rapid_feed"/>
-                            <field name="feed_rate"/>
-                            <field name="x_mach_coord"/>
-                            <field name="y_mach_coord"/>
-                            <field name="z_mach_coord"/>
-                            <field name="x_rel_coord"/>
-                            <field name="y_rel_coord"/>
-                            <field name="z_rel_coord"/>
-                            <field name="x_dis_coord"/>
-                            <field name="y_dis_coord"/>
-                            <field name="z_dis_coord"/>
+                        <group string="补偿值相关">
+                            <group>
+                            <field name="x_compensation_node"/>
+                            </group>
+                            <group>
+                            <field name="y_compensation_node"/>
+                            </group>
+                        </group>
+                        <group string="数采相关">
+                            <group>
+                                <field name="machine_ip"/>
+                                <field name="machine_signed"/>
+                                <field name="machine_status"/>
+                                <field name="machine_cnc_type"/>
+                                <field name="machine_axis_count"/>
+                                <field name="machine_run_status"/>
+                                <field name="machine_emg_status"/>
+                                <field name="machine_cut_status"/>
+                                <field name="machine_mode"/>
+                                <field name="machine_spindle_load"/>
+                                <field name="machine_x_mach"/>
+                                <field name="machine_x_abs_mach"/>
+                                <field name="machine_x_rel_mach"/>
+                                <field name="machine_x_dis_mach"/>
+                                <field name="machine_x_axis_load"/>
+                                <field name="machine_y_mach"/>
+                                <field name="machine_y_abs_mach"/>
+                                <field name="machine_y_rel_mach"/>
+                                <field name="machine_y_dis_mach"/>
+                                <field name="machine_y_axis_load"/>
+                                <field name="machine_z_mach"/>
+                                <field name="machine_z_abs_mach"/>
+                            </group>
+                            <group>
+                                <field name="machine_z_rel_mach"/>
+                                <field name="machine_z_dis_mach"/>
+                                <field name="machine_z_axis_load"/>
+                                <field name="machine_tool_num"/>
+                                <field name="machine_program"/>
+                                <field name="machine_current_prg"/>
+                                <field name="machine_prg_seq"/>
+                                <field name="machine_spindle_speed_set"/>
+                                <field name="machine_act_spindle_speed"/>
+                                <field name="machine_feed_speed_set"/>
+                                <field name="machine_act_feed_speed"/>
+                                <field name="machine_spindle_feed"/>
+                                <field name="machine_feed_rate"/>
+                                <field name="machine_rapid_feed"/>
+                                <field name="machine_run_time"/>
+                                <field name="machine_cut_time"/>
+                                <field name="machine_keep_alive_time"/>
+                                <field name="machine_circle_time"/>
+                                <field name="machine_product_counts"/>
+                                <field name="machine_system_date"/>
+                                <field name="machine_system_time"/>
+                                <field name="machine_alarm_msg"/>
+                            </group>
                         </group>
-                    </group>
-<!--                     <group string="ftp相关"> -->
-<!--                         <group> -->
-<!--                             <field name="ftp_num"/> -->
-<!--                             <field name="ftp_pwd"/> -->
-<!--                             <field name="ftp_host"/> -->
 <!--                         </group> -->
-<!--                         <group> -->
-<!--                             <field name="ftp_port"/> -->
-<!--                             <field name="ftp_remote_path"/> -->
-<!--                         </group> -->
-<!--                     </group> -->
-<!--                     <group string="补偿值相关"> -->
-<!--                         <group> -->
-<!--                         <field name="x_compensation_node"/> -->
-<!--                         </group> -->
-<!--                         <group> -->
-<!--                         <field name="y_compensation_node"/> -->
-<!--                         </group> -->
-<!--                     </group> -->
-<!--                     <group string="数采相关"> -->
-<!--                         <group> -->
-<!--                             <field name="machine_ip"/> -->
-<!--                             <field name="machine_signed"/> -->
-<!--                             <field name="machine_status"/> -->
-<!--                             <field name="machine_cnc_type"/> -->
-<!--                             <field name="machine_axis_count"/> -->
-<!--                             <field name="machine_run_status"/> -->
-<!--                             <field name="machine_emg_status"/> -->
-<!--                             <field name="machine_cut_status"/> -->
-<!--                             <field name="machine_mode"/> -->
-<!--                             <field name="machine_spindle_load"/> -->
-<!--                             <field name="machine_x_mach"/> -->
-<!--                             <field name="machine_x_abs_mach"/> -->
-<!--                             <field name="machine_x_rel_mach"/> -->
-<!--                             <field name="machine_x_dis_mach"/> -->
-<!--                             <field name="machine_x_axis_load"/> -->
-<!--                             <field name="machine_y_mach"/> -->
-<!--                             <field name="machine_y_abs_mach"/> -->
-<!--                             <field name="machine_y_rel_mach"/> -->
-<!--                             <field name="machine_y_dis_mach"/> -->
-<!--                             <field name="machine_y_axis_load"/> -->
-<!--                             <field name="machine_z_mach"/> -->
-<!--                             <field name="machine_z_abs_mach"/> -->
-<!--                         </group> -->
-<!--                         <group> -->
-<!--                             <field name="machine_z_rel_mach"/> -->
-<!--                             <field name="machine_z_dis_mach"/> -->
-<!--                             <field name="machine_z_axis_load"/> -->
-<!--                             <field name="machine_tool_num"/> -->
-<!--                             <field name="machine_program"/> -->
-<!--                             <field name="machine_current_prg"/> -->
-<!--                             <field name="machine_prg_seq"/> -->
-<!--                             <field name="machine_spindle_speed_set"/> -->
-<!--                             <field name="machine_act_spindle_speed"/> -->
-<!--                             <field name="machine_feed_speed_set"/> -->
-<!--                             <field name="machine_act_feed_speed"/> -->
-<!--                             <field name="machine_spindle_feed"/> -->
-<!--                             <field name="machine_feed_rate"/> -->
-<!--                             <field name="machine_rapid_feed"/> -->
-<!--                             <field name="machine_run_time"/> -->
-<!--                             <field name="machine_cut_time"/> -->
-<!--                             <field name="machine_keep_alive_time"/> -->
-<!--                             <field name="machine_circle_time"/> -->
-<!--                             <field name="machine_product_counts"/> -->
-<!--                             <field name="machine_system_date"/> -->
-<!--                             <field name="machine_system_time"/> -->
-<!--                             <field name="machine_alarm_msg"/> -->
-<!--                         </group> -->
-<!--                     </group> -->
                 </page>
+<!--                 <page string="刀位配置"> -->
+<!--                     <group string="刀位配置"> -->
+<!--                         <group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num1"/> -->
+<!--                                 <field name="tool_num5"/> -->
+<!--                                 <field name="tool_num9"/> -->
+<!--                                 <field name="tool_num13"/> -->
+<!--                                 <field name="tool_num17"/> -->
+<!--                                 <field name="tool_num21"/> -->
+<!--                             </group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num2"/> -->
+<!--                                 <field name="tool_num6"/> -->
+<!--                                 <field name="tool_num10"/> -->
+<!--                                 <field name="tool_num14"/> -->
+<!--                                 <field name="tool_num18"/> -->
+<!--                                 <field name="tool_num22"/> -->
+<!--                             </group> -->
+<!--                         </group> -->
+<!--                         <group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num3"/> -->
+<!--                                 <field name="tool_num7"/> -->
+<!--                                 <field name="tool_num11"/> -->
+<!--                                 <field name="tool_num15"/> -->
+<!--                                 <field name="tool_num19"/> -->
+<!--                                 <field name="tool_num23"/> -->
+<!--                             </group> -->
+<!--                             <group> -->
+<!--                                 <field name="tool_num4"/> -->
+<!--                                 <field name="tool_num8"/> -->
+<!--                                 <field name="tool_num12"/> -->
+<!--                                 <field name="tool_num16"/> -->
+<!--                                 <field name="tool_num20"/> -->
+<!--                                 <field name="tool_num24"/> -->
+<!--                             </group> -->
+<!--                         </group> -->
+<!--                     </group> -->
+<!--                 </page> -->
+<!--                 </notebook> -->
             </xpath>
         </field>
     </record>
 
+<!--     刀具寿命 -->
+<!--     <record id="view_cutting_tool_inherited" model="ir.ui.view"> -->
+<!--         <field name="name">sf_cutting_tool_extension</field> -->
+<!--         <field name="model">sf.cutting_tool.type</field> -->
+<!--         <field name="inherit_id" ref="sf_base.form_sf_machine_tool_type"/> -->
+<!--         <field name="arch" type="xml"> -->
+<!--             <xpath expr="//form//group" position="after"> -->
+<!--                 <group string='刀具寿命'> -->
+<!--                     <group> -->
+<!--                         <field name="total_cut_time"/> -->
+<!--                         <field name="tool_position"/> -->
+
+<!--                     </group> -->
+<!--                     <group> -->
+<!--                         <field name="predict_life_time"/> -->
+
+<!--                     </group> -->
+
+<!--                     <div> -->
+
+<!--                         <div> -->
+<!--                             <field name='is_connect_tool_position' invisible='1'/> -->
+<!--                             <button string="绑定刀位" name="tool_connect_machine" type="object" confirm="是否确认绑定此刀位" -->
+<!--                                     class="btn-primary"/> -->
+<!--                                      attrs='{"invisible": [("is_connect_tool_position","!=", -->
+<!--                                     "False")]}' -->
+<!--                             <span>&#32;</span> -->
+<!--                             <button string="解绑刀位" name="tool_unconnect_machine" type="object" confirm="是否解绑此刀位" -->
+<!--                                     class="btn-primary"/> -->
+<!--                                       attrs='{"invisible": [("is_connect_tool_position","!=", -->
+<!--                                     "False")]}' -->
+
+<!--                         </div> -->
+
+
+
+
+<!--                     </div> -->
+<!--                 </group> -->
+<!--             </xpath> -->
+<!--         </field> -->
+<!--     </record> -->
 </odoo>

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

@@ -14,8 +14,8 @@
                                 <div class="o_setting_left_pane"/>
                                     <div class="o_setting_right_pane">
                                         <div class="text-muted">
-                                            <label for="bfm_url_new" />
-                                            <field name="bfm_url_new" string="业务平台访问地址"/>
+                                            <label for="bfm_url" />
+                                            <field name="bfm_url" string="访问地址"/>
                                         </div>
                                     </div>
 <!--                                 </div> -->

sf_machine_connect/wizard/up_select.xml

@@ -14,7 +14,7 @@
 <!--                          <field name="program_ids" domain="[('workorder_id', '=', workorder_id)]"/>-->
                      </group>
                      <footer>
-<!--                         <button string="合并下发" name="confirm_up" type="object" class="btn-primary" confirm="是否确认合并下发"/>-->
+                         <button string="合并下发" name="confirm_up" type="object" class="btn-primary" confirm="是否确认合并下发"/>
                          <button string="取消" class="btn-secondary" special="cancel"/>
                      </footer>
                  </form>

sf_maintenance/models/sf_maintenance_logs.py

@@ -10,21 +10,21 @@ class SfMaintenanceLogs(models.Model):
     name = fields.Char(string='名称')
     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='机台号')
+    maintenance_equipment_id = fields.Many2one('maintenance.equipment', string='设备')
     maintenance_equipment_oee_id = fields.Many2one('maintenance.equipment.oee', string='设备oee')
     code_location = fields.Char(string='编码位置')
     fault_type = fields.Selection(
         [('电气类', '电气类'), ('机械类', '机械类'), ('程序类', '程序类'), ('系统类', '系统类')], string='故障类型')
     fault_code = fields.Char(string='故障代码')
-    fault_alarm_info = fields.Text(string='故障报警信息')
+    fault_alarm_info = fields.Char(string='故障报警信息')
     alarm_level = fields.Selection([('一级', '一级(严重)'), ('二级', '二级(中等)'), ('三级', '三级(轻微)')],
                                    string='报警级别')
-    alarm_time = fields.Datetime(string='故障报警时间')
+    alarm_time = fields.Datetime(string='报警时间')
     alarm_way = fields.Selection([('文本提示报警', '文本提示报警'), ('声光报警', '声光报警'), ('图文报警', '图文报警')],
                                  string='报警方式')
     fault_process = fields.Text(string='故障处理方法')
     operator = fields.Many2one('res.users', string='处理人')
-    recovery_time = fields.Datetime(string='故障消除时间')
+    recovery_time = fields.Datetime(string='复原时间')
     fault_duration = fields.Float(string='故障时长')
     note = fields.Text(string='备注')
     active = fields.Boolean('Active', default=True)

sf_maintenance/models/sf_maintenance_oee.py

@@ -7,23 +7,20 @@ class SfMaintenanceEquipmentOEE(models.Model):
     _description = '设备OEE'
 
     name = fields.Char('设备oee')
-    equipment_id = fields.Many2one('maintenance.equipment', '机台号',
+    equipment_id = fields.Many2one('maintenance.equipment', '设备',
                                    domain="[('category_id.equipment_type', '=', '机床'),('state_zc', '=', '已注册')]")
     type_id = fields.Many2one('sf.machine_tool.type', '型号', related='equipment_id.type_id')
-    machine_tool_picture = fields.Binary('设备图片', related='equipment_id.machine_tool_picture')
+    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('故障时长')
+    run_time = fields.Float('正常运行总时长(h)')
+    equipment_time = fields.Float('总时长(h)')
+    done_nums = fields.Integer('累计加工总件数')
+    utilization_rate = fields.Char('开动率')
+    fault_time = fields.Float('故障停机总时长(h)')
     fault_nums = fields.Integer('故障次数')
-    # 故障率
-    fault_rate = fields.Char('故障率')
-    # 设备故障日志
     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='运行日志')
@@ -41,58 +38,12 @@ class SfMaintenanceEquipmentOEELog(models.Model):
     _name = 'maintenance.equipment.oee.logs'
     _description = '设备运行日志'
 
-    equipment_id = fields.Many2one('maintenance.equipment', '机台号', readonly='True')
-    equipment_code = fields.Char('设备编码', readonly='True')
-    name = fields.Char('设备名称', readonly='True')
-    function_type = fields.Selection(
-        [("ZXJGZX", "钻铣加工中心"), ("CXJGZX", "车削加工中心"), ("FHJGZX", "复合加工中心")],
-        default="", string="功能类型")
-    machine_tool_picture = fields.Binary('设备图片')
-    type_id = fields.Many2one('sf.machine_tool.type', '品牌型号', reaonly='True')
-    state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
-                              ("检修", "检修"), ("保养", "保养")], default="", string="实时状态")
-    online_time = fields.Char('开机时长', reaonly='True')
-
-    offline_time = fields.Char('关机时长', reaonly='True')
-    offline_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')
-
-    detail_ids = fields.One2many('maintenance.equipment.oee.log.detail', 'log_id', string='日志详情')
-
-    # maintenance_time = fields.Char('维保时长')
-    # work_nums = fields.Integer('加工件数')
-    equipment_oee_id = fields.Many2one('maintenance.equipment.oee', '设备OEE')
-
-    @api.onchange('equipment_id')
-    def get_name(self):
-        self.name = self.equipment_id.name
-        self.equipment_code = self.equipment_id.code
-
-
-# 设备运行日志详情
-class SfMaintenanceEquipmentOEELogDetail(models.Model):
-    _name = 'maintenance.equipment.oee.log.detail'
-    _description = '设备运行日志详情'
-    _order = 'time desc'
-
-    # sequence = fields.Integer('序号', related='id')
-    time = fields.Datetime('时间')
-    state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
+    name = fields.Char('运行日志')
+    run_time = fields.Datetime('时间')
+    state = fields.Selection([("开机", "开机"), ("关机", "关机"), ("等待", "等待"), ("开始加工", "开始加工"),
+                              ("结束加工", "结束加工"), ("故障", "故障"),
                               ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态")
-    production_name = fields.Char('加工工单')
-
-    log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志')
-    # equipment_code = fields.Char('设备编码', related='log_id.equipment_code')
-    equipment_code = fields.Char('设备编码', readonly='True')
-
+    workorder_id = fields.Char('加工订单')
+    time = fields.Char('持续时长')
+    color = fields.Char('颜色', default=1)
+    equipment_oee_id = fields.Many2one('maintenance.equipment.oee', '设备OEE')

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

@@ -14,7 +14,6 @@
                     <field name="utilization_rate"/>
                     <field name="fault_time"/>
                     <field name="fault_nums"/>
-                    <field name="fault_rate"/>
                 </tree>
             </field>
         </record>
@@ -50,19 +49,19 @@
                             </group>
 
                         </group>
-<!--                         <notebook> -->
-<!--                         <page string="运行日志"> -->
-<!--                             <field name="oee_logs"> -->
-<!--                                 <tree create="1" edit="1" delete="1" editable="bottom"> -->
-<!--                                     <field name = 'run_time'/> -->
-<!--                                     <field name = 'state'/> -->
-<!--                                     <field name = 'workorder_id'/> -->
-<!--                                     <field name = 'time'/> -->
-<!--                                     <field name = 'color' widget="color"/> -->
-<!--                                 </tree> -->
-<!--                             </field> -->
-<!--                         </page> -->
-<!--                         </notebook> -->
+                        <notebook>
+                        <page string="运行日志">
+                            <field name="oee_logs">
+                                <tree create="1" edit="1" delete="1" editable="bottom">
+                                    <field name = 'run_time'/>
+                                    <field name = 'state'/>
+                                    <field name = 'workorder_id'/>
+                                    <field name = 'time'/>
+                                    <field name = 'color' widget="color"/>
+                                </tree>
+                            </field>
+                        </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>

sf_maintenance/views/maintenance_logs_views.xml

@@ -7,20 +7,22 @@
             <field name="model">sf.maintenance.logs</field>
             <field name="arch" type="xml">
                 <tree>
+                    <field name="code"/>
                     <field name="type" optional="hide"/>
                     <field name="brand"/>
                     <field name="maintenance_equipment_id"/>
                     <field name="code_location" optional="hide"/>
+                    <field name="fault_type"/>
                     <field name="fault_code" optional="hide"/>
-                    <field name="alarm_time"/>
                     <field name="fault_alarm_info"/>
                     <field name="alarm_level" optional="hide"/>
+                    <field name="alarm_time"/>
                     <field name="alarm_way" optional="hide"/>
-                    <field name="fault_process" optional="hide"/>
-                    <field name="operator" optional="hide"/>
+                    <field name="fault_process"/>
+                    <field name="operator"/>
                     <field name="recovery_time"/>
                     <field name="fault_duration"/>
-                    <field name="note" optional="hide"/>
+                    <field name="note"/>
                 </tree>
             </field>
         </record>
@@ -43,32 +45,25 @@
                         <group>
                             <group>
 
-<!--                                 <field name="name"/> -->
-<!--                                 <field name="type" required="1" widget="radio" options="{'horizontal': true}"/> -->
-                                <field name="maintenance_equipment_id"/>
+                                <field name="name"/>
+                                <field name="type" required="1" widget="radio" options="{'horizontal': true}"/>
                                 <field name="brand"/>
-                                <field name="alarm_time"/>
-                                <field name="fault_alarm_info"/>
-
-<!--                                 <field name="code_location"/> -->
-<!--                                 <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/> -->
-<!--                                 <field name="fault_code"/> -->
-
+                                <field name="maintenance_equipment_id"/>
+                                <field name="code_location"/>
+                                <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/>
+                                <field name="fault_code"/>
+                                <field name="fault_process"/>
                             </group>
                             <group>
+                                <field name="fault_alarm_info"/>
+                                <field name="alarm_time"/>
+                                <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/>
                                 <field name="operator"/>
-
-                                <field name="fault_process"/>
-<!--                                 <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/> -->
                                 <field name="recovery_time"/>
                                 <field name="fault_duration"/>
-
+                                <field name="note"/>
 
                             </group>
-
-                        </group>
-                        <group>
-                        <field name="note"/>
                         </group>
                     </sheet>
                 </form>
@@ -105,248 +100,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 -->
 

sf_manufacturing/__manifest__.py

@@ -14,15 +14,10 @@
     'data': [
         'data/stock_data.xml',
         'data/empty_racks_data.xml',
-        'data/panel_data.xml',
-        'data/agv_scheduling_data.xml',
         'security/group_security.xml',
         'security/ir.model.access.csv',
         'wizard/workpiece_delivery_views.xml',
-        'wizard/rework_wizard_views.xml',
-        'wizard/production_wizard_views.xml',
         'views/mrp_views_menus.xml',
-        'views/agv_scheduling_views.xml',
         'views/stock_lot_views.xml',
         'views/mrp_production_addional_change.xml',
         'views/mrp_routing_workcenter_view.xml',
@@ -32,7 +27,7 @@
         'views/model_type_view.xml',
         'views/agv_setting_views.xml',
         'views/sf_maintenance_equipment.xml',
-        'views/res_config_settings_views.xml',
+
     ],
     'assets': {
 
@@ -42,9 +37,7 @@
         'web.assets_backend': [
             'sf_manufacturing/static/src/xml/kanban_change.xml',
             'sf_manufacturing/static/src/js/kanban_change.js',
-            'sf_manufacturing/static/src/scss/kanban_change.scss',
-            'sf_manufacturing/static/src/xml/button_show_on_tree.xml',
-            'sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js',
+            'sf_manufacturing/static/src/scss/kanban_change.scss'
         ]
 
     },

sf_manufacturing/controllers/controllers.py

@@ -2,15 +2,13 @@
 import logging
 import json
 from datetime import datetime
-
-from odoo.addons.sf_manufacturing.models.agv_scheduling import RepeatTaskException
 from odoo import http
 from odoo.http import request
 
 
 class Manufacturing_Connect(http.Controller):
 
-    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/GetWoInfo', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def get_Work_Info(self, **kw):
         """
@@ -27,8 +25,7 @@ class Manufacturing_Connect(http.Controller):
                 {'content': ret, 'name': 'AutoDeviceApi/GetWoInfo'})
             logging.info('RfidCode:%s' % ret['RfidCode'])
             if 'RfidCode' in ret:
-                workorder = request.env['mrp.workorder'].sudo().search(
-                    [('rfid_code', '=', ret['RfidCode']), ('state', '!=', 'rework')])
+                workorder = request.env['mrp.workorder'].sudo().search([('rfid_code', '=', ret['RfidCode'])])
                 if workorder:
                     for item in workorder:
                         res['Datas'].append({
@@ -125,8 +122,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('RfidCode:%s' % ret['RfidCode'])
             if 'RfidCode' in ret:
                 workorder = request.env['mrp.workorder'].sudo().search(
-                    [('routing_type', '=', '装夹预调'), ('rfid_code', '=', ret['RfidCode']), ('state', '!=', 'rework')],
-                    limit=1, order='id asc')
+                    [('routing_type', '=', '装夹预调'), ('rfid_code', '=', ret['RfidCode'])], limit=1, order='id asc')
                 if workorder:
                     for item in workorder:
                         if item.material_center_point:
@@ -147,7 +143,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('get_qcCheck error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/FeedBackStart', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def button_Work_START(self, **kw):
         """
@@ -166,8 +162,7 @@ class Manufacturing_Connect(http.Controller):
             routing_type = ret['CraftId']
             equipment_id = ret["DeviceId"]
             workorder = request.env['mrp.workorder'].sudo().search(
-                [('production_id', '=', production_id), ('routing_type', '=', routing_type),
-                 ('rfid_code', '!=', False), ('state', '!=', 'rework')], limit=1)
+                [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
             if not workorder:
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
                 return json.JSONEncoder().encode(res)
@@ -195,7 +190,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('button_Work_START error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/FeedBackEnd', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/FeedBackEnd', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def button_Work_End(self, **kw):
         """
@@ -208,45 +203,40 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': True, 'Datas': ['工单已结束']}
             datas = request.httprequest.data
             ret = json.loads(datas)
-            logging.info('button_Work_End:%s' % ret)
             request.env['center_control.interface.log'].sudo().create(
                 {'content': ret, 'name': 'AutoDeviceApi/FeedBackEnd'})
             production_id = ret['BillId']
             routing_type = ret['CraftId']
             workorder = request.env['mrp.workorder'].sudo().search(
-                [('production_id', '=', production_id), ('routing_type', '=', routing_type),
-                 ('rfid_code', '!=', False), ('state', '!=', 'rework')], limit=1)
+                [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
             if not workorder:
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单不存在'}
                 return json.JSONEncoder().encode(res)
             if workorder.state != 'progress':
                 res = {'Succeed': False, 'ErrorCode': 202, 'Error': '该工单未开始'}
                 return json.JSONEncoder().encode(res)
-            # workorder.write({'date_finished': datetime.now()})
-            if ret['IsComplete'] is True:
-                workorder.write({'date_finished': datetime.now()})
+            workorder.button_finish()
+            # workorder.process_state = '待解除装夹'
+            # workorder.sudo().production_id.process_state = '待解除装夹'
 
-        # workorder.process_state = '待解除装夹'
-        # workorder.sudo().production_id.process_state = '待解除装夹'
-
-        # 根据工单的实际结束时间修改排程单的结束时间、状态，同时修改销售订单的状态
-        # if workorder.date_finished:
-        #     request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
-        #         {'actual_end_time': workorder.date_finished,
-        #          'state': 'finished'})
-        # production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
-        # if production_obj:
-        #     production_obj.sudo().work_order_state = '已完成'
-        #     production_obj.write({'state': 'done'})
-        # request.env['sale.order'].sudo().search(
-        #     [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
+            # 根据工单的实际结束时间修改排程单的结束时间、状态，同时修改销售订单的状态
+            if workorder.date_finished:
+                request.env['sf.production.plan'].sudo().search([('production_id', '=', production_id)]).write(
+                    {'actual_end_time': workorder.date_finished,
+                     'state': 'finished'})
+                production_obj = request.env['mrp.production'].sudo().search([('name', '=', production_id)])
+                if production_obj:
+                    production_obj.sudo().work_order_state = '已完成'
+                    production_obj.write({'state': 'completed'})
+                    # request.env['sale.order'].sudo().search(
+                    #     [('name', '=', production_obj.origin)]).write({'schedule_status': 'to deliver'})
 
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('button_Work_End error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/PartQualityInspect', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/PartQualityInspect', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def PartQualityInspect(self, **kw):
         """
@@ -262,27 +252,39 @@ class Manufacturing_Connect(http.Controller):
             request.env['center_control.interface.log'].sudo().create(
                 {'content': ret, 'name': 'AutoDeviceApi/PartQualityInspect'})
             production_id = ret['BillId']
-            # routing_type = ret['CraftId']
+            routing_type = ret['CraftId']
             workorder = request.env['mrp.workorder'].sudo().search(
-                [('production_id', '=', production_id), ('routing_type', '=', 'CNC加工'),
-                 ('state', 'not in', ['rework', 'done', 'cancel'])], order='sequence asc',
-                limit=1)
+                [('production_id', '=', production_id), ('routing_type', '=', routing_type)], limit=1)
             if workorder:
                 # workorder.test_results = ret['Quality']
                 logging.info('制造订单:%s' % workorder.production_id.name)
                 if 'ReportPaht' in ret:
-                    if ret['ReportPaht'].find('.pdf') != -1:
-                        download_state = request.env['mrp.workorder'].with_user(
-                            request.env.ref("base.user_admin")).download_reportfile_tmp(workorder,
-                                                                                        ret['ReportPaht'])
-                        if download_state is True:
-                            detection_ret = request.env['mrp.workorder'].with_user(
-                                request.env.ref("base.user_admin")).get_detection_file(workorder, ret['ReportPaht'])
-                            logging.info('detection_ret:%s' % detection_ret)
-                            if detection_ret is False:
-                                res = {'Succeed': False, 'ErrorCode': 205, 'Error': '检测报告文件读取失败'}
-                        else:
-                            res = {'Succeed': False, 'ErrorCode': 204, 'Error': '检测报告文件从FTP拉取失败'}
+                    download_state = request.env['mrp.workorder'].with_user(
+                        request.env.ref("base.user_admin")).download_reportfile_tmp(workorder,
+                                                                                    ret['ReportPaht'])
+                    if download_state == 1:
+                        detection_ret = request.env['mrp.workorder'].with_user(
+                            request.env.ref("base.user_admin")).get_detection_file(workorder, ret['ReportPaht'])
+                        if detection_ret is True:
+                            stock_picking_type = request.env['stock.picking.type'].sudo().search(
+                                [('sequence_code', '=', 'SFP')])
+                            if stock_picking_type:
+                                stock_picking = request.env['stock.picking'].sudo().search(
+                                    [('product_id', '=', workorder.product_id.id),
+                                     ('origin', '=', workorder.production_id.origin),
+                                     ('picking_type_id', '=', stock_picking_type.id)])
+                                if stock_picking:
+                                    quality_check = request.env['quality.check'].sudo().search(
+                                        [('product_id', '=', workorder.product_id.id),
+                                         ('picking_id', '=', stock_picking.id)])
+                                    if quality_check:
+                                        logging.info('质检单:%s' % quality_check.name)
+                                        quality_check.write({'report_pdf': workorder.detection_report})
+                    elif download_state == 2:
+                        res = {'Succeed': False, 'ErrorCode': 205,
+                               'Error': 'ReportPaht中的工件号与制造订单%s不匹配，请检查ReportPaht是否正确' % workorder.production_id.name}
+                    else:
+                        res = {'Succeed': False, 'ErrorCode': 204, 'Error': '检测报告文件从FTP拉取失败'}
                 else:
                     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传ReportPaht字段'}
             else:
@@ -292,7 +294,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('PartQualityInspect error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/CMMProgDolod', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/CMMProgDolod', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def CMMProgDolod(self, **kw):
         """
@@ -310,18 +312,18 @@ class Manufacturing_Connect(http.Controller):
             if 'RfidCode' in ret:
                 logging.info('RfidCode:%s' % ret['RfidCode'])
                 workorder = request.env['mrp.workorder'].sudo().search(
-                    [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工'), ('state', '!=', 'rework')])
+                    [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工')])
                 if workorder:
                     for item in workorder.cmm_ids:
-                        if item.program_create_date is not False:
-                            program_create_date = item.program_create_date.strftime("%Y-%m-%d %H:%M:%S")
-                            program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_create_date)
+                        if item.program_date is not False:
+                            program_date = item.program_date.strftime("%Y-%m-%d %H:%M:%S")
+                            program_date_str = request.env['sf.sync.common'].sudo().get_add_time(program_date)
                         res['Datas'].append({
                             'CraftId': workorder.id,
                             'CraftKey': workorder.name,
-                            'ProgramDate': '' if not item.program_create_date else program_date_str,
+                            'ProgramDate': '' if not item.program_date else program_date_str,
                             'ProgramPath': item.program_path,
-                            'PostProcessing': item.program_name,
+                            'PostProcessing': item.post_processing_name,
                         })
                 else:
                     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '暂无工单及对应的CNC程序数据'}
@@ -332,7 +334,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('CMMProgDolod error:%s' % e)
         return json.JSONEncoder().encode(res)
 
-    @http.route('/AutoDeviceApi/NCProgDolod', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/NCProgDolod', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def NCProgDolod(self, **kw):
         """
@@ -350,7 +352,7 @@ class Manufacturing_Connect(http.Controller):
             if 'RfidCode' in ret:
                 logging.info('RfidCode:%s' % ret['RfidCode'])
                 workorder = request.env['mrp.workorder'].sudo().search(
-                    [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工'), ('state', '!=', 'rework')])
+                    [('rfid_code', '=', ret['RfidCode']), ('routing_type', '=', 'CNC加工')])
                 if workorder:
                     for item in workorder.cnc_ids:
                         res['Datas'].append({
@@ -388,7 +390,7 @@ class Manufacturing_Connect(http.Controller):
             ret = json.loads(datas)
             request.env['center_control.interface.log'].sudo().create(
                 {'content': ret, 'name': 'AutoDeviceApi/LocationChange'})
-            logging.info('库位变更LocationChange_ret:%s' % ret)
+            logging.info('LocationChange_ret===========:%s' % ret)
             RfidCode = ret['RfidCode']
             ChangeType = ret['ChangeType']
             OldDeciveId = ret['OldDeciveId']
@@ -398,80 +400,34 @@ class Manufacturing_Connect(http.Controller):
             OldDeciveStart = ret['OldDeciveStart']
             OldDeciveEnd = ret['OldDeciveEnd']
 
-            if ChangeType == 'Part':
-                temp_val_sn_id = None
-                old_localtion = None
-                # if ChangeType == 'Part' or ChangeType == 'Tool':
-                stock_lot_obj = request.env['stock.lot'].sudo().search(
-                    [('rfid', '=', RfidCode)], limit=1)
-                logging.info('stock_lot_obj===========:%s' % stock_lot_obj)
-                if not stock_lot_obj:
-                    res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未根据RfidCode找到该产品'}
-                    return json.JSONEncoder().encode(res)
-                if OldPosition:
-                    old_localtion = request.env['sf.shelf.location'].sudo().search(
-                        [('barcode', '=', OldPosition)], limit=1)
-                    logging.info('old_localtion===========:%s' % old_localtion)
-                new_localtion = request.env['sf.shelf.location'].sudo().search(
-                    [('barcode', '=', NewPosition)], limit=1)
-                logging.info('new_localtion===========:%s' % new_localtion)
-                if not new_localtion:
-                    res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有该目标位置'}
-                    return json.JSONEncoder().encode(res)
-                if old_localtion:
-                    temp_val_sn_id = old_localtion.product_sn_id
-                    logging.info('temp_val_sn_id===========:%s' % temp_val_sn_id)
-                    old_localtion.product_sn_id = None
-                    new_localtion.product_sn_id = temp_val_sn_id
-                    logging.info('====1======')
-                else:
-                    new_localtion.product_sn_id = stock_lot_obj.id
-                    logging.info('=====2======')
-            elif ChangeType == 'Tool':
-                # 对功能刀具库位变更信息进行更改
-                def write_tool(DeciveId):
-                    if 'Tool' in DeciveId:
-                        shelfinfo = list(filter(lambda x: x.get('DeviceId') == DeciveId,
-                                                request.env['sf.shelf.location'].sudo().get_sf_shelf_location_info(
-                                                    DeciveId)))
-                        total_data = request.env['sf.shelf.location.datasync'].sudo().get_total_data()
-                        for item in shelfinfo:
-                            logging.info('货架已获取信息:%s' % item)
-                            shelf_barcode = request.env['sf.shelf.location.datasync'].sudo().find_our_code(
-                                total_data, item['Postion'])
-                            location_id = request.env['sf.shelf.location'].sudo().search(
-                                [('barcode', '=', shelf_barcode)],
-                                limit=1)
-                            if location_id:
-                                # 如果是线边刀库信息,则对功能刀具移动生成记录
-                                if 'Tool' in item['Postion']:
-                                    tool = request.env['sf.functional.cutting.tool.entity'].sudo().search(
-                                        [('rfid', '=', item['RfidCode']), ('functional_tool_status', '!=', '已拆除')])
-                                    tool.sudo().tool_in_out_stock_location(location_id)
-                                    if tool:
-                                        location_id.product_sn_id = tool.barcode_id.id
-                                        # 修改功能刀具状态
-                                        if item.get('State') == '报警':
-                                            if tool.functional_tool_status != item.get('State'):
-                                                tool.write({
-                                                    'functional_tool_status': item['State']
-                                                })
-                                    else:
-                                        location_id.product_sn_id = False
-                                        if item['RfidCode']:
-                                            logging.info('Rfid为【%s】的功能刀具在系统中不存在！' % item['RfidCode'])
-                    else:
-                        equipment_id = request.env['maintenance.equipment'].sudo().search([('name', '=', DeciveId)])
-                        if equipment_id:
-                            equipment_id.sudo().register_equipment_tool()
-                        else:
-                            res_1 = {'Succeed': False, 'ErrorCode': 202, 'Error': f'设备【{DeciveId}】不存在'}
-                            return json.JSONEncoder().encode(res_1)
-
-                if OldDeciveId:
-                    write_tool(OldDeciveId)
-                elif NewDeciveId:
-                    write_tool(NewDeciveId)
+            temp_val_sn_id = None
+            old_localtion = None
+            # if ChangeType == 'Part' or ChangeType == 'Tool':
+            stock_lot_obj = request.env['stock.lot'].sudo().search(
+                [('rfid', '=', RfidCode)], limit=1)
+            logging.info('stock_lot_obj===========:%s' % stock_lot_obj)
+            if not stock_lot_obj:
+                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '未根据RfidCode找到该产品'}
+                return json.JSONEncoder().encode(res)
+            if OldPosition:
+                old_localtion = request.env['sf.shelf.location'].sudo().search(
+                    [('barcode', '=', OldPosition)], limit=1)
+                logging.info('old_localtion===========:%s' % old_localtion)
+            new_localtion = request.env['sf.shelf.location'].sudo().search(
+                [('barcode', '=', NewPosition)], limit=1)
+            logging.info('new_localtion===========:%s' % new_localtion)
+            if not new_localtion:
+                res = {'Succeed': False, 'ErrorCode': 202, 'Error': '没有该目标位置'}
+                return json.JSONEncoder().encode(res)
+            if old_localtion:
+                temp_val_sn_id = old_localtion.product_sn_id
+                logging.info('temp_val_sn_id===========:%s' % temp_val_sn_id)
+                old_localtion.product_sn_id = None
+                new_localtion.product_sn_id = temp_val_sn_id
+                logging.info('====1======')
+            else:
+                new_localtion.product_sn_id = stock_lot_obj.id
+                logging.info('=====2======')
         except Exception as e:
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('LocationChange error:%s' % e)
@@ -496,56 +452,37 @@ class Manufacturing_Connect(http.Controller):
             if 'DeviceId' in ret:
                 logging.info('DeviceId:%s' % ret['DeviceId'])
                 if 'IsComplete' in ret:
-                    rfid_codes = []
-                    workorder_ids = []
                     if ret['IsComplete'] is True or ret['IsComplete'] is False:
                         for i in range(1, 5):
                             logging.info('F-RfidCode:%s' % i)
                             if f'RfidCode{i}' in ret:
                                 rfid_code = ret[f'RfidCode{i}']
                                 logging.info('RfidCode:%s' % rfid_code)
-                                if rfid_code is not None and rfid_code != '':
-                                    rfid_codes.append(rfid_code)
-                                    domain = [
-                                        ('rfid_code', '=', rfid_code),
-                                        ('routing_type', '=', 'CNC加工'), ('state', '!=', 'rework')
-                                    ]
-                                    workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
-                                    if workorder:
-                                        for order in workorder:
-                                            workorder_ids.append(order.id)
-                                            if order.production_line_state == '待上产线':
-                                                logging.info(
-                                                    '工单产线状态:%s' % order.production_line_state)
-                                                panel_workorder = request.env['mrp.workorder'].sudo().search(
-                                                    [('rfid_code', '=', rfid_code), ('state', '!=', 'rework'),
-                                                     ('processing_panel', '=', order.processing_panel)])
-                                                if panel_workorder:
-                                                    panel_workorder.write({'production_line_state': '已上产线'})
-                                                # 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.status == '待下发':
-                                                #     workpiece_delivery.write({'is_manual_work': True})
-                                                # 下发
-                                    else:
-                                        res = {'Succeed': False, 'ErrorCode': 204,
-                                               'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
-                    if ret['IsComplete'] is True:
-                        # 向AGV任务调度下发运送空料架任务
-                        workorders = request.env['mrp.workorder'].browse(workorder_ids)
-                        request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '运送空料架', workorders)
+                                domain = [
+                                    ('rfid_code', '=', rfid_code),
+                                    ('routing_type', '=', 'CNC加工')
+                                ]
+                                workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
+                                if workorder:
+                                    for order in workorder:
+                                        if order.production_id.production_line_state == '待上产线':
+                                            logging.info(
+                                                '制造订单产线状态:%s' % order.production_id.production_line_state)
+                                            order.production_id.write({'production_line_state': '已上产线'})
+                                            workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search([
+                                                ('rfid_code', '=', rfid_code), ('type', '=', '上产线'),
+                                                ('production_id', '=', order.production_id.id)])
+                                            if workpiece_delivery.status == '待下发':
+                                                workpiece_delivery.write({'is_manual_work': True})
+                                else:
+                                    res = {'Succeed': False, 'ErrorCode': 204,
+                                           'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
                 else:
                     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
             else:
                 res = {'Succeed': False, 'ErrorCode': 201, 'Error': '未传DeviceId字段'}
-        except RepeatTaskException as e:
-            logging.info('AGVToProduct error:%s' % e)
         except Exception as e:
-            res = {'Succeed': False, 'ErrorCode': 202, 'Error': str(e)}
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('AGVToProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
 
@@ -568,8 +505,7 @@ class Manufacturing_Connect(http.Controller):
             logging.info('ret:%s' % ret)
             if 'DeviceId' in ret:
                 logging.info('DeviceId:%s' % ret['DeviceId'])
-                # delivery_Arr = []
-                workorder_ids = []
+                delivery_Arr = []
                 if 'IsComplete' in ret:
                     if ret['IsComplete'] is True or ret['IsComplete'] is False:
                         for i in range(1, 5):
@@ -577,59 +513,42 @@ class Manufacturing_Connect(http.Controller):
                             if f'RfidCode{i}' in ret:
                                 rfid_code = ret[f'RfidCode{i}']
                                 logging.info('RfidCode:%s' % rfid_code)
-                                if rfid_code is not None and rfid_code != '':
-                                    domain = [
-                                        ('rfid_code', '=', rfid_code),
-                                        ('routing_type', '=', 'CNC加工'), ('state', '!=', 'rework')
-                                    ]
-                                    workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
-                                    if workorder:
-                                        for order in workorder:
-                                            workorder_ids.append(order.id)
-                                            if order.production_line_state == '已上产线':
-                                                logging.info(
-                                                    '工单产线状态:%s' % order.production_line_state)
-                                                panel_workorder = request.env['mrp.workorder'].sudo().search(
-                                                    [('rfid_code', '=', rfid_code), ('state', '!=', 'rework'),
-                                                     ('processing_panel', '=', order.processing_panel)])
-                                                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']}
-                        # if delivery_Arr:
-                        #     logging.info('delivery_Arr:%s' % delivery_Arr)
-                        #     delivery_workpiece = request.env['sf.workpiece.delivery'].sudo().search(
-                        #         [('id', 'in', delivery_Arr)])
-                        #     if delivery_workpiece:
-                        #         logging.info('开始向agv下发下产线任务')
-                        #         agv_site = request.env['sf.agv.site'].sudo().search([])
-                        #         if agv_site:
-                        #             has_site = agv_site.update_site_state()
-                        #             if has_site is True:
-                        #                 is_free = delivery_workpiece._check_avgsite_state()
-                        #                 if is_free is True:
-                        #                     delivery_workpiece._delivery_avg()
-                        #                     logging.info('agv下发下产线任务下发完成')
-                if ret['IsComplete'] is True:
-                    # 向AGV任务调度下发下产线任务
-                    workorders = request.env['mrp.workorder'].browse(workorder_ids)
-                    request.env['sf.agv.scheduling'].add_scheduling(ret['DeviceId'], '下产线', workorders)
+                                domain = [
+                                    ('rfid_code', '=', rfid_code),
+                                    ('routing_type', '=', 'CNC加工')
+                                ]
+                                workorder = request.env['mrp.workorder'].sudo().search(domain, order='id asc')
+                                if workorder:
+                                    for order in workorder:
+                                        if order.production_id.production_line_state == '已上产线':
+                                            logging.info(
+                                                '制造订单产线状态:%s' % order.production_id.production_line_state)
+                                            order.production_id.write({'production_line_state': '已下产线'})
+                                            workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search([
+                                                ('rfid_code', '=', rfid_code), ('type', '=', '下产线'),
+                                                ('production_id', '=', order.production_id.id)])
+                                            delivery_Arr.append(workpiece_delivery.id)
+                                else:
+                                    res = {'Succeed': False, 'ErrorCode': 204,
+                                           'Error': 'DeviceId为%s没有对应的已配送工件数据' % ret['DeviceId']}
+                        if delivery_Arr:
+                            logging.info('delivery_Arr:%s' % delivery_Arr)
+                            delivery_workpiece = request.env['sf.workpiece.delivery'].sudo().search(
+                                [('id', 'in', delivery_Arr)])
+                            if delivery_workpiece:
+                                logging.info('开始向agv下发下产线任务')
+                                agv_site = request.env['sf.agv.site'].sudo().search([])
+                                if agv_site:
+                                    has_site = agv_site.update_site_state()
+                                    if has_site is True:
+                                        is_free = delivery_workpiece._check_avgsite_state()
+                                        if is_free is True:
+                                            delivery_workpiece._delivery_avg()
+                                            logging.info('agv下发下产线任务下发完成')
                 else:
                     res = {'Succeed': False, 'ErrorCode': 203, 'Error': '未传IsComplete字段'}
-        except RepeatTaskException as e:
-            logging.info('AGVToProduct error:%s' % e)
         except Exception as e:
-            res = {'Succeed': False, 'ErrorCode': 202, 'Error': str(e)}
+            res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('AGVDownProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
 
@@ -667,32 +586,3 @@ class Manufacturing_Connect(http.Controller):
             res = {'Succeed': False, 'ErrorCode': 202, 'Error': e}
             logging.info('AGVDownProduct error:%s' % e)
         return json.JSONEncoder().encode(res)
-
-    @http.route('/AutoDeviceApi/AgvStationState', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
-                cors="*")
-    def AGVStationState(self, **kw):
-        """
-        中控推送接驳站状态
-        :param kw:
-        :return:
-        """
-        logging.info('AGVStationState:%s' % kw)
-        try:
-            res = {'Succeed': True}
-            datas = request.httprequest.data
-            ret = json.loads(datas)
-            request.env['center_control.interface.log'].sudo().create(
-                {'content': ret, 'name': 'AutoDeviceApi/AGVStationState'})
-            logging.info('ret:%s' % ret)
-            ret = ret['param']
-            params = {}
-            for i in range(len(ret)):
-                if 'DeviceId' in ret[i] and 'AtHome' in ret[i]:
-                    logging.info('DeviceId:%s, AtHome:%s' % (ret[i]['DeviceId'], ret[i]['AtHome']))
-                    params[ret[i]['DeviceId']] = '占用' if ret[i]['AtHome'] else '空闲'
-            if params:
-                request.env['sf.agv.site'].update_site_state(params)
-        except Exception as e:
-            res = {'Succeed': False, 'ErrorCode': 202, 'Error': str(e)}
-            logging.info('AGVDownProduct error:%s' % e)
-        return json.JSONEncoder().encode(res)

sf_manufacturing/controllers/workpiece.py

@@ -8,7 +8,7 @@ from odoo.http import request
 
 class Workpiece(http.Controller):
 
-    @http.route('/agvApi/backfeed', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
+    @http.route('/agvApi/backfeed', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def backfeed(self, **kw):
         """
@@ -25,14 +25,15 @@ class Workpiece(http.Controller):
             if 'reqCode' in ret:
                 if 'method' in ret:
                     if ret['method'] == 'end':
-                        # 找到对应的AGV调度任务
-                        agv_scheduling = request.env['sf.agv.scheduling'].sudo().search(
-                            [('name', '=', ret['reqCode']), ('state', '=', '配送中')])
-                        if agv_scheduling:
-                            agv_scheduling.finish_scheduling()
-                        else:
-                            res = {'Succeed': False, 'ErrorCode': 203,
-                                   'Error': '该reqCode暂未查到对应的AGV任务记录'}
+                        req_codes = ret['reqCode'].split(',')
+                        for req_code in req_codes:
+                            workpiece_delivery = request.env['sf.workpiece.delivery'].sudo().search(
+                                [('name', '=', req_code.strip()), ('task_completion_time', '=', False)])
+                            if workpiece_delivery:
+                                workpiece_delivery.write({'status': '已配送', 'task_completion_time': datetime.now()})
+                            else:
+                                res = {'Succeed': False, 'ErrorCode': 203,
+                                       'Error': '该reqCode暂未查到对应的工件配送记录'}
                 else:
                     res = {'Succeed': False, 'ErrorCode': 204, 'Error': '未传method字段'}
             else:

sf_manufacturing/data/agv_scheduling_data.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="0">
-        <record id="sequence_agv_scheduling" model="ir.sequence">
-            <field name="name">AGV调度</field>
-            <field name="code">sf.agv.scheduling</field>
-            <field name="prefix">B%(year)s%(month)s%(day)s</field>
-            <field name="padding">4</field>
-            <field name="number_next">1</field>
-            <field name="implementation">standard</field>
-            <field name="use_date_range">True</field>
-            <field name="date_range_period">day</field>
-            <field name="company_id" eval="False"/>
-        </record>
-    </data>
-</odoo>

sf_manufacturing/data/panel_data.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<odoo>
-    <data noupdate="1">
-        <record id="panel_zm" model="sf.processing.panel">
-            <field name="name">ZM</field>
-        </record>
-
-        <record id="panel_fm" model="sf.processing.panel">
-            <field name="name">FM</field>
-        </record>
-         <record id="panel_yc" model="sf.processing.panel">
-            <field name="name">YC</field>
-        </record>
-         <record id="panel_zc" model="sf.processing.panel">
-            <field name="name">ZC</field>
-        </record>
-         <record id="panel_qc" model="sf.processing.panel">
-            <field name="name">QC</field>
-        </record>
-         <record id="panel_hc" model="sf.processing.panel">
-            <field name="name">HC</field>
-        </record>
-    </data>
-</odoo>

sf_manufacturing/data/stock_data.xml

@@ -1,16 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <odoo>
     <data noupdate="1">
-        <record model="ir.cron" id="ir_cron_mrp_production">
-            <field name="name">返工且编程中的制造订单定时获取Cloud编程单状态</field>
-            <field name="model_id" ref="model_mrp_production"/>
-            <field name="state">code</field>
-            <field name="code">model._cron_get_programming_state()</field>
-            <field name="interval_number">3</field>
-            <field name="interval_type">minutes</field>
-            <field name="numbercall">-1</field>
-        </record>
-
         <record id="sequence_routing_workcenter" model="ir.sequence">
             <field name="name">工序编码规则</field>
             <field name="code">mrp.routing.workcenter</field>

sf_manufacturing/models/__init__.py

@@ -9,5 +9,3 @@ from . import stock
 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,267 +0,0 @@
-import requests
-
-from odoo import models, fields, api, _
-from odoo.exceptions import UserError
-
-import logging
-
-_logger = logging.getLogger(__name__)
-
-
-class RepeatTaskException(UserError):
-    pass
-
-
-class AgvScheduling(models.Model):
-    _name = 'sf.agv.scheduling'
-    _description = 'agv调度'
-    _order = 'id desc'
-
-    name = fields.Char('任务单号', index=True, copy=False)
-
-    def _get_agv_route_type_selection(self):
-        return self.env['sf.agv.task.route'].fields_get(['route_type'])['route_type']['selection']
-
-    agv_route_type = fields.Selection(selection=_get_agv_route_type_selection, string='任务类型', required=True)
-    agv_route_id = fields.Many2one('sf.agv.task.route', '任务路线')
-    start_site_id = fields.Many2one('sf.agv.site', '起点接驳站', required=True)
-    end_site_id = fields.Many2one('sf.agv.site', '终点接驳站', tracking=True)
-    site_state = fields.Selection([
-        ('占用', '占用'),
-        ('空闲', '空闲')], string='终点接驳站状态', default='占用')
-    state = fields.Selection([
-        ('待下发', '待下发'),
-        ('配送中', '配送中'),
-        ('已配送', '已配送'),
-        ('已取消', '已取消')], string='状态', default='待下发', tracking=True)
-    workorder_ids = fields.Many2many('mrp.workorder', 'sf_agv_scheduling_mrp_workorder_ref', string='关联工单')
-    task_create_time = fields.Datetime('任务创建时间')
-    task_delivery_time = fields.Datetime('任务下发时间')
-    task_completion_time = fields.Datetime('任务完成时间')
-    task_duration = fields.Char('任务时长', compute='_compute_task_duration')
-
-    @api.depends('agv_route_type')
-    def _compute_delivery_workpieces(self):
-        for record in self:
-            if record.agv_route_type == '运送空料架':
-                record.delivery_workpieces = '/'
-            else:
-                record.delivery_workpieces = '、'.join(record.workorder_ids.mapped('production_id.name'))
-
-    delivery_workpieces = fields.Char('配送工件', compute=_compute_delivery_workpieces)
-
-    @api.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):
-            if isinstance(item, list):
-                if item[0] == 'delivery_workpieces':
-                    new_domain.append('&')
-                    new_domain.append(['workorder_ids.production_id.name', item[1], item[2]])
-                    new_domain.append(['agv_route_type', '!=', '运送空料架'])
-                    continue
-            new_domain.append(item)
-
-        return super(AgvScheduling, self).web_search_read(new_domain, fields, limit=limit, offset=offset)
-
-    @api.depends('task_completion_time', 'task_delivery_time')
-    def _compute_task_duration(self):
-        for rec in self:
-            if rec.task_completion_time and rec.task_delivery_time:
-                rec.task_duration = str(rec.task_completion_time - rec.task_delivery_time)
-            else:
-                rec.task_duration = ''
-
-    @api.model_create_multi
-    def create(self, vals_list):
-        # We generate a standard reference
-        for vals in vals_list:
-            vals['name'] = self.env['ir.sequence'].next_by_code('sf.agv.scheduling') or _('New')
-        return super().create(vals_list)
-
-    def add_scheduling(self, agv_start_site_name, agv_route_type, workorders):
-        """ add_scheduling(agv_start_site_id, agv_route_type, workorders) -> agv_scheduling
-            新增AGV调度
-            params:
-                agv_start_site_name: AGV起点接驳站名称
-                agv_route_type: AGV任务类型
-                workorders: 工单
-        """
-        _logger.info('创建AGV调度任务\r\n起点为【%s】，任务类型为【%s】，工单为【%s】' % (agv_start_site_name, agv_route_type, workorders))
-        if not workorders:
-            raise UserError(_('工单不能为空'))
-        agv_start_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_start_site_name)], limit=1)
-        if not agv_start_site:
-            raise UserError(_('不存在名称为【%s】的接驳站，请先创建！' % agv_start_site_name))
-        # 如果存在相同任务类型工单的AGV调度任务，则提示错误
-        agv_scheduling = self.sudo().search([
-            ('workorder_ids', 'in', workorders.ids),
-            ('agv_route_type', '=', agv_route_type),
-            ('state', 'in', ['待下发', '配送中'])
-        ], limit=1)
-        if agv_scheduling:
-            # 计算agv_scheduling.workorder_ids与workorders的交集
-            repetitive_workorders = agv_scheduling.workorder_ids & workorders
-            raise RepeatTaskException(
-                '制造订单号【%s】已存在于【%s】AGV调度任务，请勿重复下发！' %
-                (','.join(repetitive_workorders.mapped('production_id.name')), agv_scheduling.name)
-            )
-
-        vals = {
-            'start_site_id': agv_start_site.id,
-            'agv_route_type': agv_route_type,
-            'workorder_ids': workorders.ids,
-            # 'workpiece_delivery_ids': deliveries.mapped('id') if deliveries else [],
-            'task_create_time': fields.Datetime.now()
-        }
-        # 如果只有唯一任务路线，则自动赋予终点接驳站跟任务名称
-        agv_routes = self.env['sf.agv.task.route'].sudo().search([
-            ('route_type', '=', agv_route_type),
-            ('start_site_id', '=', agv_start_site.id)
-        ])
-        if not agv_routes:
-            raise UserError(_('不存在起点为【%s】的【%s】任务路线，请先创建！' % (agv_start_site_name, agv_route_type)))
-        idle_route = None
-        if len(agv_routes) == 1:
-            idle_route = agv_routes[0]
-            vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
-        else:
-            # 判断终点接驳站是否为空闲
-            idle_routes = agv_routes.filtered(lambda r: r.end_site_id.state == '空闲')
-            if idle_routes:
-                # 将空闲的路线按照终点接驳站名称排序
-                idle_routes = sorted(idle_routes, key=lambda r: r.end_site_id.name)
-                idle_route = idle_routes[0]
-                vals.update({'end_site_id': idle_route.end_site_id.id, 'agv_route_id': idle_route.id})
-        try:
-            scheduling = self.env['sf.agv.scheduling'].sudo().create(vals)
-            # 触发空闲接驳站状态更新，触发新任务下发
-            if idle_route and idle_route.end_site_id.state == '空闲':
-                scheduling.dispatch_scheduling(idle_route)
-
-        except Exception as e:
-            _logger.error('添加AGV调度任务失败: %s', e)
-            raise UserError(_('添加AGV调度任务失败: %s', e))
-
-        return scheduling
-
-    def on_site_state_change(self, agv_site_id, agv_site_state):
-        """
-            响应AGV接驳站站点状态变化
-            params:
-                agv_site_id: 接驳站ID
-                agv_site_state: 站点状态（'空闲', '占用'）
-        """
-        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(
-                [('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)
-
-    def _delivery_avg(self):
-        config = self.env['res.config.settings'].get_values()
-        position_code_arr = [{
-            'positionCode': self.start_site_id.name,
-            'code': '00'
-        }, {
-            'positionCode': self.end_site_id.name,
-            'code': '00'
-        }]
-        res = {'reqCode': self.name, 'reqTime': '', 'clientCode': '', 'tokenCode': '',
-               'taskTyp': 'F01', 'ctnrTyp': '', 'ctnrCode': '', 'wbCode': config['wbcode'],
-               'positionCodePath': position_code_arr,
-               'podCode': '',
-               'podDir': '', 'materialLot': '', 'priority': '', 'taskCode': '', 'agvCode': '', 'materialLot': '',
-               'data': ''}
-        try:
-            logging.info('AGV请求路径:%s' % config['agv_rcs_url'])
-            logging.info('AGV-json:%s' % res)
-            headers = {'Content-Type': 'application/json'}
-            ret = requests.post((config['agv_rcs_url']), json=res, headers=headers)
-            ret = ret.json()
-            logging.info('config-ret:%s' % ret)
-            if ret['code'] == 0:
-                return True
-            else:
-                raise UserError(ret['message'])
-        except Exception as e:
-            logging.info('config-e:%s' % e)
-            raise UserError("工件配送请求agv失败:%s" % e)
-
-    def button_cancel(self):
-        # 弹出二次确认窗口后执行
-        for rec in self:
-            if rec.state != '待下发':
-                raise UserError('只有待下发状态的AGV调度任务才能取消！')
-            rec.state = '已取消'
-
-    def finish_scheduling(self):
-        """
-            完成调度任务
-        """
-        for rec in self:
-            if rec.state != '配送中':
-                return False
-            _logger.info('AGV任务调度：完成任务%s' % rec)
-            rec.state = '已配送'
-            rec.task_completion_time = fields.Datetime.now()
-
-    def dispatch_scheduling(self, agv_task_route):
-        """
-            下发调度任务
-            params:
-                agv_route sf.agv.task.route对象
-        """
-        for rec in self:
-            if rec.state != '待下发':
-                return False
-            _logger.info('AGV任务调度：下发调度任务，路线为%s' % agv_task_route)
-            rec.state = '配送中'
-            rec.task_delivery_time = fields.Datetime.now()
-            rec.site_state = '空闲'
-            rec.end_site_id = agv_task_route.end_site_id.id
-            rec.agv_route_id = agv_task_route.id
-            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)
-
-    def write(self, vals):
-        if vals.get('state', False):
-            if vals['state'] == '已取消':
-                self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({'status': '待下发'})
-            elif vals['state'] == '已配送':
-                self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({
-                    'status': '已配送',
-                    'feeder_station_destination_id': self.end_site_id.id,
-                    'route_id': self.agv_route_id.id,
-                    'task_completion_time': fields.Datetime.now()
-                })
-            elif vals['state'] == '配送中':
-                self.env['sf.workpiece.delivery'].search([('agv_scheduling_id', '=', self.id)]).write({
-                    'feeder_station_destination_id': self.end_site_id.id,
-                    'route_id': self.agv_route_id.id,
-                    'task_delivery_time': fields.Datetime.now()
-                })
-        return super().write(vals)
-
-
-class ResMrpWorkOrder(models.Model):
-    _inherit = 'mrp.workorder'
-
-    agv_scheduling_ids = fields.Many2many(
-        'sf.agv.scheduling',
-        'sf_agv_scheduling_mrp_workorder_ref',
-        string='AGV调度',
-        domain=[('state', '!=', '已取消')])

sf_manufacturing/models/agv_setting.py

@@ -2,10 +2,7 @@
 import requests
 import logging
 import time
-from odoo import fields, models, api
-from odoo.exceptions import UserError
-
-_logger = logging.getLogger(__name__)
+from odoo import fields, models
 
 
 class AgvSetting(models.Model):
@@ -13,69 +10,44 @@ class AgvSetting(models.Model):
     _description = 'agv站点'
 
     name = fields.Char('位置编号')
-    # owning_region = fields.Char('所属区域')
+    owning_region = fields.Char('所属区域')
     state = fields.Selection([
         ('占用', '占用'),
         ('空闲', '空闲')], string='状态')
     divide_the_work = fields.Char('主要分工')
     active = fields.Boolean('有效', default=True)
-    workcenter_id = fields.Many2one(string='所属区域', comodel_name='mrp.workcenter', tracking=True,
-                                    domain=[('is_agv_scheduling', '=', True)])
 
-    # name必须唯一
-    _sql_constraints = [
-        ('name_uniq', 'unique (name)', '站点编号必须唯一!'),
-    ]
-
-    # def update_site_state(self):
-    #     # 调取中控的接驳站接口并修改对应站点的状态
-    #     config = self.env['res.config.settings'].get_values()
-    #     # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
-    #     headers = {'Authorization': config['center_control_Authorization']}
-    #     center_control_url = config['center_control_url'] + "/AutoDeviceApi/GetAgvStationState?date="
-    #     timestamp = int(time.time())
-    #     center_control_url += str(timestamp)
-    #     logging.info('工件配送-请求中控地址:%s' % center_control_url)
-    #     try:
-    #         center_control_r = requests.get(center_control_url, headers=headers, timeout=10)  # 设置超时为60秒
-    #         ret = center_control_r.json()
-    #         logging.info('工件配送-请求中控站点信息:%s' % ret)
-    #         self.env['center_control.interface.log'].sudo().create(
-    #             {'content': ret, 'name': 'AutoDeviceApi/GetAgvStationState?date=%s' % str(timestamp)})
-    #         if ret['Succeed'] is True:
-    #             datas = ret['Datas']
-    #             for item in self:
-    #                 for da in datas:
-    #                     if da['DeviceId'] == item.name:
-    #                         if da['AtHome'] is True:
-    #                             item.state = '占用'
-    #                         else:
-    #                             item.state = '空闲'
-    #             return True
-    #     except requests.exceptions.Timeout:
-    #         logging.error('工件配送-请求中控接口超时')
-    #         return False
-    #     except requests.exceptions.RequestException as e:
-    #         logging.error('工件配送-请求中控接口错误: %s', e)
-    #         return False
-
-    def update_site_state(self, agv_site_state_arr, notify=True):
-        """
-            更新接驳站状态
-            params:
-                agv_site_state_arr: {'A01': '空闲', 'B01': '占用'}
-                notify: 是否通知调度（非中控发起的状态改变不触发调度任务）
-        """
-        if isinstance(agv_site_state_arr, dict):
-            for agv_site_name, is_occupy in agv_site_state_arr.items():
-                agv_site = self.env['sf.agv.site'].sudo().search([('name', '=', agv_site_name)])
-                if agv_site:
-                    agv_site.state = is_occupy
-                    if notify:
-                        self.env['sf.agv.scheduling'].on_site_state_change(agv_site.id, agv_site.state)
-                else:
-                    _logger.error("更新失败：接驳站站点错误！%s" % agv_site_name)
-                    raise UserError("更新失败：接驳站站点错误！")
+    def update_site_state(self):
+        # 调取中控的接驳站接口并修改对应站点的状态
+        config = self.env['res.config.settings'].get_values()
+        # token = sf_sync_config['token'Ba F2CF5DCC-1A00-4234-9E95-65603F70CC8A]
+        headers = {'Authorization': config['center_control_Authorization']}
+        center_control_url = config['center_control_url'] + "/AutoDeviceApi/GetAgvStationState?date="
+        timestamp = int(time.time())
+        center_control_url += str(timestamp)
+        logging.info('工件配送-请求中控地址:%s' % center_control_url)
+        try:
+            center_control_r = requests.get(center_control_url, headers=headers, timeout=10)  # 设置超时为60秒
+            ret = center_control_r.json()
+            logging.info('工件配送-请求中控站点信息:%s' % ret)
+            self.env['center_control.interface.log'].sudo().create(
+                {'content': ret, 'name': 'AutoDeviceApi/GetAgvStationState?date=%s' % str(timestamp)})
+            if ret['Succeed'] is True:
+                datas = ret['Datas']
+                for item in self:
+                    for da in datas:
+                        if da['DeviceId'] == item.name:
+                            if da['AtHome'] is True:
+                                item.state = '占用'
+                            else:
+                                item.state = '空闲'
+                return True
+        except requests.exceptions.Timeout:
+            logging.error('工件配送-请求中控接口超时')
+            return False
+        except requests.exceptions.RequestException as e:
+            logging.error('工件配送-请求中控接口错误: %s', e)
+            return False
 
 
 class AgvTaskRoute(models.Model):
@@ -87,28 +59,11 @@ class AgvTaskRoute(models.Model):
         ('F01', '搬运'), ], string='任务类型', default="F01")
     route_type = fields.Selection([
         ('上产线', '上产线'), ('下产线', '下产线'), ('运送空料架', '运送空料架')], string='类型')
-    start_site_id = fields.Many2one('sf.agv.site', '起点接驳站')
-    end_site_id = fields.Many2one('sf.agv.site', '终点接驳站')
+    start_site_id = fields.Many2one('sf.agv.site', '起点接驳站位置编号')
+    end_site_id = fields.Many2one('sf.agv.site', '终点接驳站位置编号')
     destination_production_line_id = fields.Many2one('sf.production.line', '目的生产线')
     active = fields.Boolean('有效', default=True)
 
-    @api.constrains('end_site_id')
-    def _check_end_site_id(self):
-        if self.end_site_id:
-            if self.end_site_id == self.start_site_id:
-                raise UserError("您选择的终点接驳站与起点接驳站重复,请重新选择")
-
-    workcenter_id = fields.Many2one(string='所属区域', comodel_name='mrp.workcenter', domain=[('is_agv_scheduling', '=', True)],
-                             compute="_compute_region")
-
-    @api.depends('end_site_id')
-    def _compute_region(self):
-        for record in self:
-            if record.end_site_id:
-                record.workcenter_id = record.end_site_id.workcenter_id
-            else:
-                record.workcenter_id = None
-
 
 class Center_controlInterfaceLog(models.Model):
     _name = 'center_control.interface.log'

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])],

sf_manufacturing/models/mrp_workcenter.py

@@ -5,50 +5,24 @@ from odoo.addons.resource.models.resource import Intervals
 
 
 class ResWorkcenter(models.Model):
-    _name = "mrp.workcenter"
-    _inherit = ['mrp.workcenter', 'mail.thread']
+    _inherit = "mrp.workcenter"
 
     # 生产线显示
     production_line_show = fields.Char(string='生产线名称')
-    equipment_id = fields.Many2one('maintenance.equipment', string="设备", tracking=True)
+    equipment_id = fields.Many2one(
+        'maintenance.equipment', string="设备",
+        )
     production_line_id = fields.Many2one('sf.production.line', string='生产线',
                                          related='equipment_id.production_line_id', store=True)
+
     is_process_outsourcing = fields.Boolean('工艺外协')
-    users_ids = fields.Many2many("res.users", 'users_workcenter', tracking=True)
+    users_ids = fields.Many2many("res.users", 'users_workcenter')
 
-    def write(self, vals):
-        if 'users_ids' in vals:
-            old_users = self.users_ids
-            res = super(ResWorkcenter, self).write(vals)
-            new_users = self.users_ids
-            added_users = new_users - old_users
-            removed_users = old_users - new_users
-            if added_users or removed_users:
-                message = "增加 → %s ; 移除 → %s （可操作用户）" % (
-                    # ','.join(added_users.mapped('name')), ','.join(removed_users.mapped('name')))
-                    added_users.mapped('name'), removed_users.mapped('name'))
-                self.message_post(body=message)
-            return res
-        return super(ResWorkcenter, self).write(vals)
 
-    name = fields.Char('Work Center', related='resource_id.name', store=True, readonly=False, tracking=True)
-    time_efficiency = fields.Float('Time Efficiency', related='resource_id.time_efficiency', default=100, store=True,
-                                   readonly=False, tracking=True)
-    default_capacity = fields.Float(
-        'Capacity', default=1.0,
-        help="Default number of pieces (in product UoM) that can be produced in parallel (at the same time) at this work center. For example: the capacity is 5 and you need to produce 10 units, then the operation time listed on the BOM will be multiplied by two. However, note that both time before and after production will only be counted once.",
-        tracking=True)
 
-    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')
@@ -125,8 +99,6 @@ class ResWorkcenter(models.Model):
             res[wc_id] = [(datetime.fromtimestamp(s), datetime.fromtimestamp(e)) for s, e, _ in final_intervals_wc]
         return res
 
-    # AGV是否可配送
-    is_agv_scheduling = fields.Boolean(string="AGV所属区域", tracking=True)
 
 class ResWorkcenterProductivity(models.Model):
     _inherit = 'mrp.workcenter.productivity'

sf_manufacturing/models/product_template.py

@@ -5,10 +5,8 @@ import base64
 import hashlib
 import os
 from odoo import models, fields, api, _
-from odoo.exceptions import ValidationError, UserError
+from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-
-
 from OCC.Extend.DataExchange import read_step_file
 from OCC.Extend.DataExchange import write_stl_file
 
@@ -52,8 +50,8 @@ class ResProductMo(models.Model):
     cutting_tool_material_id = fields.Many2one('sf.cutting.tool.material', string='刀具物料')
     cutting_tool_type = fields.Char(string="刀具物料类型", related='cutting_tool_material_id.name', store=True)
 
-    cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='型号名称')
-    specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='物料号')
+    cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='型号')
+    specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='规格')
 
     cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
                                            domain="[('cutting_tool_material_id.name', '=', cutting_tool_type)]")
@@ -106,28 +104,6 @@ class ResProductMo(models.Model):
     compaction_way_id = fields.Many2one('maintenance.equipment.image',
                                         '压紧方式', domain=[('type', '=', '压紧方式')])
 
-    name = fields.Char('产品名称', compute='_compute_tool_name', store=True, required=False)
-
-    @api.constrains('seller_ids')
-    def _check_seller_ids(self):
-        if self.categ_type == '表面工艺':
-            if self.seller_ids:
-                if self.seller_ids[0].price == 0.0:
-                    raise UserError("请在该产品【采购】中的【价格】进行输入")
-            else:
-                raise UserError("请在【采购】中输入供应商信息")
-
-    @api.depends('cutting_tool_model_id', 'specification_id')
-    def _compute_tool_name(self):
-        for item in self:
-            if item.cutting_tool_model_id and item.specification_id:
-                name = '%s%s' % (item.cutting_tool_model_id.name, item.specification_id.name)
-                item.name = name
-
-    def _get_process_parameters_product(self, production_process):
-        return self.env['product.template'].search(
-            [('server_product_process_parameters_id', '=', production_process.id)]).seller_ids[0]
-
     @api.onchange('cutting_tool_model_id')
     def _onchange_cutting_tool_model_id(self):
         for item in self:
@@ -554,7 +530,6 @@ class ResProductMo(models.Model):
 
     # bfm下单
     manual_quotation = fields.Boolean('人工编程', default=False, readonly=True)
-    part_number = fields.Char(string='零件图号', readonly=True)
 
     @api.constrains('tool_length')
     def _check_tool_length_size(self):
@@ -631,7 +606,7 @@ class ResProductMo(models.Model):
                     item['model_width'] + model_type.embryo_tolerance) * (
                                     item['model_height'] + model_type.embryo_tolerance),
             'product_model_type_id': model_type.id,
-            # 'model_processing_panel': 'R',
+            'model_processing_panel': 'R',
             'model_machining_precision': item['model_machining_precision'],
             'model_code': item['barcode'],
             'length': item['model_long'],
@@ -649,16 +624,10 @@ class ResProductMo(models.Model):
             'model_process_parameters_ids': [(6, 0, [])] if not item.get(
                 'process_parameters_code') else self.get_process_parameters_id(item['process_parameters_code']),
             'model_remark': item['remark'],
-            'single_manufacturing': True,
             'default_code': '%s-%s' % (order_number, i),
             'manual_quotation': item['manual_quotation'] or False,
-            'part_number': item.get('part_number') or '',
             'active': True,
         }
-        tax_id = self.env['account.tax'].sudo().search(
-            [('type_tax_use', '=', 'sale'), ('amount', '=', item.get('tax')), ('price_include', '=', 'True')])
-        if tax_id:
-            vals.update({'taxes_id': [(6, 0, [int(tax_id)])]})
         copy_product_id.sudo().write(vals)
         product_id.product_tmpl_id.active = False
         return copy_product_id
@@ -752,14 +721,6 @@ class ResProductMo(models.Model):
                         logging.info('create-model_file:%s' % len(vals['model_file']))
             self._sanitize_vals(vals)
         templates = super(ResProductMo, self).create(vals_list)
-        # 产品名称唯一性校验
-        for item in templates:
-            if len(self.search([('name', '=', item.name)])) > 1:
-                raise UserError('产品名称【%s】已存在' % item.name)
-            if item.categ_type == '表面工艺':
-                if len(self.search([('server_product_process_parameters_id', '=',
-                                     item.server_product_process_parameters_id.id)])) > 1:
-                    raise UserError('表面工艺参数为【%s】的产品已存在' % item.server_product_process_parameters_id.name)
         if "create_product_product" not in self._context:
             templates._create_variant_ids()
 
@@ -823,7 +784,7 @@ class ResProductFixture(models.Model):
     diameter = fields.Float('直径(mm)', digits=(16, 2))
 
     # '零点卡盘' 字段
-    weight = fields.Float('重量(kg)', digits=(16, 2))
+    weight = fields.Float('重量(mm)', digits=(16, 2))
     orientation_dish_diameter = fields.Float('定位盘直径(mm)', digits=(16, 2))
     clamping_diameter = fields.Float('装夹直径(mm)', digits=(16, 2))
     clamping_num = fields.Selection([('1', '1'), ('2', '2'), ('4', '4'), ('6', '6'), ('8', '8')], string='装夹单元数')
@@ -970,7 +931,6 @@ class SfMaintenanceEquipmentAndProductTemplate(models.Model):
             raise ValidationError("机床基坐标获取失败")
 
 
-
 class SfMaintenanceEquipmentTool(models.Model):
     _name = 'maintenance.equipment.tool'
     _description = '机床刀位'

sf_manufacturing/models/res_config_setting.py

@@ -1,22 +0,0 @@
-from odoo import models, fields, api
-
-
-class ResConfigSettings(models.TransientModel):
-    _inherit = 'res.config.settings'
-
-    is_agv_task_dispatch = fields.Boolean('是否下发AGV任务', default=False)
-
-    @api.model
-    def get_values(self):
-        values = super(ResConfigSettings, self).get_values()
-        config = self.env['ir.config_parameter'].sudo()
-        is_agv_task_dispatch = config.get_param('is_agv_task_dispatch')
-        values.update(
-            is_agv_task_dispatch=is_agv_task_dispatch,
-        )
-        return values
-
-    def set_values(self):
-        super(ResConfigSettings, self).set_values()
-        config = self.env['ir.config_parameter'].sudo()
-        config.set_param("is_agv_task_dispatch", self.is_agv_task_dispatch or False)

sf_manufacturing/models/stock.py

@@ -1,10 +1,8 @@
 # -*- coding: utf-8 -*-
 import base64
 import qrcode
-from itertools import groupby
 from collections import defaultdict, namedtuple
 import logging
-import io
 import json
 from re import split as regex_split
 from re import findall as regex_findall
@@ -68,7 +66,6 @@ class StockRule(models.Model):
 
     @api.model
     def _run_pull(self, procurements):
-        logging.info(procurements)
         moves_values_by_company = defaultdict(list)
         mtso_products_by_locations = defaultdict(list)
 
@@ -169,6 +166,7 @@ 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)
@@ -176,10 +174,10 @@ 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)
-            moves = self.env['stock.move'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
-                moves_values)
+            moves = self.env['stock.move'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(moves_values)
             # Since action_confirm launch following procurement_group we should activate it.
             moves._action_confirm()
+
         return True
 
     @api.model
@@ -205,34 +203,62 @@ class StockRule(models.Model):
                 productions_values)
 
             # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
-            # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
-
+            self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
             '''
             创建工单
             '''
-            # productions._create_workorder()
-            #
-            self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
+            productions._create_workorder()
+
             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()
-            # 处理 根据制造订单生成的采购单坯料入库时到原材料库，手动将原材料位置该为坯料存货区
-            for production in productions:
-                if production.picking_ids:
-                    product_type_id = production.picking_ids[0].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
-                        for picking_id in production.picking_ids:
-                            if picking_id.picking_type_id.name == '内部调拨':
-                                if picking_id.location_dest_id.product_type != product_type_id:
-                                    picking_id.location_dest_id = location_id.id
-                            elif picking_id.picking_type_id.name == '生产发料':
-                                if picking_id.location_id.product_type != product_type_id:
-                                    picking_id.location_id = location_id.id
+            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)
 
             for production in productions:
                 '''
@@ -279,85 +305,6 @@ class StockRule(models.Model):
                         'product_id': production.product_id.id,
                         'state': 'draft',
                     })
-            all_production = productions
-            grouped_product_ids = {k: list(g) for k, g in groupby(all_production, key=lambda x: x.product_id.id)}
-            # 初始化一个字典来存储每个product_id对应的生产订单名称列表
-            product_id_to_production_names = {}
-            # 对于每个product_id，获取其所有生产订单的名称
-            for product_id, all_production in grouped_product_ids.items():
-                # 为同一个product_id创建一个生产订单名称列表
-                product_id_to_production_names[product_id] = [production.name for production in all_production]
-            for production_item in productions:
-                production_programming = self.env['mrp.production'].search(
-                    [('product_id.id', '=', production_item.product_id.id),
-                     ('origin', '=', production_item.origin)],
-                    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,
-                                                                              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],
-                                                                                  production_item,
-                                                                                  product_id_to_production_names)
-                    #     # 同一个产品多个制造订单对应一个编程单和模型库
-                    #     # 只调用一次fetchCNC，并将所有生产订单的名称作为字符串传递
-                    if not production_item.programming_no:
-                        if not production_programming.programming_no:
-                            production_item.fetchCNC(
-                                ', '.join(product_id_to_production_names[production_item.product_id.id]))
-                        else:
-                            production_item.write({'programming_no': production_programming.programming_no,
-                                                   'programming_state': '编程中'})
         return True
 
 
@@ -441,7 +388,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='name desc')
+                limit=1, order='id DESC')
             if last_serial:
                 if product.categ_id.name == '刀具':
                     return self.env['stock.lot'].get_tool_generate_lot_names1(company, product)
@@ -478,7 +425,6 @@ class ProductionLot(models.Model):
 
     def print_single_method(self):
 
-        print('self.name========== %s' % self.name)
         self.ensure_one()
         qr_code_data = self.qr_code_image
         if not qr_code_data:
@@ -541,11 +487,12 @@ class ProductionLot(models.Model):
 class StockPicking(models.Model):
     _inherit = 'stock.picking'
 
-    surface_technics_parameters_id = fields.Many2one('sf.production.process.parameter', string="表面工艺可选参数")
+    # workorder_in_id = fields.One2many('mrp.workorder', 'picking_in_id')
+    # workorder_out_id = fields.One2many('mrp.workorder', 'picking_out_id')
 
     # 设置外协出入单的名称
     def _get_name_Res(self, rescode):
-        last_picking = self.sudo().search([('name', 'ilike', rescode)], order='create_date desc,id desc', limit=1)
+        last_picking = self.sudo().search([('name', 'like', rescode)], order='create_date desc,id desc', limit=1)
         if not last_picking:
             num = "%04d" % 1
         else:
@@ -561,17 +508,17 @@ class StockPicking(models.Model):
              ('location_dest_id', '=', self.env['stock.location'].search(
                  [('barcode', 'ilike', 'VL-SPOC')]).id),
              ('origin', '=', self.origin)])
-        # if self.id == move_out.picking_id.id:
-        #     if move_out.move_line_ids.workorder_id.state not in ['progress']:
-        #         raise UserError(
-        #             _('该出库单里源单据内的单号为%s的工单还未开始，不能进行验证操作！' % move_out.move_line_ids.workorder_id.name))
+        if self.id == move_out.picking_id.id:
+            if move_out.move_line_ids.workorder_id.state not in ['progress']:
+                raise UserError(
+                    _('该出库单里源单据内的单号为%s的工单还未开始，不能进行验证操作！' % move_out.move_line_ids.workorder_id.name))
         # 入库单验证
         move_in = self.env['stock.move'].search(
             [('location_dest_id', '=', self.env['stock.location'].search(
                 [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
              ('location_id', '=', self.env['stock.location'].search(
                  [('barcode', 'ilike', 'VL-SPOC')]).id),
-             ('origin', '=', self.origin), ('picking_id', '=', self.id)])
+             ('origin', '=', self.origin)])
         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:
                 if move_out.picking_id.state != 'done':
@@ -580,17 +527,18 @@ class StockPicking(models.Model):
         res = super().button_validate()
         if res is True:
             if self.id == move_out.picking_id.id:
-                # if move_out.move_line_ids.workorder_id.state == 'progress':
-                move_in = self.env['stock.move'].search(
-                    [('location_dest_id', '=', self.env['stock.location'].search(
-                        [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
-                     ('location_id', '=', self.env['stock.location'].search(
-                         [('barcode', 'ilike', 'VL-SPOC')]).id),
-                     ('origin', '=', self.origin)])
-                production = self.env['mrp.production'].search([('name', '=', self.origin)])
-                if move_in.state != 'done':
-                    move_in.write({'state': 'assigned'})
-                    self.env['stock.move.line'].create(move_in.get_move_line(production, None))
+                if move_out.move_line_ids.workorder_id.state == 'progress':
+                    move_in = self.env['stock.move'].search(
+                        [('location_dest_id', '=', self.env['stock.location'].search(
+                            [('barcode', 'ilike', 'WH-PREPRODUCTION')]).id),
+                         ('location_id', '=', self.env['stock.location'].search(
+                             [('barcode', 'ilike', 'VL-SPOC')]).id),
+                         ('origin', '=', self.origin)])
+                    # purchase = self.env['purchase.order'].search([('origin', '=', self.origin)])
+                    if move_in:
+                        move_in.write({'state': 'assigned'})
+                        purchase = self.env['purchase.order'].search([('origin', '=', self.origin)])
+                        self.env['stock.move.line'].create(move_in.get_move_line(purchase, None))
 
         return res
 
@@ -598,7 +546,7 @@ class StockPicking(models.Model):
     def create_outcontract_picking(self, sorted_workorders_arr, item):
         m = 0
         for sorted_workorders in sorted_workorders_arr:
-            # pick_ids = []
+            pick_ids = []
             if m == 0:
                 outcontract_stock_move = self.env['stock.move'].search(
                     [('workorder_id', '=', sorted_workorders.id), ('production_id', '=', item.id)])
@@ -617,7 +565,7 @@ class StockPicking(models.Model):
                                                                           outcontract_picking_type_out))
                     picking_out = self.create(
                         moves_out._get_new_picking_values_Res(item, sorted_workorders, 'WH/OCOUT/'))
-                    # pick_ids.append(picking_out.id)
+                    pick_ids.append(picking_out.id)
                     moves_out.write(
                         {'picking_id': picking_out.id, 'state': 'waiting', 'workorder_id': sorted_workorders.id})
                     moves_out._assign_picking_post_process(new=new_picking)
@@ -626,12 +574,12 @@ class StockPicking(models.Model):
                                                                           outcontract_picking_type_in))
                     picking_in = self.create(
                         moves_in._get_new_picking_values_Res(item, sorted_workorders, 'WH/OCIN/'))
-                    # pick_ids.append(picking_in.id)
+                    pick_ids.append(picking_in.id)
                     moves_in.write(
                         {'picking_id': picking_in.id, 'state': 'waiting', 'workorder_id': sorted_workorders.id})
                     moves_in._assign_picking_post_process(new=new_picking)
                     m += 1
-            # sorted_workorders.write({'picking_ids': [(6, 0, pick_ids)]})
+            sorted_workorders.write({'picking_ids': [(6, 0, pick_ids)]})
 
 
 class ReStockMove(models.Model):
@@ -662,7 +610,6 @@ class ReStockMove(models.Model):
         return {
             'name': self.env['stock.picking']._get_name_Res(rescode),
             'origin': item.name,
-            'surface_technics_parameters_id': sorted_workorders.surface_technics_parameters_id.id,
             'company_id': self.mapped('company_id').id,
             'user_id': False,
             'move_type': self.mapped('group_id').move_type or 'direct',
@@ -673,7 +620,7 @@ class ReStockMove(models.Model):
             'state': 'confirmed',
         }
 
-    def get_move_line(self, production_id, sorted_workorders):
+    def get_move_line(self, purchase, sorted_workorders):
         return {
             'move_id': self.id,
             'product_id': self.product_id.id,
@@ -682,10 +629,10 @@ class ReStockMove(models.Model):
             'location_dest_id': self.picking_id.location_dest_id.id,
             'picking_id': self.picking_id.id,
             'reserved_uom_qty': 1.0,
-            'lot_id': production_id.move_line_raw_ids.lot_id.id,
+            'lot_id': purchase.picking_ids.move_line_ids.lot_id.id,
             'company_id': self.company_id.id,
-            # 'workorder_id': '' if not sorted_workorders else sorted_workorders.id,
-            # 'production_id': '' if not sorted_workorders else sorted_workorders.production_id.id,
+            'workorder_id': '' if not sorted_workorders else sorted_workorders.id,
+            'production_id': '' if not sorted_workorders else sorted_workorders.production_id.id,
             'state': 'assigned',
         }
 
@@ -721,14 +668,12 @@ class ReStockMove(models.Model):
         else:
             view = self.env.ref('stock.view_stock_move_nosuggest_operations')
 
-        if self.state == "assigned":
-            if self.product_id.tracking == "serial":
-                if self.product_id.categ_id.name == '刀具':
-                    self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin)
-                else:
-                    self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id)
-            elif self.product_id.tracking == "lot":
-                self._put_tool_lot(self.company_id, self.product_id, self.origin)
+        if self.product_id.tracking == "serial" and self.state == "assigned":
+            print(self.origin)
+            if self.product_id.categ_id.name == '刀具':
+                self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin)
+            else:
+                self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id)
 
         return {
             'name': _('Detailed Operations'),
@@ -753,58 +698,6 @@ class ReStockMove(models.Model):
             ),
         }
 
-    def put_move_line(self):
-        """
-        确认订单时,自动分配序列号
-        """
-        if self.product_id.tracking == "serial":
-            if self.product_id.categ_id.name == '刀具':
-                self.next_serial = self._get_tool_next_serial(self.company_id, self.product_id, self.origin)
-            else:
-                self.next_serial = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id)
-            self._generate_serial_numbers()
-            for item in self.move_line_nosuggest_ids:
-                if item.lot_name:
-                    lot_name = item.lot_name
-                    if item.product_id.categ_id.name == '坯料':
-                        lot_name = lot_name.split('[', 1)[0]
-                    item.lot_qr_code = self.compute_lot_qr_code(lot_name)
-
-    def _put_tool_lot(self, company, product, origin):
-        if product.tracking == "lot" and self.product_id.categ_id.name == '刀具':
-            if not self.move_line_nosuggest_ids:
-                lot_code = '%s-%s-%s' % ('%s-T-DJWL-%s' % (
-                    product.cutting_tool_model_id.code.split('-')[0], product.cutting_tool_material_id.code),
-                                         datetime.now().strftime("%Y%m%d"), origin)
-                move_line_ids = self.env['stock.move.line'].sudo().search([('lot_name', 'like', lot_code)], limit=1,
-                                                                          order='id desc')
-                if not move_line_ids:
-                    lot_code = '%s-001' % lot_code
-                else:
-                    lot_code = '%s-%03d' % (lot_code, int(move_line_ids.lot_name[-3:]) + 1)
-                lot_names = self.env['stock.lot'].generate_lot_names(lot_code, 1)
-                move_lines_commands = self._generate_serial_move_line_commands_tool_lot(lot_names)
-                self.write({'move_line_nosuggest_ids': move_lines_commands})
-                for item in self.move_line_nosuggest_ids:
-                    if item.lot_name:
-                        item.lot_qr_code = self.compute_lot_qr_code(item.lot_name)
-
-    def compute_lot_qr_code(self, lot_name):
-        qr = qrcode.QRCode(
-            version=1,
-            error_correction=qrcode.constants.ERROR_CORRECT_L,
-            box_size=10,
-            border=4,
-        )
-        qr.add_data(lot_name)
-        qr.make(fit=True)
-        img = qr.make_image(fill_color="black", back_color="white")
-        buffer = io.BytesIO()
-        img.save(buffer, format="PNG")
-        binary_data = buffer.getvalue()
-        data = base64.b64encode(binary_data).decode()  # 确保返回的是字符串形式的数据
-        return data
-
     def _get_tool_next_serial(self, company, product, origin):
         """Return the next serial number to be attributed to the product."""
         if product.tracking == "serial":
@@ -818,67 +711,6 @@ class ReStockMove(models.Model):
             else:
                 return "%s-T-%s-%s-%03d" % (split_codes[0], origin, product.specification_id.name, 1)
 
-    def _generate_serial_move_line_commands_tool_lot(self, lot_names, origin_move_line=None):
-        """Return a list of commands to update the move lines (write on
-        existing ones or create new ones).
-        Called when user want to create and assign multiple serial numbers in
-        one time (using the button/wizard or copy-paste a list in the field).
-
-        :param lot_names: A list containing all serial number to assign.
-        :type lot_names: list
-        :param origin_move_line: A move line to duplicate the value from, default to None
-        :type origin_move_line: record of :class:`stock.move.line`
-        :return: A list of commands to create/update :class:`stock.move.line`
-        :rtype: list
-        """
-        self.ensure_one()
-
-        # Select the right move lines depending of the picking type configuration.
-        move_lines = self.env['stock.move.line']
-        if self.picking_type_id.show_reserved:
-            move_lines = self.move_line_ids.filtered(lambda ml: not ml.lot_id and not ml.lot_name)
-        else:
-            move_lines = self.move_line_nosuggest_ids.filtered(lambda ml: not ml.lot_id and not ml.lot_name)
-
-        loc_dest = origin_move_line and origin_move_line.location_dest_id
-        move_line_vals = {
-            'picking_id': self.picking_id.id,
-            'location_id': self.location_id.id,
-            'product_id': self.product_id.id,
-            'product_uom_id': self.product_id.uom_id.id,
-            'qty_done': self.product_uom_qty,
-        }
-        if origin_move_line:
-            # `owner_id` and `package_id` are taken only in the case we create
-            # new move lines from an existing move line. Also, updates the
-            # `qty_done` because it could be usefull for products tracked by lot.
-            move_line_vals.update({
-                'owner_id': origin_move_line.owner_id.id,
-                'package_id': origin_move_line.package_id.id,
-                'qty_done': origin_move_line.qty_done or 1,
-            })
-
-        move_lines_commands = []
-        qty_by_location = defaultdict(float)
-        for lot_name in lot_names:
-            # We write the lot name on an existing move line (if we have still one)...
-            if move_lines:
-                move_lines_commands.append((1, move_lines[0].id, {
-                    'lot_name': lot_name,
-                    'qty_done': 1,
-                }))
-                qty_by_location[move_lines[0].location_dest_id.id] += 1
-                move_lines = move_lines[1:]
-            # ... or create a new move line with the serial name.
-            else:
-                loc = loc_dest or self.location_dest_id._get_putaway_strategy(self.product_id, quantity=1,
-                                                                              packaging=self.product_packaging_id,
-                                                                              additional_qty=qty_by_location)
-                move_line_cmd = dict(move_line_vals, lot_name=lot_name, location_dest_id=loc.id)
-                move_lines_commands.append((0, 0, move_line_cmd))
-                qty_by_location[loc.id] += 1
-        return move_lines_commands
-
 
 class ReStockQuant(models.Model):
     _inherit = 'stock.quant'

sf_manufacturing/security/ir.model.access.csv

@@ -1,9 +1,8 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
 access_sf_cnc_processing_group_sf_mrp_user,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cnc_processing_manager,sf_cnc_processing,model_sf_cnc_processing,sf_base.group_sf_mrp_manager,1,1,1,0
-access_sf_cmm_program_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
+access_sf_cmm_program_group_sf_mrp_user_group_sf_mrp_user,sf_cmm_program_group_sf_mrp_user,model_sf_cmm_program,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_cmm_program_group_sf_mrp_manager,sf_cmm_program_group_sf_mrp_manager,model_sf_cmm_program,sf_base.group_sf_mrp_manager,1,0,0,0
-access_sf_cmm_program_admin,sf_cmm_program_admin,model_sf_cmm_program,base.group_system,1,1,1,1
 access_sf_model_type_group_sf_mrp_user,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_user,1,0,0,0
 access_sf_model_type_admin,sf_model_type_admin,model_sf_model_type,base.group_system,1,1,1,0
 access_sf_model_type_manager,sf_model_type,model_sf_model_type,sf_base.group_sf_mrp_manager,1,1,1,0
@@ -29,7 +28,7 @@ access_mrp_workorder_group_sf_mrp_user,mrp_workorder,model_mrp_workorder,sf_base
 access_mrp_workorder_manager,mrp_workorder,model_mrp_workorder,sf_base.group_sf_mrp_manager,1,1,1,0
 access_mrp_workcenter_group_sf_mrp_user,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workcenter_manager,mrp_workcenter,model_mrp_workcenter,sf_base.group_sf_mrp_manager,1,1,1,0
-access_mrp_workcenter_productivity_group_sf_equipment_user,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_equipment_user,1,1,1,0
+access_mrp_workcenter_productivity_group_sf_mrp_user,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_user,1,0,0,0
 access_mrp_workcenter_productivity_manager,mrp_workcenter_productivity,model_mrp_workcenter_productivity,sf_base.group_sf_mrp_manager,1,1,1,0
 access_sf_workpiece_delivery_group_sf_order_user,sf_workpiece_delivery_group_sf_order_user,model_sf_workpiece_delivery,sf_base.group_sf_order_user,1,1,1,0
 access_sf_workpiece_delivery_group_sf_equipment_user,sf_workpiece_delivery_group_sf_equipment_user,model_sf_workpiece_delivery,sf_base.group_sf_equipment_user,1,1,0,0
@@ -141,21 +140,3 @@ access_sf_model_type_group_sf_stock_manager,sf_model_type_group_sf_mrp_manager,m
 access_mrp_bom_byproduct_group_sf_stock_user,mrp_bom_byproduct_group_sf_stock_user,mrp.model_mrp_bom_byproduct,sf_base.group_sf_stock_user,1,0,0,0
 access_mrp_bom_byproduct_group_sf_stock_manager,mrp_bom_byproduct_group_sf_mrp_manager,mrp.model_mrp_bom_byproduct,sf_base.group_sf_stock_manager,1,0,0,0
 
-access_sf_rework_wizard_group_sf_order_user,sf_rework_wizard_group_sf_order_user,model_sf_rework_wizard,sf_base.group_sf_order_user,1,1,1,0
-access_sf_rework_wizard_group_plan_dispatch,sf_rework_wizard_group_plan_dispatch,model_sf_rework_wizard,sf_base.group_plan_dispatch,1,1,1,0
-access_sf_detection_result_group_sf_order_user,sf_detection_result_group_sf_order_user,model_sf_detection_result,sf_base.group_sf_order_user,1,1,1,0
-access_sf_detection_result_group_plan_dispatch,sf_detection_result_group_plan_dispatch,model_sf_detection_result,sf_base.group_plan_dispatch,1,1,1,0
-access_sf_detection_result_group_sf_equipment_user,sf_detection_result_group_sf_equipment_user,model_sf_detection_result,sf_base.group_sf_equipment_user,1,1,1,0
-access_sf_processing_panel_group_sf_order_user,sf_processing_panel_group_sf_order_user,model_sf_processing_panel,sf_base.group_sf_order_user,1,1,1,0
-access_sf_production_wizard_group_sf_order_user,sf_production_wizard_group_sf_order_user,model_sf_production_wizard,sf_base.group_sf_order_user,1,1,1,0
-access_sf_processing_panel_group_plan_dispatch,sf_processing_panel_group_plan_dispatch,model_sf_processing_panel,sf_base.group_plan_dispatch,1,1,1,0
-
-access_sf_agv_scheduling_admin,sf_agv_scheduling_admin,model_sf_agv_scheduling,base.group_system,1,1,1,1
-access_sf_agv_scheduling_group_sf_order_user,sf_agv_scheduling_group_sf_order_user,model_sf_agv_scheduling,sf_base.group_sf_order_user,1,1,1,0
-access_sf_agv_scheduling_group_sf_mrp_manager,sf_agv_scheduling_group_sf_mrp_manager,model_sf_agv_scheduling,sf_base.group_sf_mrp_manager,1,1,1,0
-access_sf_agv_scheduling_group_sf_equipment_user,sf_agv_scheduling_group_sf_equipment_user,model_sf_agv_scheduling,sf_base.group_sf_equipment_user,1,1,1,0
-
-
-
-
-

sf_manufacturing/static/src/js/customRFID.js

@@ -1,36 +1,16 @@
 var RFID = ''
 $(document).off('keydown')
-$(document).on('keydown', 'body.o_web_client', function (e) {
+console.log(2222)
+$(document).on('keydown', '.modal.d-block.o_technical_modal,body.o_web_client', function (e) {
+    const dom = $('.customRFID')
+    if(!dom.length) return
     setTimeout(() => {
         RFID = ''
-
     }, 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)
-        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 = '';
+        if(!RFID || RFID.length <= 3) return;
+        dom.children('span').text(RFID)
+        RFID = ''
         return;
     }
     RFID += e.key

sf_manufacturing/static/src/js/workpiece_delivery_wizard_confirm.js

@@ -1,49 +0,0 @@
-odoo.define('sf_manufacturing.action_dispatch_confirm', function (require) {
-    const core = require('web.core');
-    const ajax = require('web.ajax');
-    const Dialog = require('web.Dialog');
-    var rpc = require('web.rpc');
-    var _t = core._t;
-
-    async function dispatch_confirm(parent, {params}) {
-        const dialog = new Dialog(parent, {
-            title: "确认",
-            $content: $('<div>').append("请确认是否仅配送" + params.workorder_count + "个工件？"),
-            buttons: [
-                { text: "确认", classes: 'btn-primary', close: true, click: () => dispatchConfirmed(parent, params) },
-                { text: "取消", close: true },
-            ],
-        });
-        dialog.open();
-
-
-        async function dispatchConfirmed(parent, params) {
-            console.log(parent, 'parent')
-            rpc.query({
-                model: 'sf.workpiece.delivery.wizard',
-                method: 'confirm',
-                args: [params.active_id]
-                ,
-                kwargs: {
-                    context: params.context,
-                }
-            }).then(res => {
-                parent.services.action.doAction({
-                     'type': 'ir.actions.client',
-                     'tag': 'display_notification',
-                     'target': 'new',
-                     'params': {
-                         'message': '任务下发成功！AGV任务调度编号为【' + res.name + '】',
-                         'type': 'success',
-                         'sticky': false,
-                         'next': {'type': 'ir.actions.act_window_close'},
-                     }
-                 });
-            })
-
-        }
-    }
-
-    core.action_registry.add('dispatch_confirm', dispatch_confirm);
-    return dispatch_confirm;
-});