Accept Merge Request #1211: (release/release_2.2 -> master)

Merge Request: SPRINT-MES-F-2024-04、05版本更新

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1211

jikimo_auto_backup/__init__.py

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

jikimo_auto_backup/__manifest__.py

@@ -0,0 +1,36 @@
+# -*- coding: utf-8 -*-
+{
+    'name': "Database auto-backup",
+    'summary': 'Automated backups',
+    'description': """
+        The Database Auto-Backup module enables the user to make configurations for the automatic backup of the database. 
+        Backups can be taken on the local system or on a remote server, through SFTP.
+        You only have to specify the hostname, port, backup location and databasename (all will be pre-filled by default with correct data.
+        If you want to write to an external server with SFTP you will need to provide the IP, username and password for the remote backups.
+        The base of this module is taken from Odoo SA V6.1 (https://www.odoo.com/apps/modules/6.0/auto_backup/) and then upgraded and heavily expanded.
+        This module is made and provided by Yenthe Van Ginneken (Oocademy).
+        Automatic backup for all such configured databases can then be scheduled as follows:  
+                      
+        1) Go to Settings / Technical / Automation / Scheduled actions.
+        2) Search the action 'Backup scheduler'.
+        3) Set it active and choose how often you wish to take backups.
+        4) If you want to write backups to a remote location you should fill in the SFTP details.
+    """,
+    'author': "Yenthe Van Ginneken",
+    'website': "http://www.odoo.yenthevg.com",
+    'category': 'Administration',
+    'version': '16.0.0.1',
+    'installable': True,
+    'license': 'LGPL-3',
+
+    # any module necessary for this one to work correctly
+    'depends': ['base'],
+
+    # always loaded
+    'data': [
+        'security/user_groups.xml',
+        'security/ir.model.access.csv',
+        'views/backup_view.xml',
+        'data/backup_data.xml',
+    ],
+}

jikimo_auto_backup/data/backup_data.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+<odoo>
+    <data noupdate="1">
+        <record id="backup_scheduler" model="ir.cron">
+            <field name="interval_type">days</field>
+            <field name="name">Backup scheduler</field>
+            <field name="numbercall">-1</field>
+            <field name="priority">5</field>
+            <field name="doall">False</field>
+            <field name="active">False</field>
+            <field name="interval_number">1</field>
+            <field name="model_id" ref="model_db_backup"/>
+            <field name="state">code</field>
+            <field name="code">model.schedule_backup()</field>
+        </record>
+    </data>
+</odoo>

jikimo_auto_backup/i18n/ar.po

@@ -0,0 +1,314 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# * auto_backup
+#
+# SaFi J. <info@daleeltech.com>, 2015.
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 8.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2015-03-26 14:17+0000\n"
+"PO-Revision-Date: 2015-12-13 10:46+0300\n"
+"Last-Translator: SaFi J. <info@daleeltech.com>\n"
+"Language-Team: team@daleeltech.com\n"
+"Language: ar\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+
+
+
+#. module: auto_backup
+#: code:addons/auto_backup/backup_scheduler.py:137
+#, python-format
+msgid "%s"
+msgstr "%s"
+
+#. module: auto_backup
+#: help:db.backup,bkp_dir:0
+msgid "Absolute path for storing the backups"
+msgstr "المسار الكامل لحفظ النسخ الاحتياطي"
+
+#. module: auto_backup
+#: field:db.backup,sendmailsftpfail:0
+msgid "Auto. E-mail on backup fail"
+msgstr "إرسال بريد إلكتروني تلقائياً في حالة فشل النسخ الاحتياطي"
+
+#. module: auto_backup
+#: field:db.backup,autoremove:0
+msgid "Auto. Remove Backups"
+msgstr "إزالة النسخ الاحتياطية تلقائياً"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Automatic backups of the database can be scheduled as follows:"
+msgstr "النسخ الاحتياطي التلقائي لقاعدة البيانات يمكن جدولته كالتالي"
+
+#. module: auto_backup
+#: field:db.backup,bkp_dir:0
+msgid "Backup Directory"
+msgstr "دليل النسخ الاحتياطي"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_tree
+msgid "Backups"
+msgstr "النسخ الاحتياطية"
+
+#. module: auto_backup
+#: help:db.backup,daystokeepsftp:0
+msgid "Choose after how many days the backup should be deleted from the FTP server. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days from the FTP server."
+msgstr ""
+"اختر بعد كم من الأيام سيتم حذف النسخ الاحتياطي من خادم FTP مثلاً :\n إذا أدخلت "
+"5 فإن النسخ الاحتياطية سيتم إزالتها من خادم FTP بعد 5 أيام."
+
+#. module: auto_backup
+#: help:db.backup,daystokeep:0
+msgid "Choose after how many days the backup should be deleted. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days."
+msgstr ""
+"اختر بعد كم من الأيام سيتم حذف النسخ الاحتياطي مثلاً :\n إذا أدخلت 5 فإن النسخ "
+"الاحتياطية سيتم إزالتها بعد 5 أيام."
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup_conf_form
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure Backup"
+msgstr "إعدادات النسخ الإحتياطي"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Contact us!"
+msgstr "اتصل بنا!"
+
+#. module: auto_backup
+#: field:db.backup,create_uid:0
+msgid "Created by"
+msgstr "تم ألإنشاء بواسطة"
+
+#. module: auto_backup
+#: field:db.backup,create_date:0
+msgid "Created on"
+msgstr "تم ألإنشاء في"
+
+#. module: auto_backup
+#: field:db.backup,name:0
+msgid "Database"
+msgstr "قاعدة البيانات"
+
+#. module: auto_backup
+#: help:db.backup,name:0
+msgid "Database you want to schedule backups for"
+msgstr "قاعدة البيانات التي تريد جدولة النسخ الاحتياطي لها"
+
+#. module: auto_backup
+#: field:db.backup,emailtonotify:0
+msgid "E-mail to notify"
+msgstr "تنبيه البريد الإلكتروني"
+
+#. module: auto_backup
+#: code:addons/auto_backup/backup_scheduler.py:106
+#: constraint:db.backup:0
+#, python-format
+msgid "Error ! No such database exists!"
+msgstr "خطأ ! لا وجود لقاعدة البيانات هذه !"
+
+#. module: auto_backup
+#: help:db.backup,emailtonotify:0
+msgid "Fill in the e-mail where you want to be notified that the backup failed on the FTP."
+msgstr ""
+"ادخل عنوان البريد الإلكتروني الذي تريد تنبيهك من خلاله عند فشل النسخ "
+"الاحتياطي على FTP."
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "For example: /odoo/backups/"
+msgstr "مثلاً : /odoo/backups/"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Go to Settings / Technical / Automation / Scheduled Actions."
+msgstr "اذهب إلى الإعدادات / التقني / ألأتمته / جدولة الإخزاءات."
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Help"
+msgstr "المساعدة"
+
+#. module: auto_backup
+#: field:db.backup,host:0
+msgid "Host"
+msgstr "المضيف"
+
+#. module: auto_backup
+#: field:db.backup,id:0
+msgid "ID"
+msgstr "المعرف"
+
+#. module: auto_backup
+#: field:db.backup,sftpip:0
+msgid "IP Address SFTP Server"
+msgstr "عنوان بروتوكول الأنترنت لخادم SFTP"
+
+#. module: auto_backup
+#: help:db.backup,sendmailsftpfail:0
+msgid "If you check this option you can choose to automaticly get e-mailed when the backup to the external server failed."
+msgstr ""
+"إذا قمت بتأشير هذا الخيار ستستطيع اختيار استلام البريد الإلكتروني تلقائياً "
+"عند فشل النسخ الاحتياطي للخادوم الخارجي."
+
+#. module: auto_backup
+#: help:db.backup,autoremove:0
+msgid "If you check this option you can choose to automaticly remove the backup after xx days"
+msgstr ""
+"إذا قمت بتأشير هذا الخيار ستستطيع اختيار الإزالة التلقائية للنسخ الاحتياطي "
+"بعد س من الأيام"
+
+#. module: auto_backup
+#: help:db.backup,sftpwrite:0
+msgid "If you check this option you can specify the details needed to write to a remote server with SFTP."
+msgstr ""
+"إذا قمت بتأشير هذا الخيار ستستطيع تحديد التفاصيل المطلوبة للكتابة على الخادم "
+"البعيد من خلال SFTP."
+
+#. module: auto_backup
+#: field:db.backup,write_uid:0
+msgid "Last Updated by"
+msgstr "آخر تحديث بواسطة"
+
+#. module: auto_backup
+#: field:db.backup,write_date:0
+msgid "Last Updated on"
+msgstr "آخر تحديث في"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Local backup configuration"
+msgstr "إعدادات النسخ الاحتياطي المحلي"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Need more help?"
+msgstr "هل تحتاج لمزيد من المساعدة ؟"
+
+#. module: auto_backup
+#: field:db.backup,sftppassword:0
+msgid "Password User SFTP Server"
+msgstr "كلمة المرور لمستخدم خادم SFTP"
+
+#. module: auto_backup
+#: field:db.backup,sftppath:0
+msgid "Path external server"
+msgstr "المسار الخارجي للخادم"
+
+#. module: auto_backup
+#: field:db.backup,port:0
+msgid "Port"
+msgstr "المنفذ"
+
+#. module: auto_backup
+#: field:db.backup,daystokeepsftp:0
+msgid "Remove SFTP after x days"
+msgstr "الإزالة من خادم SFTP بعد س من الأيام"
+
+#. module: auto_backup
+#: field:db.backup,daystokeep:0
+msgid "Remove after x days"
+msgstr "الإزالة بعد س من الأيام"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "SFTP"
+msgstr "SFTP"
+
+#. module: auto_backup
+#: field:db.backup,sftpport:0
+msgid "SFTP Port"
+msgstr "منفذ SFTP"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_search
+msgid "Search options"
+msgstr "خيارات البحث"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Search the action named 'Backup scheduler'."
+msgstr "ابحث عن الأجزاء المسمى 'Backup scheduler'."
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Set the scheduler to active and fill in how often you want backups generated."
+msgstr "قم بتفعيل الجدولة واملأ كم تربد عادة توليد النسخ الاحتياطي."
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Test"
+msgstr "اختبار"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Test SFTP Connection"
+msgstr "اختبار توصيل SFTP"
+
+#. module: auto_backup
+#: help:db.backup,sftpip:0
+msgid "The IP address from your remote server. For example 192.168.0.1"
+msgstr "عنوان بروتوكول الإنترنت من خادومك البعيد. مثلاً 192.168.0.1"
+
+#. module: auto_backup
+#: help:db.backup,sftppath:0
+msgid "The location to the folder where the dumps should be written to. For example /odoo/backups/.\n"
+"Files will then be written to /odoo/backups/ on your remote server."
+msgstr ""
+"موقع المجلد التي يجب كتابة ملفات النسخ عليه. مثلاً /odoo/backups/.\n"
+"وحينها سيتم كتابة الملفات إلى /odoo/backups/ على خادومك البعيد."
+
+#. module: auto_backup
+#: help:db.backup,sftppassword:0
+msgid "The password from the user where the SFTP connection should be made with. This is the password from the user on the external server."
+msgstr ""
+"كلمة المرور الذي من المفترض عمل اتصال SFTP من بها. هذا هي كلمة المرور على "
+"الخادم الخارجي."
+
+#. module: auto_backup
+#: help:db.backup,sftpport:0
+msgid "The port on the FTP server that accepts SSH/SFTP calls."
+msgstr "المنفذ على خادم FTP الذي يقبل طلبات SSH/SFTP."
+
+#. module: auto_backup
+#: help:db.backup,sftpusername:0
+msgid "The username where the SFTP connection should be made with. This is the user on the external server."
+msgstr ""
+"اسم المستخدم الذي من المفترض عمل اتصال SFTP من به. هذا هو المستخدم على "
+"الخادم الخارجي."
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "This configures the scheduler for automatic backup of the given database running on given host at given port on regular intervals."
+msgstr ""
+"هذا الإعداد سيجدول النسخ الاحتياطي التلقائي لقاعدة بيانات معينة وسينفذ على "
+"مضيف معين بمنفذ معين خلال فترات متتابعة. "
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Use SFTP with caution! This writes files to external servers under the path you specify."
+msgstr ""
+"استخدم SFTP بحذر ! لأن هذا يؤدي لكتابة ملفات لخوادم خارجية على المسار الذي "
+"حددته."
+
+#. module: auto_backup
+#: field:db.backup,sftpusername:0
+msgid "Username SFTP Server"
+msgstr "أسم المستخدم لخادم SFTP"
+
+#. module: auto_backup
+#: view:db.backup:auto_backup.view_backup_conf_form
+msgid "Warning:"
+msgstr "تحذير :"
+
+#. module: auto_backup
+#: field:db.backup,sftpwrite:0
+msgid "Write to external server with sftp"
+msgstr "الكتابة على خادم خارجي من خلال sftp"

jikimo_auto_backup/i18n/bg.po

@@ -0,0 +1,158 @@
+# Bulgarian translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:49+0000\n"
+"PO-Revision-Date: 2011-03-30 07:20+0000\n"
+"Last-Translator: Dimitar Markov <dimitar.markov@gmail.com>\n"
+"Language-Team: Bulgarian <bg@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
+
+#. module: auto_backup
+#: help:db.backup,name:0
+msgid "Database you want to schedule backups for"
+msgstr ""
+
+#. module: auto_backup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Името на обекта трябва да започва с x_ и не може да никакви специални знаци !"
+
+#. module: auto_backup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Невалидно име на модел при задаване на действие"
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "db.backup"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup_conf_form
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure Backup"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Test"
+msgstr "Тестване"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "IP Configuration"
+msgstr ""
+
+#. module: auto_backup
+#: help:db.backup,bkp_dir:0
+msgid "Absolute path for storing the backups"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.module.module,shortdesc:auto_backup.module_meta_information
+msgid "Database Auto-Backup"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Database Configuration"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "4) Set other values as per your preference"
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,host:0
+msgid "Host"
+msgstr "Хост"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"Automatic backup of all the databases under this can be scheduled as "
+"follows: "
+msgstr ""
+
+#. module: auto_backup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,bkp_dir:0
+msgid "Backup Directory"
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,name:0
+msgid "Database"
+msgstr "База данни"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "2) Schedule new action(create a new record)"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.module.module,description:auto_backup.module_meta_information
+msgid ""
+"The generic Open ERP Database Auto-Backup system enables the user to make "
+"configurations for the automatic backup of the database.\n"
+"User simply requires to specify host & port under IP Configuration & "
+"database(on specified host running at specified port) and backup "
+"directory(in which all the backups of the specified database will be stored) "
+"under Database Configuration.\n"
+"\n"
+"Automatic backup for all such configured databases under this can then be "
+"scheduled as follows:  \n"
+"                      \n"
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions\n"
+"2) Schedule new action(create a new record)\n"
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'\n"
+"4) Set other values as per your preference"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Help"
+msgstr "Помощ"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"This configures the scheduler for automatic backup of the given database "
+"running on given host at given port on regular intervals."
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,port:0
+msgid "Port"
+msgstr "Порт"

jikimo_auto_backup/i18n/ca.po

@@ -0,0 +1,157 @@
+# Catalan translation for openobject-addons
+# Copyright (c) 2014 Rosetta Contributors and Canonical Ltd 2014
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2014.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:49+0000\n"
+"PO-Revision-Date: 2014-10-20 06:41+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Catalan <ca@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2014-10-21 06:30+0000\n"
+"X-Generator: Launchpad (build 17203)\n"
+
+#. module: auto_backup
+#: help:db.backup,name:0
+msgid "Database you want to schedule backups for"
+msgstr ""
+
+#. module: auto_backup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+
+#. module: auto_backup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "db.backup"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup_conf_form
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure Backup"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Test"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "IP Configuration"
+msgstr ""
+
+#. module: auto_backup
+#: help:db.backup,bkp_dir:0
+msgid "Absolute path for storing the backups"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.module.module,shortdesc:auto_backup.module_meta_information
+msgid "Database Auto-Backup"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Database Configuration"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "4) Set other values as per your preference"
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,host:0
+msgid "Host"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"Automatic backup of all the databases under this can be scheduled as "
+"follows: "
+msgstr ""
+
+#. module: auto_backup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,bkp_dir:0
+msgid "Backup Directory"
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,name:0
+msgid "Database"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "2) Schedule new action(create a new record)"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.module.module,description:auto_backup.module_meta_information
+msgid ""
+"The generic Open ERP Database Auto-Backup system enables the user to make "
+"configurations for the automatic backup of the database.\n"
+"User simply requires to specify host & port under IP Configuration & "
+"database(on specified host running at specified port) and backup "
+"directory(in which all the backups of the specified database will be stored) "
+"under Database Configuration.\n"
+"\n"
+"Automatic backup for all such configured databases under this can then be "
+"scheduled as follows:  \n"
+"                      \n"
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions\n"
+"2) Schedule new action(create a new record)\n"
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'\n"
+"4) Set other values as per your preference"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Help"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"This configures the scheduler for automatic backup of the given database "
+"running on given host at given port on regular intervals."
+msgstr ""
+
+#. module: auto_backup
+#: field:db.backup,port:0
+msgid "Port"
+msgstr ""

jikimo_auto_backup/i18n/es.po

@@ -0,0 +1,166 @@
+# Spanish translation for openobject-addons
+# Copyright (c) 2011 Rosetta Contributors and Canonical Ltd 2011
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2011.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:49+0000\n"
+"PO-Revision-Date: 2011-08-23 19:48+0000\n"
+"Last-Translator: mgaja (GrupoIsep.com) <Unknown>\n"
+"Language-Team: Spanish <es@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
+
+#. module: auto_backup
+#: help:db.backup,name:0
+msgid "Database you want to schedule backups for"
+msgstr "Base de datos que desea programar copias de seguridad para"
+
+#. module: auto_backup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"¡El objeto debe empezar con  x_ y no puede contener ningún carácter especial!"
+
+#. module: auto_backup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nombre del modelo inválido en la definición de acción."
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "db.backup"
+msgstr "backup.BBDD"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions"
+msgstr ""
+"1) Vaya a Administración / Configuración / Programador / Acciones programadas"
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup_conf_form
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure Backup"
+msgstr "Configurar copia de seguridad"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Test"
+msgstr "Prueba"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "IP Configuration"
+msgstr "Configuración IP"
+
+#. module: auto_backup
+#: help:db.backup,bkp_dir:0
+msgid "Absolute path for storing the backups"
+msgstr "Ruta absoluta para el almacenamiento de las copias de seguridad"
+
+#. module: auto_backup
+#: model:ir.module.module,shortdesc:auto_backup.module_meta_information
+msgid "Database Auto-Backup"
+msgstr "Copia de seguridad automática de Base de datos"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Database Configuration"
+msgstr "Configuración de Base de Datos"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "4) Set other values as per your preference"
+msgstr "4) Establecer los demás valores según su preferencia"
+
+#. module: auto_backup
+#: field:db.backup,host:0
+msgid "Host"
+msgstr "Host"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"Automatic backup of all the databases under this can be scheduled as "
+"follows: "
+msgstr ""
+"Copia de seguridad automática de las bases de datos en virtud de este puede "
+"ser programado de la siguiente manera: "
+
+#. module: auto_backup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "¡XML inválido para la definición de la vista!"
+
+#. module: auto_backup
+#: field:db.backup,bkp_dir:0
+msgid "Backup Directory"
+msgstr "Directorio de la copia de seguridad"
+
+#. module: auto_backup
+#: field:db.backup,name:0
+msgid "Database"
+msgstr "Base de datos"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "2) Schedule new action(create a new record)"
+msgstr "2) Lista de nuevas acciones (crear un nuevo registro)"
+
+#. module: auto_backup
+#: model:ir.module.module,description:auto_backup.module_meta_information
+msgid ""
+"The generic Open ERP Database Auto-Backup system enables the user to make "
+"configurations for the automatic backup of the database.\n"
+"User simply requires to specify host & port under IP Configuration & "
+"database(on specified host running at specified port) and backup "
+"directory(in which all the backups of the specified database will be stored) "
+"under Database Configuration.\n"
+"\n"
+"Automatic backup for all such configured databases under this can then be "
+"scheduled as follows:  \n"
+"                      \n"
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions\n"
+"2) Schedule new action(create a new record)\n"
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'\n"
+"4) Set other values as per your preference"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'"
+msgstr ""
+"3) Ajuste \"objeto\" a \"db.backup\" y \"función\" a \"programar copias de "
+"seguridad\" en la página \"Datos Técnicos\""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Help"
+msgstr "Ayuda"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"This configures the scheduler for automatic backup of the given database "
+"running on given host at given port on regular intervals."
+msgstr ""
+"Esto configura el planificador de copia de seguridad automática de la base "
+"de datos dado que se ejecutan en el host dado en el puerto en intervalos "
+"regulares."
+
+#. module: auto_backup
+#: field:db.backup,port:0
+msgid "Port"
+msgstr "Puerto"

jikimo_auto_backup/i18n/ko_KR.po

@@ -0,0 +1,395 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* auto_backup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 11.0-20180205\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2018-02-08 03:22+0000\n"
+"PO-Revision-Date: 2018-02-08 12:47+0900\n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 2.0.6\n"
+"Last-Translator: \n"
+"Language: ko_KR\n"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"<b>Warning:</b>\n"
+"                        Use SFTP with caution! This writes files to external "
+"servers under the path you specify."
+msgstr ""
+"<b>경고:</b>\n"
+"                        조심해서 SFTP를 사용하세요! 이것은 당신이 지정한 경로"
+"밑에 외부서버들로 파일들을 쓰게됩니다."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_folder
+msgid "Absolute path for storing the backups"
+msgstr "백업저장용 절대경로명"
+
+#. module: auto_backup
+#: model:ir.module.category,name:auto_backup.module_management
+msgid "Auto backup access"
+msgstr "자동으로 백업 액세스하기"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_send_mail_sftp_fail
+msgid "Auto. E-mail on backup fail"
+msgstr "백업실패시에 이메일로 알려주기 (자동)"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_autoremove
+msgid "Auto. Remove Backups"
+msgstr "백업제거하기 (자동)"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Back-up view"
+msgstr "백업보기"
+
+#. module: auto_backup
+#: model:ir.ui.menu,name:auto_backup.auto_backup_menu
+msgid "Back-ups"
+msgstr "백업"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_folder
+msgid "Backup Directory"
+msgstr "백업디렉토리"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_backup_type
+msgid "Backup Type"
+msgstr "백업타입"
+
+#. module: auto_backup
+#: model:ir.actions.server,name:auto_backup.backup_scheduler_ir_actions_server
+#: model:ir.cron,cron_name:auto_backup.backup_scheduler
+#: model:ir.cron,name:auto_backup.backup_scheduler
+msgid "Backup scheduler"
+msgstr "백업스케줄러"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_tree
+msgid "Backups"
+msgstr "백업"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_days_to_keep_sftp
+msgid ""
+"Choose after how many days the backup should be deleted from the FTP server. "
+"For example:\n"
+"If you fill in 5 the backups will be removed after 5 days from the FTP "
+"server."
+msgstr ""
+"FTP서버로부터 몇일지난 백업본을 삭제할지 선택하세요. 예를들면:\n"
+"만약 5를 기입하면 그 백업본들은 FTP서버에서 5일후에 삭제됩니다."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_days_to_keep
+msgid ""
+"Choose after how many days the backup should be deleted. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days."
+msgstr ""
+"FTP서버로부터 몇일지난 백업본을 삭제할지 선택하세요. 예를들면:\n"
+"만약 5를 기입하면 그 백업본들은 FTP서버에서 5일후에 삭제됩니다."
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure back-ups"
+msgstr "백업구성하기"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:129
+#, python-format
+msgid "Connection Test Failed!"
+msgstr "연결테스트실패~"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:124
+#, python-format
+msgid ""
+"Connection Test Succeeded!\n"
+"Everything seems properly set up for FTP back-ups!"
+msgstr ""
+"연결테스트성공!\n"
+"모든게 적절히 세팅된거 같습니다!"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Contact me!"
+msgstr "저에게 연락하세요~"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_create_uid
+msgid "Created by"
+msgstr "생성됨"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_create_date
+msgid "Created on"
+msgstr "생성됨"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_name
+msgid "Database"
+msgstr "데이터베이스"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_name
+msgid "Database you want to schedule backups for"
+msgstr "백업을 스케줄하기 원하는 데이터베이스"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_display_name
+msgid "Display Name"
+msgstr "표시이름"
+
+#. module: auto_backup
+#: selection:db.backup,backup_type:0
+msgid "Dump"
+msgstr "덤프"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_email_to_notify
+msgid "E-mail to notify"
+msgstr "통보할 이메일주소"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:98 constraint:db.backup:0
+#, python-format
+msgid "Error ! No such database exists!"
+msgstr "에러~ 그런 데이터베이스가 존재하지 않습니다"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_email_to_notify
+msgid ""
+"Fill in the e-mail where you want to be notified that the backup failed on "
+"the FTP."
+msgstr "FTP서버상에서 백업실패할때 알림받기원하는 이메일주소를 채워넣으세요"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "For example: /odoo/backups/"
+msgstr "예: /odoo/backups/"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Go to Settings / Technical / Automation / Scheduled Actions."
+msgstr "Settings / Technical / Automation / Scheduled Actions 으로 가세요."
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Help"
+msgstr "도움말"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:132
+#, python-format
+msgid "Here is what we got instead:\n"
+msgstr "우리가 대신하는것이 여기있습니다:\n"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_host
+msgid "Host"
+msgstr "호스트"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_id
+msgid "ID"
+msgstr "ID"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_sftp_host
+msgid "IP Address SFTP Server"
+msgstr "SFTP서버 IP주소"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_send_mail_sftp_fail
+msgid ""
+"If you check this option you can choose to automaticly get e-mailed when the "
+"backup to the external server failed."
+msgstr ""
+"이 옵션을 체크하면 외부서버에서 백업실패할때 자동적으로 이메일하도록 선택할 "
+"수 있습니다."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_autoremove
+msgid ""
+"If you check this option you can choose to automaticly remove the backup "
+"after xx days"
+msgstr ""
+"이 옵션을 선택하면 자동적으로 며칠(xx days)후에 백업을 제거하도록 선택할 수 "
+"있습니다"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_sftp_write
+msgid ""
+"If you check this option you can specify the details needed to write to a "
+"remote server with SFTP."
+msgstr ""
+"이 옵션을 선택하면 SFTP 원격서버로 쓰려고 할때 요구되는 정보를 지정할 수 있습"
+"니다."
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup___last_update
+msgid "Last Modified on"
+msgstr "최근수정일자"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_write_uid
+msgid "Last Updated by"
+msgstr "최근수정자"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_write_date
+msgid "Last Updated on"
+msgstr "최근업데이트일자"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Local backup configuration"
+msgstr "로컬백업환경설정"
+
+#. module: auto_backup
+#: model:res.groups,name:auto_backup.group_manager
+msgid "Manager"
+msgstr "관리자"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Need more help?"
+msgstr "더 도움이 필요하세요?"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_sftp_password
+msgid "Password User SFTP Server"
+msgstr "SFTP서버 사용자 패스워드"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_sftp_path
+msgid "Path external server"
+msgstr "외부서버경로"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_port
+msgid "Port"
+msgstr "포트"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_days_to_keep_sftp
+msgid "Remove SFTP after x days"
+msgstr "몇일후에 SFTP 제거"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_days_to_keep
+msgid "Remove after x days"
+msgstr "몇일후에 제거하기"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "SFTP"
+msgstr "SFTP"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_sftp_port
+msgid "SFTP Port"
+msgstr "SFTP 포트"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Search the action named 'Backup scheduler'."
+msgstr "'백업스케줄러'라고 명명된 액션을 검색하세요"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"Set the scheduler to active and fill in how often you want backups generated."
+msgstr "스케줄러를 활성화로 세팅하고 백업주기를 채워넣으세요"
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Test SFTP Connection"
+msgstr "SFTP연결테스트"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_sftp_host
+msgid "The IP address from your remote server. For example 192.168.0.1"
+msgstr "원격서버로부터의 IP주소. 예를들자면, 192.168.0.1"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_sftp_path
+msgid ""
+"The location to the folder where the dumps should be written to. For "
+"example /odoo/backups/.\n"
+"Files will then be written to /odoo/backups/ on your remote server."
+msgstr ""
+"덤프파일이 씌어져야하는 폴더위치. 예를들어보자면 /odoo/backups/.\n"
+"그 다음에 파일들은 당신서버상의 /odoo/backups/ 로 쓰여질겁니다."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_sftp_password
+msgid ""
+"The password from the user where the SFTP connection should be made with. "
+"This is the password from the user on the external server."
+msgstr ""
+"SFTP연결이 만들어져야하는 그 사용자의 비밀번호. 이것은 외부서버상의 그 사용자"
+"의 비밀번호예요~"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_sftp_port
+msgid "The port on the FTP server that accepts SSH/SFTP calls."
+msgstr "SSH/SFTP접속을 허용하는 FTP서버상의 포트"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup_sftp_user
+msgid ""
+"The username where the SFTP connection should be made with. This is the user "
+"on the external server."
+msgstr "SFTP연결할 사용자명. 외부서버상의 사용자명이예요~ "
+
+#. module: auto_backup
+#: model:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"This configures the scheduler for automatic backup of the given database "
+"running on given host\n"
+"                        at given port on regular intervals.\n"
+"                        <br/>\n"
+"                        Automatic backups of the database can be scheduled "
+"as follows:"
+msgstr ""
+"이것은 정기적인 간격으로 해당 호스트상에서 실행중인 데이터베이스의 자동백업용"
+"으로 스케줄러를 구성합니다. 그 데이터베이스의 자동백업들은 아래처럼 스케줄될 "
+"수 있습니다:"
+
+#. module: auto_backup
+#: model:ir.module.category,description:auto_backup.module_management
+msgid "User access level for this module"
+msgstr "이 모듈용 사용자접근레벨"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_sftp_user
+msgid "Username SFTP Server"
+msgstr "SFTP서버 사용자명"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup_sftp_write
+msgid "Write to external server with sftp"
+msgstr "sftp와 함께 외부서버로 쓰기"
+
+#. module: auto_backup
+#: selection:db.backup,backup_type:0
+msgid "Zip"
+msgstr "Zip"
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "db.backup"
+msgstr "db.backup"

jikimo_auto_backup/i18n/nl.po

@@ -0,0 +1,380 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* auto_backup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-20 13:29+0000\n"
+"PO-Revision-Date: 2019-10-20 13:29+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"<b>Warning:</b>\n"
+"                        Use SFTP with caution! This writes files to external servers under the path you specify."
+msgstr "<b>Waarschuwing:</b>\n"
+"                        Gebruik SFTP voorzichtig! Dit schrijft bestanden naar externe servers onder het pad dat u opgeeft."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__folder
+msgid "Absolute path for storing the backups"
+msgstr "Absoluut pad om backups te bewaren"
+
+#. module: auto_backup
+#: model:ir.module.category,name:auto_backup.module_management
+msgid "Auto backup access"
+msgstr "Auto backup toegang"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__send_mail_sftp_fail
+msgid "Auto. E-mail on backup fail"
+msgstr "Auto. e-mail bij mislukte back-up"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__autoremove
+msgid "Auto. Remove Backups"
+msgstr "Auto. e-mailen wanneer backup mislukt"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Back-up view"
+msgstr "Back-up weergave"
+
+#. module: auto_backup
+#: model:ir.ui.menu,name:auto_backup.auto_backup_menu
+msgid "Back-ups"
+msgstr "Back-ups"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__folder
+msgid "Backup Directory"
+msgstr "Backup folder"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__backup_type
+msgid "Backup Type"
+msgstr "Soort back-up"
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "Backup configuration record"
+msgstr "Back-up configuratie"
+
+#. module: auto_backup
+#: model:ir.actions.server,name:auto_backup.backup_scheduler_ir_actions_server
+#: model:ir.cron,cron_name:auto_backup.backup_scheduler
+#: model:ir.cron,name:auto_backup.backup_scheduler
+msgid "Backup scheduler"
+msgstr "Backup planner"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_tree
+msgid "Backups"
+msgstr "Back-ups"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__days_to_keep_sftp
+msgid ""
+"Choose after how many days the backup should be deleted from the FTP server. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days from the FTP server."
+msgstr "Kies na hoeveel dagen de backups verwijderd moeten worden van de FTP server. Bijvoorbeeld:\n"
+"Als u 5 invult zal de backup na 5 dagen verwijderd worden van de FTP server."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__days_to_keep
+msgid ""
+"Choose after how many days the backup should be deleted. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days."
+msgstr "Kies na hoeveel dagen de backups verwijderd moeten worden van de FTP server. Bijvoorbeeld:\n"
+"Als u 5 invult zal de backup na 5 dagen verwijderd worden van de FTP server."
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure back-ups"
+msgstr "Configureer back-ups"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Connection Test Failed!"
+msgstr "Connectie test mislukt!"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid ""
+"Connection Test Succeeded!\n"
+"Everything seems properly set up for FTP back-ups!"
+msgstr "Connectie test succesvol!\n"
+"Alles lijkt correct opgezet voor FTP back-ups!"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Contact me!"
+msgstr "Contacteer mij!"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__create_uid
+msgid "Created by"
+msgstr "Aangemaakt door"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__create_date
+msgid "Created on"
+msgstr "Aangemaakt op"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__name
+msgid "Database"
+msgstr "Database"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__name
+msgid "Database you want to schedule backups for"
+msgstr "Dataabse waar u back-ups voor wilt plannen"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__display_name
+msgid "Display Name"
+msgstr "Schermnaam"
+
+#. module: auto_backup
+#: model:ir.model.fields.selection,name:auto_backup.selection__db_backup__backup_type__dump
+msgid "Dump"
+msgstr "Dump"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__email_to_notify
+msgid "E-mail to notify"
+msgstr "E-mail om te verwittigen"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Error ! No such database exists!"
+msgstr "Fout! Deze database bestaat niet!"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__email_to_notify
+msgid ""
+"Fill in the e-mail where you want to be notified that the backup failed on "
+"the FTP."
+msgstr "Vul de e-mail in waarop u wilt verwittigd worden als de backup mislukt op de FTP."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "For example: /odoo/backups/"
+msgstr "Bijvoorbeeld: /odoo/backups/"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Go to Settings / Technical / Automation / Scheduled Actions."
+msgstr "Ga naar Instellingen / Technisch / Automatisering / Geplande acties."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Help"
+msgstr "Help"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Here is what we got instead:\n"
+msgstr "Hier is wat we in de plaats terugkregen:\n"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__host
+msgid "Host"
+msgstr "Host"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__id
+msgid "ID"
+msgstr "ID"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_host
+msgid "IP Address SFTP Server"
+msgstr "IP adres SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__send_mail_sftp_fail
+msgid ""
+"If you check this option you can choose to automaticly get e-mailed when the"
+" backup to the external server failed."
+msgstr "Als u deze optie aanvinkt kan u kiezen om automatisch een e-mail aan te krijgen als de backuaar de externe server mislukt."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__autoremove
+msgid ""
+"If you check this option you can choose to automaticly remove the backup "
+"after xx days"
+msgstr "Als u deze optie aanvinkt kan u kiezen om automatisch backups te verwijderen "
+"na xx dagen"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_write
+msgid ""
+"If you check this option you can specify the details needed to write to a "
+"remote server with SFTP."
+msgstr "Als u deze optie aanvinkt kan u de details invullen die nodig zijn om te connecteren met de "
+" externe SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup____last_update
+msgid "Last Modified on"
+msgstr "Laatst gewijzigd op"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__write_uid
+msgid "Last Updated by"
+msgstr "Laatst bijgewerkt door"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__write_date
+msgid "Last Updated on"
+msgstr "Laatst bijgewerkt op"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Local backup configuration"
+msgstr "Lokale back-up configuratie"
+
+#. module: auto_backup
+#: model:res.groups,name:auto_backup.group_manager
+msgid "Manager"
+msgstr "Beheerder"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Need more help?"
+msgstr "Meer hulp nodig?"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_password
+msgid "Password User SFTP Server"
+msgstr "Wachtwoord gebruiker SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_path
+msgid "Path external server"
+msgstr "Pad externe server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__port
+msgid "Port"
+msgstr "Poort"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__days_to_keep_sftp
+msgid "Remove SFTP after x days"
+msgstr "Verwijderd SFTP na x dagen"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__days_to_keep
+msgid "Remove after x days"
+msgstr "Verwijder na x dagen"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "SFTP"
+msgstr "SFTP"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_port
+msgid "SFTP Port"
+msgstr "SFTP poort"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Search the action named 'Backup scheduler'."
+msgstr "Zoek de actie met de naam 'Backup planner'."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"Set the scheduler to active and fill in how often you want backups "
+"generated."
+msgstr "Zet de planner actief en vul in hoe vaak u wilt dat er backups gegenereerd "
+"worden."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Test SFTP Connection"
+msgstr "Test SFTP verbinding"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_host
+msgid "The IP address from your remote server. For example 192.168.0.1"
+msgstr "Het IP adres van uw externe server. Bijvoorbeeld: 192.168.0.1"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_path
+msgid ""
+"The location to the folder where the dumps should be written to. For example /odoo/backups/.\n"
+"Files will then be written to /odoo/backups/ on your remote server."
+msgstr "De locatie naar de folder waar de backup naar toe moet geschreven worden. Bijvoorbeeld odoo/backups/\n"
+"Bestanden worden dan naar /odoo/backups/ geschreven op de externe server"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_password
+msgid ""
+"The password from the user where the SFTP connection should be made with. "
+"This is the password from the user on the external server."
+msgstr "Het wachtwoord van de gebruiker waar de SFTP connectie mee moet gemaakt worden. "
+"Dit is het wachtwoord van de gebruiker op de externe server."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_port
+msgid "The port on the FTP server that accepts SSH/SFTP calls."
+msgstr "De poort op de FTP server die SSH/SFTP accepteert."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_user
+msgid ""
+"The username where the SFTP connection should be made with. This is the user"
+" on the external server."
+msgstr "De gebruikersnaam waar de SFTP connectie mee gemaakt moet worden. Dit is de gebruiker"
+" op de externe server."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"This configures the scheduler for automatic backup of the given database running on given host\n"
+"                        at given port on regular intervals.\n"
+"                        <br/>\n"
+"                        Automatic backups of the database can be scheduled as follows:"
+msgstr "Dit configureert de planner om automatische backups van de opgegeven database te maken die op deze host,\n"
+"                        op een bepaalde poort draaien, op regelmatige intervals.\n"
+"                        <br/>\n"
+"                        Automatische backups kunnen als volgt ingepland worden:"
+
+#. module: auto_backup
+#: model:ir.module.category,description:auto_backup.module_management
+msgid "User access level for this module"
+msgstr "Gebruikerstoegang voor deze module"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_user
+msgid "Username SFTP Server"
+msgstr "Gebruikersnaam SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_write
+msgid "Write to external server with sftp"
+msgstr "Schrijf naar externe server met SFTP"
+
+#. module: auto_backup
+#: model:ir.model.fields.selection,name:auto_backup.selection__db_backup__backup_type__zip
+msgid "Zip"
+msgstr "ZIP"
+

jikimo_auto_backup/i18n/nl_BE.po

@@ -0,0 +1,380 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* auto_backup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 13.0+e\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2019-10-20 13:29+0000\n"
+"PO-Revision-Date: 2019-10-20 13:29+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"<b>Warning:</b>\n"
+"                        Use SFTP with caution! This writes files to external servers under the path you specify."
+msgstr "<b>Waarschuwing:</b>\n"
+"                        Gebruik SFTP voorzichtig! Dit schrijft bestanden naar externe servers onder het pad dat u opgeeft."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__folder
+msgid "Absolute path for storing the backups"
+msgstr "Absoluut pad om backups te bewaren"
+
+#. module: auto_backup
+#: model:ir.module.category,name:auto_backup.module_management
+msgid "Auto backup access"
+msgstr "Auto backup toegang"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__send_mail_sftp_fail
+msgid "Auto. E-mail on backup fail"
+msgstr "Auto. e-mail bij mislukte back-up"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__autoremove
+msgid "Auto. Remove Backups"
+msgstr "Auto. e-mailen wanneer backup mislukt"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Back-up view"
+msgstr "Back-up weergave"
+
+#. module: auto_backup
+#: model:ir.ui.menu,name:auto_backup.auto_backup_menu
+msgid "Back-ups"
+msgstr "Back-ups"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__folder
+msgid "Backup Directory"
+msgstr "Backup folder"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__backup_type
+msgid "Backup Type"
+msgstr "Soort back-up"
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "Backup configuration record"
+msgstr "Back-up configuratie"
+
+#. module: auto_backup
+#: model:ir.actions.server,name:auto_backup.backup_scheduler_ir_actions_server
+#: model:ir.cron,cron_name:auto_backup.backup_scheduler
+#: model:ir.cron,name:auto_backup.backup_scheduler
+msgid "Backup scheduler"
+msgstr "Backup planner"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_tree
+msgid "Backups"
+msgstr "Back-ups"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__days_to_keep_sftp
+msgid ""
+"Choose after how many days the backup should be deleted from the FTP server. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days from the FTP server."
+msgstr "Kies na hoeveel dagen de backups verwijderd moeten worden van de FTP server. Bijvoorbeeld:\n"
+"Als u 5 invult zal de backup na 5 dagen verwijderd worden van de FTP server."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__days_to_keep
+msgid ""
+"Choose after how many days the backup should be deleted. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days."
+msgstr "Kies na hoeveel dagen de backups verwijderd moeten worden van de FTP server. Bijvoorbeeld:\n"
+"Als u 5 invult zal de backup na 5 dagen verwijderd worden van de FTP server."
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure back-ups"
+msgstr "Configureer back-ups"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Connection Test Failed!"
+msgstr "Connectie test mislukt!"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid ""
+"Connection Test Succeeded!\n"
+"Everything seems properly set up for FTP back-ups!"
+msgstr "Connectie test succesvol!\n"
+"Alles lijkt correct opgezet voor FTP backups!"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Contact me!"
+msgstr "Contacteer mij!"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__create_uid
+msgid "Created by"
+msgstr "Aangemaakt door"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__create_date
+msgid "Created on"
+msgstr "Aangemaakt op"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__name
+msgid "Database"
+msgstr "Database"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__name
+msgid "Database you want to schedule backups for"
+msgstr "Dataabse waar u back-ups voor wilt plannen"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__display_name
+msgid "Display Name"
+msgstr "Schermnaam"
+
+#. module: auto_backup
+#: model:ir.model.fields.selection,name:auto_backup.selection__db_backup__backup_type__dump
+msgid "Dump"
+msgstr "Dump"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__email_to_notify
+msgid "E-mail to notify"
+msgstr "E-mail om te verwittigen"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Error ! No such database exists!"
+msgstr "Fout! Deze database bestaat niet!"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__email_to_notify
+msgid ""
+"Fill in the e-mail where you want to be notified that the backup failed on "
+"the FTP."
+msgstr "Vul de e-mail in waarop u wilt verwittigd worden als de backup mislukt op de FTP."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "For example: /odoo/backups/"
+msgstr "Bijvoorbeeld: /odoo/backups/"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Go to Settings / Technical / Automation / Scheduled Actions."
+msgstr "Ga naar Instellingen / Technisch / Automatisering / Geplande acties."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Help"
+msgstr "Help"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Here is what we got instead:\n"
+msgstr "Hier is wat we in de plaats terugkregen:\n"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__host
+msgid "Host"
+msgstr "Host"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__id
+msgid "ID"
+msgstr "ID"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_host
+msgid "IP Address SFTP Server"
+msgstr "IP adres SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__send_mail_sftp_fail
+msgid ""
+"If you check this option you can choose to automaticly get e-mailed when the"
+" backup to the external server failed."
+msgstr "Als u deze optie aanvinkt kan u kiezen om automatisch een e-mail aan te krijgen als de backuaar de externe server mislukt."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__autoremove
+msgid ""
+"If you check this option you can choose to automaticly remove the backup "
+"after xx days"
+msgstr "Als u deze optie aanvinkt kan u kiezen om automatisch backups te verwijderen "
+"na xx dagen"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_write
+msgid ""
+"If you check this option you can specify the details needed to write to a "
+"remote server with SFTP."
+msgstr "Als u deze optie aanvinkt kan u de details invullen die nodig zijn om te connecteren met de "
+" externe SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup____last_update
+msgid "Last Modified on"
+msgstr "Laatst gewijzigd op"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__write_uid
+msgid "Last Updated by"
+msgstr "Laatst bijgewerkt door"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__write_date
+msgid "Last Updated on"
+msgstr "Laatst bijgewerkt op"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Local backup configuration"
+msgstr "Lokale back-up configuratie"
+
+#. module: auto_backup
+#: model:res.groups,name:auto_backup.group_manager
+msgid "Manager"
+msgstr "Beheerder"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Need more help?"
+msgstr "Meer hulp nodig?"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_password
+msgid "Password User SFTP Server"
+msgstr "Wachtwoord gebruiker SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_path
+msgid "Path external server"
+msgstr "Pad externe server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__port
+msgid "Port"
+msgstr "Poort"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__days_to_keep_sftp
+msgid "Remove SFTP after x days"
+msgstr "Verwijderd SFTP na x dagen"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__days_to_keep
+msgid "Remove after x days"
+msgstr "Verwijder na x dagen"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "SFTP"
+msgstr "SFTP"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_port
+msgid "SFTP Port"
+msgstr "SFTP poort"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Search the action named 'Backup scheduler'."
+msgstr "Zoek de actie met de naam 'Backup planner'."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"Set the scheduler to active and fill in how often you want backups "
+"generated."
+msgstr "Zet de planner actief en vul in hoe vaak u wilt dat er backups gegenereerd "
+"worden."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Test SFTP Connection"
+msgstr "Test SFTP verbinding"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_host
+msgid "The IP address from your remote server. For example 192.168.0.1"
+msgstr "Het IP adres van uw externe server. Bijvoorbeeld: 192.168.0.1"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_path
+msgid ""
+"The location to the folder where the dumps should be written to. For example /odoo/backups/.\n"
+"Files will then be written to /odoo/backups/ on your remote server."
+msgstr "De locatie naar de folder waar de backup naar toe moet geschreven worden. Bijvoorbeeld odoo/backups/\n"
+"Bestanden worden dan naar /odoo/backups/ geschreven op de externe server"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_password
+msgid ""
+"The password from the user where the SFTP connection should be made with. "
+"This is the password from the user on the external server."
+msgstr "Het wachtwoord van de gebruiker waar de SFTP connectie mee moet gemaakt worden. "
+"Dit is het wachtwoord van de gebruiker op de externe server."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_port
+msgid "The port on the FTP server that accepts SSH/SFTP calls."
+msgstr "De poort op de FTP server die SSH/SFTP accepteert."
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_user
+msgid ""
+"The username where the SFTP connection should be made with. This is the user"
+" on the external server."
+msgstr "De gebruikersnaam waar de SFTP connectie mee gemaakt moet worden. Dit is de gebruiker"
+" op de externe server."
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"This configures the scheduler for automatic backup of the given database running on given host\n"
+"                        at given port on regular intervals.\n"
+"                        <br/>\n"
+"                        Automatic backups of the database can be scheduled as follows:"
+msgstr "Dit configureert de planner om automatische backups van de opgegeven database te maken die op deze host,\n"
+"                        op een bepaalde poort draaien, op regelmatige intervals.\n"
+"                        <br/>\n"
+"                        Automatische backups kunnen als volgt ingepland worden:"
+
+#. module: auto_backup
+#: model:ir.module.category,description:auto_backup.module_management
+msgid "User access level for this module"
+msgstr "Gebruikerstoegang voor deze module"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_user
+msgid "Username SFTP Server"
+msgstr "Gebruikersnaam SFTP server"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_write
+msgid "Write to external server with sftp"
+msgstr "Schrijf naar externe server met SFTP"
+
+#. module: auto_backup
+#: model:ir.model.fields.selection,name:auto_backup.selection__db_backup__backup_type__zip
+msgid "Zip"
+msgstr "ZIP"
+

jikimo_auto_backup/i18n/pl.po

@@ -0,0 +1,178 @@
+# Polish translation for openobject-addons
+# Copyright (c) 2010 Rosetta Contributors and Canonical Ltd 2010
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:49+0000\n"
+"PO-Revision-Date: 2011-02-15 15:01+0000\n"
+"Last-Translator: OpenERP Administrators <Unknown>\n"
+"Language-Team: Polish <pl@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-04-20 05:35+0000\n"
+"X-Generator: Launchpad (build 16567)\n"
+
+#. module: auto_backup
+#: help:db.backup,name:0
+msgid "Database you want to schedule backups for"
+msgstr "Baza danych, dla której chcesz zaplanować robienie kopii zapasowej"
+
+#. module: auto_backup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"Nazwa obiektu musi zaczynać się od x_ oraz nie może zawierać znaków "
+"specjalnych !"
+
+#. module: auto_backup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nieprawidłowa nazwa modelu w definicji akcji."
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "db.backup"
+msgstr ""
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions"
+msgstr "1) Idź do Administracja / Konfirguracja / Planista / Planowane akcje"
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup_conf_form
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure Backup"
+msgstr "Konfiguruj kopie zapasowe"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Test"
+msgstr "Przetestuj"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "IP Configuration"
+msgstr "Konfiguracja adresu IP"
+
+#. module: auto_backup
+#: help:db.backup,bkp_dir:0
+msgid "Absolute path for storing the backups"
+msgstr "Pełna ścieżka  dla kopii zapasowych"
+
+#. module: auto_backup
+#: model:ir.module.module,shortdesc:auto_backup.module_meta_information
+msgid "Database Auto-Backup"
+msgstr "Automatyczne kopie zapasowe bazy danych"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Database Configuration"
+msgstr "Konfiguracja bazy danych"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "4) Set other values as per your preference"
+msgstr "4) Ustaw inne dane według uznania"
+
+#. module: auto_backup
+#: field:db.backup,host:0
+msgid "Host"
+msgstr "Host"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"Automatic backup of all the databases under this can be scheduled as "
+"follows: "
+msgstr ""
+"Automatyczne kopie wszystkich baz danych mogą być zaplanowane następująco: "
+
+#. module: auto_backup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "XML niewłaściwy dla tej architektury wyświetlania!"
+
+#. module: auto_backup
+#: field:db.backup,bkp_dir:0
+msgid "Backup Directory"
+msgstr "Katalog kopii zapasowych"
+
+#. module: auto_backup
+#: field:db.backup,name:0
+msgid "Database"
+msgstr "Baza danych"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "2) Schedule new action(create a new record)"
+msgstr "2) Zaplanuj nową akcję (utwórz nowy rekord)"
+
+#. module: auto_backup
+#: model:ir.module.module,description:auto_backup.module_meta_information
+msgid ""
+"The generic Open ERP Database Auto-Backup system enables the user to make "
+"configurations for the automatic backup of the database.\n"
+"User simply requires to specify host & port under IP Configuration & "
+"database(on specified host running at specified port) and backup "
+"directory(in which all the backups of the specified database will be stored) "
+"under Database Configuration.\n"
+"\n"
+"Automatic backup for all such configured databases under this can then be "
+"scheduled as follows:  \n"
+"                      \n"
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions\n"
+"2) Schedule new action(create a new record)\n"
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'\n"
+"4) Set other values as per your preference"
+msgstr ""
+"System Open ERP Database Auto-Backup pozwala użytkownikowi utworzyć "
+"konfiguracje dla automatycznego zachowywania kopii zapasowych baz danych.\n"
+"Użytkownik musi tylko podać host i port w Konfiguracji IP  i bazę danych "
+"oraz katalog dla kopii zapasowej Konfiguracji bazy danych.\n"
+"\n"
+"Automatyczne kopie wszystkich baz danych mogą być zaplanowane następująco:   "
+"\n"
+"                      \n"
+"1) Idź do Administracja / Konfirguracja / Planista / Planowane akcje\n"
+"2) Zaplanuj nową akcję (utwórz nowy rekord)\n"
+"3) Ustaw 'Obiekt' na 'db.backup' i 'Funkcja' na 'schedule_backup' na stronie "
+"'Dane techniczne'.\n"
+"4) Ustaw inne dane według uznania"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'"
+msgstr ""
+"3) Ustaw 'Obiekt' na 'db.backup' i 'Funkcja' na 'schedule_backup' na stronie "
+"'Dane techniczne'."
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Help"
+msgstr "Pomoc"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"This configures the scheduler for automatic backup of the given database "
+"running on given host at given port on regular intervals."
+msgstr ""
+"Tu konfigurujesz planistę do automatycznego zapisywania kopii zapasowych dla "
+"określonej bazy danych na na określonym hoście (komputerze) na określonym "
+"porcie w regularnych terminach."
+
+#. module: auto_backup
+#: field:db.backup,port:0
+msgid "Port"
+msgstr "Port"

jikimo_auto_backup/i18n/pt_BR.po

@@ -0,0 +1,183 @@
+# Brazilian Portuguese translation for openobject-addons
+# Copyright (c) 2013 Rosetta Contributors and Canonical Ltd 2013
+# This file is distributed under the same license as the openobject-addons package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: openobject-addons\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-11-24 13:49+0000\n"
+"PO-Revision-Date: 2013-07-20 09:39+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Brazilian Portuguese <pt_BR@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Launchpad-Export-Date: 2013-07-22 05:50+0000\n"
+"X-Generator: Launchpad (build 16696)\n"
+
+#. module: auto_backup
+#: help:db.backup,name:0
+msgid "Database you want to schedule backups for"
+msgstr "Banco de dados que você deseja agendar backups para"
+
+#. module: auto_backup
+#: constraint:ir.model:0
+msgid ""
+"The Object name must start with x_ and not contain any special character !"
+msgstr ""
+"O nome do objeto deve iniciar com x_ e não conter qualquer caractere "
+"especial!"
+
+#. module: auto_backup
+#: constraint:ir.actions.act_window:0
+msgid "Invalid model name in the action definition."
+msgstr "Nome do modelo inválida na definição da ação."
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "db.backup"
+msgstr "db.backup"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions"
+msgstr ""
+"1) Vá para Administração / Configuração / Programador / Ações Programadas"
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup_conf_form
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure Backup"
+msgstr "Configurar backup"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Test"
+msgstr "Teste"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "IP Configuration"
+msgstr "Configuração de IP"
+
+#. module: auto_backup
+#: help:db.backup,bkp_dir:0
+msgid "Absolute path for storing the backups"
+msgstr "Caminho absoluto para armazenar os backups"
+
+#. module: auto_backup
+#: model:ir.module.module,shortdesc:auto_backup.module_meta_information
+msgid "Database Auto-Backup"
+msgstr "Banco de Dados Auto-Backup"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Database Configuration"
+msgstr "Configuração do Banco de Dados"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "4) Set other values as per your preference"
+msgstr "4) Defina outros valores como por sua preferência"
+
+#. module: auto_backup
+#: field:db.backup,host:0
+msgid "Host"
+msgstr "Host"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"Automatic backup of all the databases under this can be scheduled as "
+"follows: "
+msgstr ""
+"Backup automático de todos os bancos de dados sob este pode ser programado "
+"como segue: "
+
+#. module: auto_backup
+#: constraint:ir.ui.view:0
+msgid "Invalid XML for View Architecture!"
+msgstr "Inválido XML para Ver Arquitetura!"
+
+#. module: auto_backup
+#: field:db.backup,bkp_dir:0
+msgid "Backup Directory"
+msgstr "Diretório de backup"
+
+#. module: auto_backup
+#: field:db.backup,name:0
+msgid "Database"
+msgstr "Banco de Dados"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "2) Schedule new action(create a new record)"
+msgstr "2) Programe nova ação (criar um novo registro)"
+
+#. module: auto_backup
+#: model:ir.module.module,description:auto_backup.module_meta_information
+msgid ""
+"The generic Open ERP Database Auto-Backup system enables the user to make "
+"configurations for the automatic backup of the database.\n"
+"User simply requires to specify host & port under IP Configuration & "
+"database(on specified host running at specified port) and backup "
+"directory(in which all the backups of the specified database will be stored) "
+"under Database Configuration.\n"
+"\n"
+"Automatic backup for all such configured databases under this can then be "
+"scheduled as follows:  \n"
+"                      \n"
+"1) Go to Administration / Configuration / Scheduler / Scheduled Actions\n"
+"2) Schedule new action(create a new record)\n"
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'\n"
+"4) Set other values as per your preference"
+msgstr ""
+"O sistema Auto-Backup genérico Aberto ERP banco de dados permite que o "
+"usuário faça configurações para o backup automático do banco de dados. \n"
+"usuário requer simplesmente para especificar anfitrião e porta em "
+"Configuração do IP e banco de dados (on especificado host executando na "
+"porta especificada) eo diretório de backup (em . que todos os backups de "
+"banco de dados especificado serão armazenados) em Configuração do banco de "
+"dados \n"
+"de backup automático de todos esses bancos de dados configurados sob este "
+"pode ser programado como segue:\n"
+"  \n"
+"                      \n"
+"1) Vá para Administração / Configuração / Programador / Ações Programadas \n"
+"2) Programe nova ação (criar um novo registro) \n"
+"3) Defina 'objeto' para 'db.backup' e 'função' para 'schedule_backup' em "
+"página \"Dados Técnicos\" \n"
+"4 ) Defina outros valores de acordo com sua preferência"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"3) Set 'Object' to 'db.backup' and 'Function' to 'schedule_backup' under "
+"page 'Technical Data'"
+msgstr ""
+"3) Defina 'objeto' para 'db.backup' e 'função' para 'schedule_backup \"em\" "
+"Dados Técnicos \"página"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid "Help"
+msgstr "Ajudar"
+
+#. module: auto_backup
+#: view:db.backup:0
+msgid ""
+"This configures the scheduler for automatic backup of the given database "
+"running on given host at given port on regular intervals."
+msgstr ""
+"Isso configura o agendador de backup automático de um determinado banco de "
+"dados rodando em determinado host em determinada porta em intervalos "
+"regulares."
+
+#. module: auto_backup
+#: field:db.backup,port:0
+msgid "Port"
+msgstr "Porto"

jikimo_auto_backup/i18n/zh_CN.po

@@ -0,0 +1,358 @@
+# Translation of Odoo Server.
+# This file contains the translation of the following modules:
+# 	* auto_backup
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Odoo Server 16.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2024-04-19 08:18+0000\n"
+"PO-Revision-Date: 2024-04-19 08:18+0000\n"
+"Last-Translator: \n"
+"Language-Team: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: \n"
+"Plural-Forms: \n"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"<b>Warning:</b>\n"
+"                        Use SFTP with caution! This writes files to external servers under the path you specify."
+msgstr "谨慎使用SFTP！这会将文件写入您指定路径下的外部服务器。"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__folder
+msgid "Absolute path for storing the backups"
+msgstr "备份绝对路径"
+
+#. module: auto_backup
+#: model:ir.module.category,name:auto_backup.module_management
+msgid "Auto backup access"
+msgstr "自动备份权限"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__send_mail_sftp_fail
+msgid "Auto. E-mail on backup fail"
+msgstr "FTP备份失败自动邮件通知你"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__autoremove
+msgid "Auto. Remove Backups"
+msgstr "自动删除备份"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Back-up view"
+msgstr "备份视图"
+
+#. module: auto_backup
+#: model:ir.ui.menu,name:auto_backup.auto_backup_menu
+msgid "Back-ups"
+msgstr "备份"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__folder
+msgid "Backup Directory"
+msgstr "备份目录"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__backup_type
+msgid "Backup Type"
+msgstr "备份类型"
+
+#. module: auto_backup
+#: model:ir.model,name:auto_backup.model_db_backup
+msgid "Backup configuration record"
+msgstr "备份配置记录"
+
+#. module: auto_backup
+#: model:ir.actions.server,name:auto_backup.backup_scheduler_ir_actions_server
+#: model:ir.cron,cron_name:auto_backup.backup_scheduler
+#: model:ir.cron,name:auto_backup.backup_scheduler
+msgid "Backup scheduler"
+msgstr "备份调度器"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__days_to_keep_sftp
+msgid ""
+"Choose after how many days the backup should be deleted from the FTP server. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days from the FTP server."
+msgstr "选择备份应在FTP服务器上删除的天数。例如：\n如果您填写5，则备份将在5天后从FTP服务器上删除。"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__days_to_keep
+msgid ""
+"Choose after how many days the backup should be deleted. For example:\n"
+"If you fill in 5 the backups will be removed after 5 days."
+msgstr "选择备份应删除的天数。例如：\n如果您填写5，则备份将在5天后删除。"
+
+#. module: auto_backup
+#: model:ir.actions.act_window,name:auto_backup.action_backup
+#: model:ir.ui.menu,name:auto_backup.backup_conf_menu
+msgid "Configure back-ups"
+msgstr "配置备份"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Connection Test Failed!"
+msgstr "连接测试失败！"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid ""
+"Connection Test Succeeded!\n"
+"Everything seems properly set up for FTP back-ups!"
+msgstr "连接测试成功！\nFTP备份似乎已正确设置！"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Contact me!"
+msgstr "联系我！"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__create_uid
+msgid "Created by"
+msgstr "创建者"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__create_date
+msgid "Created on"
+msgstr "创建日期"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__name
+msgid "Database"
+msgstr "数据库"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__name
+msgid "Database you want to schedule backups for"
+msgstr "您要安排备份的数据库"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__display_name
+msgid "Display Name"
+msgstr "显示名称"
+
+#. module: auto_backup
+#: model:ir.model.fields.selection,name:auto_backup.selection__db_backup__backup_type__dump
+msgid "Dump"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__email_to_notify
+msgid "E-mail to notify"
+msgstr "通知邮件"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__email_to_notify
+msgid ""
+"Fill in the e-mail where you want to be notified that the backup failed on "
+"the FTP."
+msgstr "填写您希望在FTP上备份失败时收到通知的电子邮件"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "For example: /odoo/backups/"
+msgstr "例如：/odoo/backups/"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Go to Settings / Technical / Automation / Scheduled Actions."
+msgstr "前往 设置/技术/自动化/计划任务。"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Help"
+msgstr "帮助"
+
+#. module: auto_backup
+#: code:addons/auto_backup/models/db_backup.py:0
+#, python-format
+msgid "Here is what we got instead:\n"
+msgstr "这是我们得到的内容：\n"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__host
+msgid "Host"
+msgstr "主机"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__id
+msgid "ID"
+msgstr "标识"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_host
+msgid "IP Address SFTP Server"
+msgstr "SFTP服务器的IP地址"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__send_mail_sftp_fail
+msgid ""
+"If you check this option you can choose to automaticly get e-mailed when the"
+" backup to the external server failed."
+msgstr "如果您选中此选项，当备份到外部服务器失败时，您可以选择自动接收邮件通知。"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__autoremove
+msgid ""
+"If you check this option you can choose to automaticly remove the backup "
+"after xx days"
+msgstr "如果您选中此选项，您可以选择在xx天后自动删除备份"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_write
+msgid ""
+"If you check this option you can specify the details needed to write to a "
+"remote server with SFTP."
+msgstr "如果您选中此选项，您可以指定使用SFTP向远程服务器写入所需的详细信息。"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup____last_update
+msgid "Last Modified on"
+msgstr "最后修改时间"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__write_uid
+msgid "Last Updated by"
+msgstr "最后更新者"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__write_date
+msgid "Last Updated on"
+msgstr "最后更新时间"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Local backup configuration"
+msgstr "本地备份配置"
+
+#. module: auto_backup
+#: model:res.groups,name:auto_backup.group_manager
+msgid "Manager"
+msgstr "管理者"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Need more help?"
+msgstr "需要更多帮助？"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_password
+msgid "Password User SFTP Server"
+msgstr "SFTP服务器用户密码"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_path
+msgid "Path external server"
+msgstr "外部服务器路径"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__port
+msgid "Port"
+msgstr "端口"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__days_to_keep_sftp
+msgid "Remove SFTP after x days"
+msgstr "x天后删除SFTP"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__days_to_keep
+msgid "Remove after x days"
+msgstr "x天后删除"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "SFTP"
+msgstr ""
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_port
+msgid "SFTP Port"
+msgstr "SFTP端口"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Search the action named 'Backup scheduler'."
+msgstr "搜索名为'备份调度器'的操作。"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"Set the scheduler to active and fill in how often you want backups "
+"generated."
+msgstr "将调度器设置为激活状态，并填写您希望生成备份的频率。"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid "Test SFTP Connection"
+msgstr "测试SFTP连接"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_host
+msgid "The IP address from your remote server. For example 192.168.0.1"
+msgstr "远程服务器的IP地址。例如192.168.0.1"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_path
+msgid ""
+"The location to the folder where the dumps should be written to. For example /odoo/backups/.\n"
+"Files will then be written to /odoo/backups/ on your remote server."
+msgstr "转储文件应该写入的文件夹位置。例如 /odoo/backups/。\n文件将被写入远程服务器上的 /odoo/backups/。"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_password
+msgid ""
+"The password from the user where the SFTP connection should be made with. "
+"This is the password from the user on the external server."
+msgstr "应与之建立SFTP连接的用户的密码。\n这是外部服务器上用户的密码。"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_port
+msgid "The port on the FTP server that accepts SSH/SFTP calls."
+msgstr "FTP服务器上接受SSH/SFTP调用的端口。"
+
+#. module: auto_backup
+#: model:ir.model.fields,help:auto_backup.field_db_backup__sftp_user
+msgid ""
+"The username where the SFTP connection should be made with. This is the user"
+" on the external server."
+msgstr "应与之建立SFTP连接的用户名。这是外部服务器上的用户。"
+
+#. module: auto_backup
+#: model_terms:ir.ui.view,arch_db:auto_backup.view_backup_config_form
+msgid ""
+"This configures the scheduler for automatic backup of the given database running on given host\n"
+"                        at given port on regular intervals.\n"
+"                        <br/>\n"
+"                        Automatic backups of the database can be scheduled as follows:"
+msgstr "这将配置调度器，以定期自动备份在指定主机上运行的给定数据库\n"
+"                        在给定端口上。\n"
+"                        <br/>\n"
+"                        可以如下安排数据库的自动备份："
+
+#. module: auto_backup
+#: model:ir.module.category,description:auto_backup.module_management
+msgid "User access level for this module"
+msgstr "此模块的用户访问级别"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_user
+msgid "Username SFTP Server"
+msgstr "SFTP服务器用户名"
+
+#. module: auto_backup
+#: model:ir.model.fields,field_description:auto_backup.field_db_backup__sftp_write
+msgid "Write to external server with sftp"
+msgstr "通过SFTP向外部服务器写入"
+
+#. module: auto_backup
+#: model:ir.model.fields.selection,name:auto_backup.selection__db_backup__backup_type__zip
+msgid "Zip"
+msgstr ""

jikimo_auto_backup/models/__init__.py

@@ -0,0 +1,2 @@
+
+from . import db_backup

jikimo_auto_backup/models/db_backup.py

@@ -0,0 +1,328 @@
+
+import os
+import datetime
+import time
+import shutil
+import json
+import tempfile
+
+from odoo import models, fields, api, tools, _
+from odoo.exceptions import Warning, AccessDenied
+import odoo
+
+import logging
+_logger = logging.getLogger(__name__)
+
+try:
+    import paramiko
+except ImportError:
+    raise ImportError(
+        'This module needs paramiko to automatically write backups to the FTP through SFTP. '
+        'Please install paramiko on your system. (sudo pip3 install paramiko)')
+
+
+class DbBackup(models.Model):
+    _name = 'db.backup'
+    _description = 'Backup configuration record'
+
+    def _get_db_name(self):
+        dbName = self._cr.dbname
+        return dbName
+
+    # Columns for local server configuration
+    host = fields.Char('Host', required=True, default='localhost')
+    port = fields.Char('Port', required=True, default=8069)
+    name = fields.Char('Database', required=True, help='Database you want to schedule backups for',
+                       default=_get_db_name)
+    folder = fields.Char('Backup Directory', help='Absolute path for storing the backups', required='True',
+                         default='/odoo/backups')
+    backup_type = fields.Selection([('zip', 'Zip'), ('dump', 'Dump')], 'Backup Type', required=True, default='zip')
+    autoremove = fields.Boolean('Auto. Remove Backups',
+                                help='If you check this option you can choose to automaticly remove the backup '
+                                     'after xx days')
+    days_to_keep = fields.Integer('Remove after x days',
+                                  help="Choose after how many days the backup should be deleted. For example:\n"
+                                       "If you fill in 5 the backups will be removed after 5 days.",
+                                  required=True)
+
+    # Columns for external server (SFTP)
+    sftp_write = fields.Boolean('Write to external server with sftp',
+                                help="If you check this option you can specify the details needed to write to a remote "
+                                     "server with SFTP.")
+    sftp_path = fields.Char('Path external server',
+                            help='The location to the folder where the dumps should be written to. For example '
+                                 '/odoo/backups/.\nFiles will then be written to /odoo/backups/ on your remote server.')
+    sftp_host = fields.Char('IP Address SFTP Server',
+                            help='The IP address from your remote server. For example 192.168.0.1')
+    sftp_port = fields.Integer('SFTP Port', help='The port on the FTP server that accepts SSH/SFTP calls.', default=22)
+    sftp_user = fields.Char('Username SFTP Server',
+                            help='The username where the SFTP connection should be made with. This is the user on the '
+                                 'external server.')
+    sftp_password = fields.Char('Password User SFTP Server',
+                                help='The password from the user where the SFTP connection should be made with. This '
+                                     'is the password from the user on the external server.')
+    days_to_keep_sftp = fields.Integer('Remove SFTP after x days',
+                                       help='Choose after how many days the backup should be deleted from the FTP '
+                                            'server. For example:\nIf you fill in 5 the backups will be removed after '
+                                            '5 days from the FTP server.',
+                                       default=30)
+    send_mail_sftp_fail = fields.Boolean('Auto. E-mail on backup fail',
+                                         help='If you check this option you can choose to automaticly get e-mailed '
+                                              'when the backup to the external server failed.')
+    email_to_notify = fields.Char('E-mail to notify',
+                                  help='Fill in the e-mail where you want to be notified that the backup failed on '
+                                       'the FTP.')
+
+    def test_sftp_connection(self, context=None):
+        self.ensure_one()
+
+        # Check if there is a success or fail and write messages
+        message_title = ""
+        message_content = ""
+        error = ""
+        has_failed = False
+
+        for rec in self:
+            ip_host = rec.sftp_host
+            port_host = rec.sftp_port
+            username_login = rec.sftp_user
+            password_login = rec.sftp_password
+
+            # Connect with external server over SFTP, so we know sure that everything works.
+            try:
+                s = paramiko.SSHClient()
+                s.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+                s.connect(ip_host, port_host, username_login, password_login, timeout=10)
+                sftp = s.open_sftp()
+                sftp.close()
+                message_title = _("Connection Test Succeeded!\nEverything seems properly set up for FTP back-ups!")
+            except Exception as e:
+                _logger.critical('There was a problem connecting to the remote ftp: %s', str(e))
+                error += str(e)
+                has_failed = True
+                message_title = _("Connection Test Failed!")
+                if len(rec.sftp_host) < 8:
+                    message_content += "\nYour IP address seems to be too short.\n"
+                message_content += _("Here is what we got instead:\n")
+            finally:
+                if s:
+                    s.close()
+
+        if has_failed:
+            raise Warning(message_title + '\n\n' + message_content + "%s" % str(error))
+        else:
+            raise Warning(message_title + '\n\n' + message_content)
+
+    @api.model
+    def schedule_backup(self):
+        conf_ids = self.search([])
+        for rec in conf_ids:
+
+            try:
+                if not os.path.isdir(rec.folder):
+                    os.makedirs(rec.folder)
+            except:
+                raise
+            # Create name for dumpfile.
+            bkp_file = '%s_%s.%s' % (time.strftime('%Y_%m_%d_%H_%M_%S'), rec.name, rec.backup_type)
+            file_path = os.path.join(rec.folder, bkp_file)
+            try:
+                # try to backup database and write it away
+                fp = open(file_path, 'wb')
+                self._take_dump(rec.name, fp, 'db.backup', rec.backup_type)
+                fp.close()
+            except Exception as error:
+                _logger.debug(
+                    "Couldn't backup database %s. Bad database administrator password for server running at "
+                    "http://%s:%s" % (rec.name, rec.host, rec.port))
+                _logger.debug("Exact error from the exception: %s", str(error))
+                continue
+
+            # Check if user wants to write to SFTP or not.
+            if rec.sftp_write is True:
+                try:
+                    # Store all values in variables
+                    dir = rec.folder
+                    path_to_write_to = rec.sftp_path
+                    ip_host = rec.sftp_host
+                    port_host = rec.sftp_port
+                    username_login = rec.sftp_user
+                    password_login = rec.sftp_password
+                    _logger.debug('sftp remote path: %s', path_to_write_to)
+
+                    try:
+                        s = paramiko.SSHClient()
+                        s.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+                        s.connect(ip_host, port_host, username_login, password_login, timeout=20)
+                        sftp = s.open_sftp()
+                    except Exception as error:
+                        _logger.critical('Error connecting to remote server! Error: %s', str(error))
+
+                    try:
+                        sftp.chdir(path_to_write_to)
+                    except IOError:
+                        # Create directory and subdirs if they do not exist.
+                        current_directory = ''
+                        for dirElement in path_to_write_to.split('/'):
+                            current_directory += dirElement + '/'
+                            try:
+                                sftp.chdir(current_directory)
+                            except:
+                                _logger.info('(Part of the) path didn\'t exist. Creating it now at %s',
+                                             current_directory)
+                                # Make directory and then navigate into it
+                                sftp.mkdir(current_directory, 777)
+                                sftp.chdir(current_directory)
+                                pass
+                    sftp.chdir(path_to_write_to)
+                    # Loop over all files in the directory.
+                    for f in os.listdir(dir):
+                        if rec.name in f:
+                            fullpath = os.path.join(dir, f)
+                            if os.path.isfile(fullpath):
+                                try:
+                                    sftp.stat(os.path.join(path_to_write_to, f))
+                                    _logger.debug(
+                                        'File %s already exists on the remote FTP Server ------ skipped', fullpath)
+                                # This means the file does not exist (remote) yet!
+                                except IOError:
+                                    try:
+                                        sftp.put(fullpath, os.path.join(path_to_write_to, f))
+                                        _logger.info('Copying File % s------ success', fullpath)
+                                    except Exception as err:
+                                        _logger.critical(
+                                            'We couldn\'t write the file to the remote server. Error: %s', str(err))
+
+                    # Navigate in to the correct folder.
+                    sftp.chdir(path_to_write_to)
+
+                    _logger.debug("Checking expired files")
+                    # Loop over all files in the directory from the back-ups.
+                    # We will check the creation date of every back-up.
+                    for file in sftp.listdir(path_to_write_to):
+                        if rec.name in file:
+                            # Get the full path
+                            fullpath = os.path.join(path_to_write_to, file)
+                            # Get the timestamp from the file on the external server
+                            timestamp = sftp.stat(fullpath).st_mtime
+                            createtime = datetime.datetime.fromtimestamp(timestamp)
+                            now = datetime.datetime.now()
+                            delta = now - createtime
+                            # If the file is older than the days_to_keep_sftp (the days to keep that the user filled in
+                            # on the Odoo form it will be removed.
+                            if delta.days >= rec.days_to_keep_sftp:
+                                # Only delete files, no directories!
+                                if ".dump" in file or '.zip' in file:
+                                    _logger.info("Delete too old file from SFTP servers: %s", file)
+                                    sftp.unlink(file)
+                    # Close the SFTP session.
+                    sftp.close()
+                    s.close()
+                except Exception as e:
+                    try:
+                        sftp.close()
+                        s.close()
+                    except:
+                        pass
+                    _logger.error('Exception! We couldn\'t back up to the FTP server. Here is what we got back '
+                                  'instead: %s', str(e))
+                    # At this point the SFTP backup failed. We will now check if the user wants
+                    # an e-mail notification about this.
+                    if rec.send_mail_sftp_fail:
+                        try:
+                            ir_mail_server = self.env['ir.mail_server'].search([], order='sequence asc', limit=1)
+                            message = "Dear,\n\nThe backup for the server " + rec.host + " (IP: " + rec.sftp_host + \
+                                      ") failed. Please check the following details:\n\nIP address SFTP server: " + \
+                                      rec.sftp_host + "\nUsername: " + rec.sftp_user + \
+                                      "\n\nError details: " + tools.ustr(e) + \
+                                      "\n\nWith kind regards"
+                            catch_all_domain = self.env["ir.config_parameter"].sudo().get_param("mail.catchall.domain")
+                            response_mail = "auto_backup@%s" % catch_all_domain if catch_all_domain else self.env.user.partner_id.email
+                            msg = ir_mail_server.build_email(response_mail, [rec.email_to_notify],
+                                                             "Backup from " + rec.host + "(" + rec.sftp_host +
+                                                             ") failed",
+                                                             message)
+                            ir_mail_server.send_email(msg)
+                        except Exception:
+                            pass
+
+            # Remove all old files (on local server) in case this is configured..
+            if rec.autoremove:
+                directory = rec.folder
+                # Loop over all files in the directory.
+                for f in os.listdir(directory):
+                    fullpath = os.path.join(directory, f)
+                    # Only delete the ones wich are from the current database
+                    # (Makes it possible to save different databases in the same folder)
+                    if rec.name in fullpath:
+                        timestamp = os.stat(fullpath).st_ctime
+                        createtime = datetime.datetime.fromtimestamp(timestamp)
+                        now = datetime.datetime.now()
+                        delta = now - createtime
+                        if delta.days >= rec.days_to_keep:
+                            # Only delete files (which are .dump and .zip), no directories.
+                            if os.path.isfile(fullpath) and (".dump" in f or '.zip' in f):
+                                _logger.info("Delete local out-of-date file: %s", fullpath)
+                                os.remove(fullpath)
+
+    # This is more or less the same as the default Odoo function at
+    # https://github.com/odoo/odoo/blob/e649200ab44718b8faefc11c2f8a9d11f2db7753/odoo/service/db.py#L209
+    # The main difference is that we do not do have a wrapper for the function check_db_management_enabled here and
+    # that we authenticate based on the cron its user id and by checking if we have 'db.backup' defined in the function
+    # call. Since this function is called from the cron and since we have these security checks on model and on user_id
+    # its pretty impossible to hack any way to take a backup. This allows us to disable the Odoo database manager
+    # which is a MUCH safer way
+    def _take_dump(self, db_name, stream, model, backup_format='zip'):
+        """Dump database `db` into file-like object `stream` if stream is None
+        return a file object with the dump """
+
+        cron_user_id = self.env.ref('jikimo_auto_backup.backup_scheduler').user_id.id
+        if self._name != 'db.backup' or cron_user_id != self.env.user.id:
+            _logger.error('Unauthorized database operation. Backups should only be available from the cron job.')
+            raise AccessDenied()
+
+        _logger.info('DUMP DB: %s format %s', db_name, backup_format)
+
+        cmd = ['pg_dump', '--no-owner']
+        cmd.append(db_name)
+
+        if backup_format == 'zip':
+            with tempfile.TemporaryDirectory() as dump_dir:
+                filestore = odoo.tools.config.filestore(db_name)
+                if os.path.exists(filestore):
+                    shutil.copytree(filestore, os.path.join(dump_dir, 'filestore'))
+                with open(os.path.join(dump_dir, 'manifest.json'), 'w') as fh:
+                    db = odoo.sql_db.db_connect(db_name)
+                    with db.cursor() as cr:
+                        json.dump(self._dump_db_manifest(cr), fh, indent=4)
+                cmd.insert(-1, '--file=' + os.path.join(dump_dir, 'dump.sql'))
+                odoo.tools.exec_pg_command(*cmd)
+                if stream:
+                    odoo.tools.osutil.zip_dir(dump_dir, stream, include_dir=False, fnct_sort=lambda file_name: file_name != 'dump.sql')
+                else:
+                    t=tempfile.TemporaryFile()
+                    odoo.tools.osutil.zip_dir(dump_dir, t, include_dir=False, fnct_sort=lambda file_name: file_name != 'dump.sql')
+                    t.seek(0)
+                    return t
+        else:
+            cmd.insert(-1, '--format=c')
+            stdin, stdout = odoo.tools.exec_pg_command_pipe(*cmd)
+            if stream:
+                shutil.copyfileobj(stdout, stream)
+            else:
+                return stdout
+
+    def _dump_db_manifest(self, cr):
+        pg_version = "%d.%d" % divmod(cr._obj.connection.server_version / 100, 100)
+        cr.execute("SELECT name, latest_version FROM ir_module_module WHERE state = 'installed'")
+        modules = dict(cr.fetchall())
+        manifest = {
+            'odoo_dump': '1',
+            'db_name': cr.dbname,
+            'version': odoo.release.version,
+            'version_info': odoo.release.version_info,
+            'major_version': odoo.release.major_version,
+            'pg_version': pg_version,
+            'modules': modules,
+        }
+        return manifest

jikimo_auto_backup/requirments.txt

@@ -0,0 +1 @@
+# pip3 install paramiko

jikimo_auto_backup/security/ir.model.access.csv

@@ -0,0 +1,3 @@
+id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
+admin_access, db_backup admin access,model_db_backup,base.group_no_one,1,1,1,1
+admin_security_rule, Model db_backup admin access,model_db_backup,jikimo_auto_backup.group_manager,1,1,1,1

jikimo_auto_backup/security/user_groups.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<odoo>
+    <data>
+        <record model="ir.module.category" id="module_management">
+            <field name="name">Auto backup access</field>
+            <field name="description">User access level for this module</field>
+            <field name="sequence">3</field>
+        </record>
+
+        <record id="group_manager" model="res.groups">
+            <field name="name">Manager</field>
+            <field name="category_id" ref="jikimo_auto_backup.module_management"/>
+        </record>
+    </data>
+</odoo>

jikimo_auto_backup/static/description/index.html

@@ -0,0 +1,95 @@
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Automated backups</h2>
+            <h3 class="oe_slogan">A tool for all your back-ups, internal and external!</h3>
+        </div>
+	<div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                    <img src="overview.png">
+            </div>
+        </div>
+	<div class="oe_span6">
+            <p class="oe_mt32">
+		Keep your Odoo data safe with this module. Take automated back-ups, remove them automatically 
+		and even write them to an external server through an encrypted tunnel.
+		You can even specify how long local backups and external backups should be kept, automatically!
+            </p>
+            <div class="oe_centeralign oe_websiteonly">
+                <a href="http://www.openerp.com/start?app=mail" class="oe_button oe_big oe_tacky">Start your <span class="oe_emph">free</span> trial</a>
+            </div>
+        </div>
+    </div>
+</section>
+<!-- Second block -->
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">Connect with an FTP Server</h2>
+        <h3 class="oe_slogan">Keep your data safe, through an SSH tunnel!</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+		Want to go even further and write your backups to an external server?
+		You can with this module! Specify the credentials to the server, specify a path and 			everything will be backed up automatically. This is done through an SSH (encrypted) tunnel, 			thanks to pysftp, so your data is safe!
+
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="terminalssh.png">
+            </div>
+        </div>
+    </div>
+</section>
+<!--Third block -->
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Test connection</h2>
+            <h3 class="oe_slogan">Checks your credentials in one click</h3>
+        </div>
+	<div class="oe_span6">
+            <div class="oe_demo oe_picture oe_screenshot">
+                    <img src="testconnection.png">
+		    <img src="testconnectionfailed.png">
+            </div>
+        </div>
+	<div class="oe_span6">
+            <p class="oe_mt32">
+		Want to make sure if the connection details are correct and if Odoo can automatically write them to the remote server? Simply click on the 'Test SFTP Connection' button and you will get message telling you if everything is OK, or what is wrong!
+            </p>
+        </div>
+    </div>
+</section>
+<!-- Fourth block -->
+<section class="oe_container oe_dark">
+    <div class="oe_row oe_spaced">
+        <h2 class="oe_slogan">E-mail on backup failure</h2>
+        <h3 class="oe_slogan">Stay informed of problems, automatically!</h3>
+        <div class="oe_span6">
+            <p class="oe_mt32">
+		Do you want to know if the database backup failed? Check the checkbox 'Auto. E-mail on backup fail' and fill in your e-mail.
+		Every time a backup fails you will get an e-mail in your mailbox with technical details.
+            </p>
+        </div>
+        <div class="oe_span6">
+            <div class="oe_row_img oe_centered">
+                <img class="oe_picture oe_screenshot" src="emailnotification.png">
+            </div>
+        </div>
+    </div>
+</section>
+<!--Fifth block -->
+<section class="oe_container">
+    <div class="oe_row oe_spaced">
+        <div class="oe_span12">
+            <h2 class="oe_slogan">Contact / Support</h2>
+            <h3 class="oe_slogan">Need help or want extra features?</h3>
+        </div>
+	<div class="oe_span6">
+            <p class="oe_mt32">
+		Need help with the configuration or want this module to have more functionalities?
+		Please create a bug report <a href="https://github.com/Yenthe666/auto_backup/issues">on the Github issue tracker</a>
+            </p>
+        </div>
+    </div>
+</section>

jikimo_auto_backup/views/backup_view.xml

@@ -0,0 +1,105 @@
+<odoo>
+    <record id="view_backup_config_form" model="ir.ui.view">
+        <field name="name">db.backup.form</field>
+        <field name="model">db.backup</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Back-up view">
+                <sheet>
+                    <group col="4" colspan="4">
+                        <separator col="2" string="Local backup configuration"/>
+                    </group>
+                    <group name="configuration">
+                        <field name="host" colspan="2"/>
+                        <field name="name"/>
+                        <field name="port"/>
+                        <field name="backup_type"/>
+                        <field name="folder"/>
+                        <field name="autoremove"/>
+                        <field name="days_to_keep" attrs="{'invisible': [('autoremove','=',False)]}"/>
+                    </group>
+                    <group name="allow_stfp" col="4" colspan="4">
+                        <separator col="2" string="SFTP"/>
+                    </group>
+                    <div style="width:50%;border-radius:10px;margin: 10px 0px;padding:15px 10px 15px 10px;
+                        background-repeat: no-repeat;background-position: 10px center;color: #9F6000;
+                        background-color: #FEEFB3;"
+                         attrs="{'invisible': [('sftp_write','=',False)]}">
+                        <b>Warning:</b>
+                        Use SFTP with caution! This writes files to external servers under the path you specify.
+                    </div>
+                    <group name="sftp_configuration">
+                        <field name="sftp_write"/>
+                        <field name="sftp_host"
+                               attrs="{'invisible':[('sftp_write', '=', False)],'required':[('sftp_write', '=', True)]}"/>
+                        <field name="sftp_port"
+                               attrs="{'invisible':[('sftp_write', '=', False)],'required':[('sftp_write', '=', True)]}"/>
+                        <field name="sftp_user"
+                               attrs="{'invisible':[('sftp_write', '=', False)], 'required':[('sftp_write', '=', True)]}"/>
+                        <field name="sftp_password"
+                               attrs="{'invisible':[('sftp_write', '=', False)],'required': [('sftp_write', '=', True)]}"
+                               password="True"/>
+                        <field name="sftp_path"
+                               attrs="{'invisible':[('sftp_write', '==', False)],'required':[('sftp_write', '==', True)]}"
+                               placeholder="For example: /odoo/backups/"/>
+                        <field name="days_to_keep_sftp"
+                               attrs="{'invisible': [('sftp_write', '=', False)], 'required': [('sftp_write', '=', True)]}"/>
+                        <field name="send_mail_sftp_fail" attrs="{'invisible': [('sftp_write','=',False)]}"/>
+                        <field name="email_to_notify"
+                               attrs="{'invisible':['|',('send_mail_sftp_fail', '==', False), ('sftp_write', '=', False)], 'required': [('send_mail_sftp_fail', '=', True)]}"/>
+                        <button name="test_sftp_connection" type="object"
+                                attrs="{'invisible': [('sftp_write','=',False)]}" string="Test SFTP Connection"/>
+                    </group>
+                    <separator string="Help" colspan="2"/>
+                    <div name="configuration_details">
+                        This configures the scheduler for automatic backup of the given database running on given host
+                        at given port on regular intervals.
+                        <br/>
+                        Automatic backups of the database can be scheduled as follows:
+                        <ol>
+                            <li>
+                                Go to Settings / Technical / Automation / Scheduled Actions.
+                            </li>
+                            <li>
+                                Search the action named 'Backup scheduler'.
+                            </li>
+                            <li>
+                                Set the scheduler to active and fill in how often you want backups generated.
+                            </li>
+                        </ol>
+                        <p style="font-size:18px;">
+                            Need more help?
+                            <a href="https://github.com/Yenthe666/auto_backup/issues">Contact me!</a>
+                        </p>
+                    </div>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record id="view_backup_config_tree" model="ir.ui.view">
+        <field name="name">db.backup.tree</field>
+        <field name="model">db.backup</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name='host'/>
+                <field name='port'/>
+                <field name='name'/>
+                <field name='folder'/>
+                <field name="autoremove"/>
+                <field name="sftp_host"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="action_backup" model="ir.actions.act_window">
+        <field name="name">Configure back-ups</field>
+        <field name="res_model">db.backup</field>
+        <field name="view_mode">tree,form</field>
+        <field name="view_id" ref="view_backup_config_tree"/>
+    </record>
+
+    <menuitem id="auto_backup_menu" name="Back-ups" parent="base.menu_custom"/>
+    <menuitem parent="auto_backup_menu" action="action_backup" id="backup_conf_menu"/>
+</odoo>

jikimo_frontend/static/src/js/custom_form_status_indicator.js

@@ -5,6 +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 {Field} from "@web/views/fields/field";
 
@@ -150,6 +151,37 @@ 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)
+//        }
+//    }
+// })
+
 $(function () {
     document.addEventListener('click', function () {
         const dom = $('.o_form_status_indicator_buttons ')

jikimo_frontend/static/src/scss/custom_style.scss

@@ -490,5 +490,45 @@ div:has(.o_required_modifier) > label::before {
   transform: translateY(-50%);
 }
 .o_list_renderer .o_list_table tfoot .o_list_number {
-  text-align: left;
-}
+  text-align: left !important;
+}
+
+.o_field_widget.o_readonly_modifier.o_required_modifier.o_field_many2one[name=production_id] .o_form_uri {
+  font-weight: bold;
+  font-size: 20px;
+}
+
+// 修改 【批量排程】【配送】 按钮UI
+.btn-secondary {
+  color: #fff;
+  background-color: #4A4F59;
+  border-color: #4A4F59;
+}
+
+// 功能刀具组装单 弹窗样式
+.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div.col-lg-6 .o_inner_group.col-lg-6 {
+  width: 100%;
+}
+.o_horizontal_separator.mt-4.mb-3.text-uppercase.fw-bolder.small ~ div .o_inner_group .o_wrap_field.d-flex.d-sm-contents.flex-column{
+  display: flex!important;
+  flex-direction: row!important;
+  input {
+    border-bottom: 1px solid;
+  }
+}
+
+// 设置表格横向滚动
+.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,53 +301,27 @@ 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' 模型是否存在于环境中
-    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
-
+    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.'))
     return True
 
 
 BaseModel._create = _create
-BaseModel.unlink = unlink
+BaseModel.unlink = unlink

jikimo_system_order/__init__.py

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

jikimo_system_order/__manifest__.py

@@ -0,0 +1,39 @@
+# -*- 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

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

jikimo_system_order/controllers/controllers.py

@@ -0,0 +1,20 @@
+# -*- 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

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

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

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

@@ -0,0 +1,25 @@
+# -*- 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

@@ -0,0 +1,32 @@
+# -*- 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

@@ -0,0 +1,183 @@
+# -*- 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

@@ -0,0 +1,38 @@
+# -*- 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

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

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

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

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

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

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

@@ -0,0 +1,6 @@
+# -*- 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

@@ -0,0 +1,79 @@
+# -*- 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

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

@@ -0,0 +1,59 @@
+# -*- 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

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

@@ -0,0 +1,42 @@
+#!/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']
+    _inherit = ['mrp.workorder', 'barcodes.barcode_events_mixin', 'mail.thread', 'mail.activity.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,14 +47,17 @@ 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')
@@ -65,7 +68,8 @@ 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')
@@ -91,7 +95,8 @@ 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)
@@ -138,7 +143,8 @@ 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):
@@ -152,7 +158,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
 
@@ -279,7 +285,8 @@ 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',
@@ -320,7 +327,8 @@ 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
@@ -342,11 +350,13 @@ 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
@@ -363,8 +373,10 @@ 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,
@@ -412,7 +424,8 @@ 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':
@@ -423,7 +436,8 @@ 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)
@@ -442,7 +456,8 @@ 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()
@@ -466,7 +481,8 @@ 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'
@@ -521,7 +537,8 @@ 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,
@@ -553,7 +570,8 @@ 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,6 +27,13 @@
                     </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>
 

odoo.conf

@@ -4,7 +4,8 @@ csv_internal_sep = ,
 data_dir = /var/lib/odoo
 db_host = 172.17.0.2
 db_maxconn = 64
-db_name = sf_t2cs_003
+# db_name = sf_t_0430
+db_name = t_240509
 db_password = sf
 db_port = 5432
 db_sslmode = prefer

sf_base/commons/Email.py

@@ -0,0 +1,27 @@
+from odoo import api, models
+
+
+class MailSender(models.Model):
+    _name = 'mail.sender'
+    _description = 'Mail Sender'
+
+    def mail_sender(self, mail_server_name, subject_name, email_to, error_message):
+        mail_server = self.env['ir.mail_server'].sudo().search([('name', '=', mail_server_name)], limit=1)
+        if not mail_server:
+            _logger.info('管理员还未配置名称为 %s 的smtp服务器信息，请联系管理员配置！' % mail_server_name)
+            return
+        if not mail_server.smtp_user or not mail_server.smtp_pass:
+            _logger.info("邮件发送账号未正确设置，请联系管理员！")
+            return
+        mail_values = {
+            'message_type': 'email', 'subject': subject_name,
+            'mail_server_id': mail_server.id, 'email_from': mail_server.smtp_user,
+            'email_to': email_to
+        }
+        temp_mail_html = """
+                    Hi, <p> 这里是异常提醒通知： </p>
+                """
+
+        temp_mail_html += """ %s """ % error_message
+        mail_values['body_html'] = temp_mail_html
+        self.env['mail.mail'].sudo().create(mail_values).send(auto_commit=True)

sf_base/commons/__init__.py

@@ -1,2 +1,3 @@
 from . import common
 from . import Printer
+from . import Email

sf_base/controllers/controllers.py

@@ -8,7 +8,7 @@ from odoo.http import request
 
 class Manufacturing_Connect(http.Controller):
 
-    @http.route('/AutoDeviceApi/MachineToolGroup', type='json', auth='none', methods=['GET', 'POST'], csrf=False,
+    @http.route('/AutoDeviceApi/MachineToolGroup', type='json', auth='sf_token', methods=['GET', 'POST'], csrf=False,
                 cors="*")
     def get_maintenance_tool_groups_Info(self, **kw):
         """

sf_base/models/common.py

@@ -61,12 +61,10 @@ class MrsMaterialModel(models.Model):
     supplier_ids = fields.One2many('sf.supplier.sort', 'materials_model_id', string='供应商')
     active = fields.Boolean('有效', default=True)
 
-    @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:
+    @api.constrains("gain_way")
+    def _check_supplier_ids(self):
+        for item in self:
+            if item.gain_way in ('外协', '采购') and not item.supplier_ids:
                 raise UserError("请添加供应商")
 
 
@@ -94,8 +92,10 @@ class MrsProductionProcess(models.Model):
     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')
+    category_id = fields.Many2one('sf.production.process.category', string='表面工艺类别')
     # workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_process', required=True)
+    processing_day = fields.Float('加工天数/d')
+    travel_day = fields.Float('路途天数/d')
 
 
 # class MrsProcessingTechnology(models.Model):
@@ -143,7 +143,10 @@ 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)
 
     def name_get(self):

sf_base/models/tool_base_new.py

@@ -329,9 +329,9 @@ class ToolInventory(models.Model):
     blade_number = fields.Integer('刃数(个)')
     extension = fields.Float('伸出长度(mm)')
     work_material = fields.Selection([('钢', '钢'), ('铝', '铝')], string='加工材料')
-    life_span = fields.Float('寿命(h)')
+    life_span = fields.Float('寿命(min)')
 
-    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组')
+    tool_groups_id = fields.Many2one('sf.tool.groups', string='刀具组', required=True)
 
     active = fields.Boolean('已归档', default=True)
 

sf_base/security/group_security.xml

@@ -84,6 +84,17 @@
             <field name="category_id" ref="base.module_category_inventory_purchase"/>
         </record>
 
+        <record id="group_sf_stock_user" model="res.groups">
+            <field name="name">仓储岗</field>
+            <field name="category_id" ref="base.module_category_inventory_inventory"/>
+            <field name="implied_ids" eval="[(4, ref('base.group_user'))]"/>
+        </record>
+        <record id="group_sf_stock_manager" model="res.groups">
+            <field name="name">仓储总监</field>
+            <field name="category_id" ref="base.module_category_inventory_inventory"/>
+            <field name="implied_ids" eval="[(4, ref('group_sf_stock_user'))]"/>
+        </record>
+
 
     </data>
 </odoo>

sf_base/security/ir.model.access.csv

@@ -11,7 +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_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
@@ -48,6 +49,7 @@ access_sf_functional_cutting_tool_admin,sf_functional_cutting_tool_admin,model_s
 access_sf_functional_cutting_tool_model,sf_functional_cutting_tool_model,model_sf_functional_cutting_tool_model,base.group_user,1,1,1,0
 access_sf_functional_cutting_tool_model_admin,sf_functional_cutting_tool_model_admin,model_sf_functional_cutting_tool_model,base.group_system,1,1,1,0
 access_sf_fixture_material,sf_fixture_material,model_sf_fixture_material,base.group_user,1,1,1,0
+access_sf_fixture_material_group_sf_stock_user,sf_fixture_material_group_sf_stock_user,model_sf_fixture_material,sf_base.group_sf_stock_user,1,1,1,0
 access_sf_fixture_material_admin,sf_fixture_material_admin,model_sf_fixture_material,base.group_system,1,1,1,0
 access_sf_fixture_materials_basic_parameters,sf_fixture_materials_basic_parameters,model_sf_fixture_materials_basic_parameters,base.group_user,1,1,1,0
 access_sf_fixture_materials_basic_parameters_admin,sf_fixture_materials_basic_parameters_admin,model_sf_fixture_materials_basic_parameters,base.group_system,1,1,1,0
@@ -227,3 +229,16 @@ access_sf_fixture_model_group_sale_director,sf_fixture_model_group_sale_director
 access_sf_fixture_materials_basic_parameters_group_sale_director,sf_fixture_materials_basic_parameters_group_sale_director,model_sf_fixture_materials_basic_parameters,sf_base.group_sale_director,1,0,0,0
 access_sf_machine_tool_type_group_sale_director,sf_machine_tool_type_group_sale_director,model_sf_machine_tool_type,sf_base.group_sale_director,1,0,0,0
 
+access_sf_fixture_material_group_plan_director,sf_fixture_material_group_plan_director,model_sf_fixture_material,sf_base.group_plan_director,1,0,0,0
+access_sf_fixture_model_group_plan_director,sf_fixture_model_group_plan_director,model_sf_fixture_model,sf_base.group_plan_director,1,0,0,0
+access_sf_fixture_materials_basic_parameters_group_plan_director,sf_fixture_materials_basic_parameters_group_plan_director,model_sf_fixture_materials_basic_parameters,sf_base.group_plan_director,1,0,0,0
+access_sf_multi_mounting_type_group_plan_director,sf_multi_mounting_type_group_plan_director,model_sf_multi_mounting_type,sf_base.group_plan_director,1,0,0,0
+
+access_sf_production_materials_group_sf_stock_manager,sf_production_materials_group_sf_stock_manager,model_sf_production_materials,sf_base.group_sf_stock_manager,1,0,0,0
+access_sf_materials_model_group_sf_stock_manager,sf_materials_model_group_sf_stock_manager,model_sf_materials_model,sf_base.group_sf_stock_manager,1,0,0,0
+access_sf_fixture_material_group_sf_stock_manager,sf_fixture_material_group_sf_stock_manager,model_sf_fixture_material,sf_base.group_sf_stock_manager,1,0,0,0
+access_sf_fixture_model_group_sf_stock_manager,sf_fixture_model_group_sf_stock_manager,model_sf_fixture_model,sf_base.group_sf_stock_manager,1,0,0,0
+access_sf_fixture_materials_basic_parameters_group_sf_stock_manager,sf_fixture_materials_basic_parameters_group_sf_stock_manager,model_sf_fixture_materials_basic_parameters,sf_base.group_sf_stock_manager,1,0,0,0
+access_sf_multi_mounting_type_group_sf_stock_manager,sf_multi_mounting_type_group_sf_stock_manager,model_sf_multi_mounting_type,sf_base.group_sf_stock_manager,1,0,0,0
+access_sf_machine_brand_group_sf_stock_manager,sf_machine_brand_group_sf_stock_manager,model_sf_machine_brand,sf_base.group_sf_stock_manager,1,0,0,0
+access_sf_cutting_tool_type_group_sf_stock_manager,sf_cutting_tool_type_group_sf_stock_manager,model_sf_cutting_tool_type,sf_base.group_sf_stock_manager,1,0,0,0

sf_base/static/src/scss/format_img.scss

@@ -1,7 +1,7 @@
 .o_data_row .w-100 {
   width: 40px !important;
   height: 40px !important;
-  display: block !important;
+  //display: block !important;
 }
 
 .o_list_renderer .o_list_table tbody > tr > td:not(.o_list_record_selector):not(.o_handle_cell):not(.o_list_button):not(.o_list_record_remove) {

sf_base/views/common_view.xml

@@ -27,13 +27,17 @@
                             <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"/>
+                            </group>
                         </group>
                         <notebook>
                             <page string="适用材料">
-                                <field name="materials_model_ids" readonly="1"></field>
+                                <field name="materials_model_ids"></field>
                             </page>
                         </notebook>
                     </sheet>
@@ -179,41 +183,46 @@
                         </div>
                         <group>
                             <group>
-                                <field name="code"/>
+                                <field name="code" readonly="1"/>
+                                <field name="category_id" readonly="1"/>
+                            </group>
+                            <group>
+                                <field name="processing_day" readonly="1"/>
+                                <field name="travel_day" readonly="1"/>
                             </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>
-                                                    <group>
-                                                        <field name="code"/>
-                                                        <field name="name" string="参数名"/>
-                                                    </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>
                         </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>
+                                                <group>
+                                                    <field name="code"/>
+                                                    <field name="name" string="参数名"/>
+                                                </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>
                         <group>
                             <group>
                                 <field name="remark"/>
@@ -251,7 +260,7 @@
                         <group>
                             <group>
                                 <field name="materials_no" readonly="1" force_save="1"/>
-                                <field name="gain_way" required="1"/>
+                                <field name="gain_way" required="0"/>
                                 <field name="tensile_strength" required="1"/>
                                 <field name="hardness" required="1"/>
                                 <field name="density" readonly="1"/>
@@ -270,9 +279,9 @@
                         <notebook>
                             <page string="供应商">
                                 <field name='supplier_ids' class="supplier_ids_set_css">
-                                    <tree editable='bottom'>
+                                    <tree editable='bottom' delete="1">
                                         <field name="sequence" widget="handle" string="序号"/>
-                                        <field name="partner_id" string="名称"/>
+                                        <field name="partner_id" string="名称" options="{'no_create': True}"/>
                                     </tree>
                                 </field>
                             </page>

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"/>
+                <field name="name" attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="functional_cutting_tool_model_id"/>
-                <field name="tool_groups_id"/>
+                <field name="tool_groups_id" required="1" attrs="{'readonly': [('id', '!=', False)]}"/>
                 <field name="work_material"/>
                 <field name="life_span"/>
                 <field name="prefix" optional="hide"/>

sf_bf_connect/controllers/controllers.py

@@ -52,7 +52,7 @@ class Sf_Bf_Connect(http.Controller):
                         self_machining_embryo = request.env['product.template'].sudo().no_bom_product_create(
                             self_machining_id,
                             item,
-                            order_id, 'self_machining', i)
+                            order_id, 'self_machining', i, product)
                         # 创建坯料的bom
                         self_machining_bom = request.env['mrp.bom'].with_user(
                             request.env.ref("base.user_admin")).bom_create(
@@ -78,7 +78,7 @@ class Sf_Bf_Connect(http.Controller):
                                                                                                         item,
                                                                                                         order_id,
                                                                                                         'subcontract',
-                                                                                                        i)
+                                                                                                        i, product)
                         if outsource_embryo == -3:
                             res['status'] = -3
                             res['message'] = '该订单模型的材料型号在您分配的工厂里暂未设置获取方式和供应商,请先配置再进行分配'
@@ -105,17 +105,19 @@ class Sf_Bf_Connect(http.Controller):
                         purchase_embryo = request.env['product.template'].sudo().no_bom_product_create(purchase_id,
                                                                                                        item,
                                                                                                        order_id,
-                                                                                                       'purchase', i)
+                                                                                                       'purchase', i,
+                                                                                                       product)
                         if purchase_embryo == -3:
                             res['status'] = -3
                             res['message'] = '该订单模型的材料型号在您分配的工厂里暂未设置获取方式和供应商,请先配置再进行分配'
                             request.cr.rollback()
                             return json.JSONEncoder().encode(res)
-                        # 产品配置bom
-                        product_bom_purchase = request.env['mrp.bom'].with_user(
-                            request.env.ref("base.user_admin")).bom_create(product, 'normal', False)
-                        product_bom_purchase.with_user(request.env.ref("base.user_admin")).bom_create_line_has(
-                            purchase_embryo)
+                        else:
+                            # 产品配置bom
+                            product_bom_purchase = request.env['mrp.bom'].with_user(
+                                request.env.ref("base.user_admin")).bom_create(product, 'normal', False)
+                            product_bom_purchase.with_user(request.env.ref("base.user_admin")).bom_create_line_has(
+                                purchase_embryo)
                 order_id.with_user(request.env.ref("base.user_admin")).sale_order_create_line(product, item)
                 i += 1
             res['factory_order_no'] = order_id.name
@@ -165,5 +167,5 @@ class jdElcp(http.Controller):
             return json.dumps({'statusCode': 415, 'statusMessage': '订单号不能为空'}, ensure_ascii=False)
         aa = request.env['sale.order'].sudo().search([('name', '=', kw['orderNo'])])
         if aa:
-            aa.schedule_status = 'received'
+            # aa.schedule_status = 'received'
             return json.dumps({'statusCode': 200, 'statusMessage': '修改成功'}, ensure_ascii=False)

sf_bf_connect/models/http.py

@@ -21,6 +21,7 @@ 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'])
             # 查询密钥

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='MW')
+    senderNickName = fields.Char(string='寄件工厂简称', required=True, default='XT')
 
     # receiverName = fields.Char(string='收件人姓名')
     # receiverMobile = fields.Char(string='收件人电话')
@@ -56,7 +56,7 @@ class JdEclp(models.Model):
         """
         res = super(JdEclp, self).button_validate()
         if self.check_out == 'OUT':
-            if self.logistics_way != '自提':
+            if self.logistics_way != '自提' and self.logistics_way:
                 if self.logistics_status != '2':
                     raise ValidationError('非自提订单，必须先下物流单，并获取物流面单后才可出库！')
         return res
@@ -67,9 +67,10 @@ class JdEclp(models.Model):
         """
         判断是否为出库单
         """
-        if self.name:
-            is_check_out = self.name.split('/')
-            self.check_out = is_check_out[1]
+        for record in self:
+            if record.name:
+                is_check_out = record.name.split('/')
+                record.check_out = is_check_out[1]
 
     @api.depends('carrier_tracking_ref')
     def query_bill_pdf(self):
@@ -148,7 +149,7 @@ class JdEclp(models.Model):
             },
         }
         _logger.info('准备调接口1')
-        url1 = config['bfm_url'] + '/api/create/jd/order'
+        url1 = config['bfm_url_new'] + '/api/create/jd/order'
         requests.post(url1, json=json1, data=None)
         _logger.info('调用成功1')
         _logger.info('准备调接口2')
@@ -157,18 +158,31 @@ class JdEclp(models.Model):
                 'orderNo': self.origin,
             },
         }
-        url2 = config['bfm_url'] + '/api/get/jd/no'
+        url2 = config['bfm_url_new'] + '/api/get/jd/no'
         response = requests.post(url2, json=json2, data=None)
         # _logger.info('调用成功2', response.json()['result']['wbNo'])
-        self.carrier_tracking_ref = 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.is_bill = True
         self.logistics_status = '1'
 
-        # 京东物流下单后，销售订单状态改为待收货
-        self.env['sale.order'].search([('name', '=', self.origin)]).write({'scheduled_status': 'to receive'})
+        notification = {
+            'type': 'ir.actions.client',
+            'tag': 'display_notification',
+            'params': {
+                'title': _('成功'),
+                'type': 'success',
+                'message': '物流下单成功',
+                'sticky': False,
+                'next': {'type': 'ir.actions.client', 'tag': 'reload'}
+            }
+        }
 
-        # else:
-        #     raise UserError("选择京东物流才能下单呦")
+        return notification
 
     def get_bill(self):
         """
@@ -182,7 +196,7 @@ class JdEclp(models.Model):
                 'no': self.origin,
             },
         }
-        url1 = config['bfm_url'] + '/api/create/jd/bill'
+        url1 = config['bfm_url_new'] + '/api/create/jd/bill'
         response = requests.post(url1, json=json1, data=None)
         # _logger.info('调用成功2', response.json())
 

sf_bf_connect/models/process_status.py

@@ -30,7 +30,7 @@ class StatusChange(models.Model):
                 'process_start_time': process_start_time,
             },
         }
-        url1 = config['bfm_url'] + '/api/get/state/get_order'
+        url1 = config['bfm_url_new'] + '/api/get/state/get_order'
         requests.post(url1, json=json1, data=None)
         logging.info('接口已经执行=============')
 
@@ -54,7 +54,7 @@ class StatusChange(models.Model):
                 'state': '待派单',
             },
         }
-        url1 = config['bfm_url'] + '/api/get/state/cancel_order'
+        url1 = config['bfm_url_new'] + '/api/get/state/cancel_order'
         requests.post(url1, json=json1, data=None)
 
         return res

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,42 +45,50 @@
         <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>
 
-            <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"/>
+    <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>
-            <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

@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
-from odoo import models, fields
+import logging
+
+import re
+from odoo import models, fields, api
 
 
 class ResProductCategory(models.Model):
@@ -28,6 +31,20 @@ class ResMrpBomMo(models.Model):
     _inherit = 'mrp.bom'
 
     subcontractor_id = fields.Many2one('res.partner', string='外包商')
+    subcontractor_name = fields.Char('', compute='_compute_subcontractor_ids', store=True)
+
+    @api.depends('subcontractor_id')
+    def _compute_subcontractor_ids(self):
+        for item in self:
+            if item.subcontractor_id:
+                logging.info("subcontractor_ids: %s" % item.subcontractor_ids.ids)
+                subcontractor_id = int(re.sub(r"\D", "", str(item.subcontractor_id.id)))
+                item.subcontractor_ids = [subcontractor_id]
+                item.subcontractor_name = item.subcontractor_id.name
+                logging.info("subcontractor_ids: %s" % item.subcontractor_ids.ids)
+            else:
+                item.subcontractor_ids = []
+                item.subcontractor_name = ''
 
     def bom_create_line_has(self, embryo):
         vals = {
@@ -37,7 +54,7 @@ class ResMrpBomMo(models.Model):
             'product_qty': 1,
             'product_uom_id': 1
         }
-        return self.env['mrp.bom.line'].create(vals)
+        return self.env['mrp.bom.line'].sudo().create(vals)
 
     # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
     def bom_create(self, product, bom_type, product_type):
@@ -64,7 +81,7 @@ class ResMrpBomMo(models.Model):
             qty = 1
             if round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000) > 1:
                 qty = round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000)
-            bom_line = self.env['mrp.bom.line'].create({
+            bom_line = self.env['mrp.bom.line'].sudo().create({
                 'bom_id': self.id,
                 'product_id': raw_bom_line.id,
                 'product_tmpl_id': raw_bom_line.product_tmpl_id.id,

sf_dlm/models/product_template.py

@@ -0,0 +1,292 @@
+from odoo import models, fields
+import logging
+import base64
+
+
+class ResProductTemplate(models.Model):
+    _inherit = 'product.template'
+
+    # 模型的长,宽,高,体积,精度,材料
+    model_name = fields.Char('模型名称')
+    categ_type = fields.Selection(
+        [("成品", "成品"), ("胚料", "胚料"), ("原材料", "原材料")], string='产品的类别', related='categ_id.type', store=True)
+    model_long = fields.Float('模型长[mm]', digits=(16, 3))
+    model_width = fields.Float('模型宽[mm]', digits=(16, 3))
+    model_height = fields.Float('模型高[mm]', digits=(16, 3))
+    model_volume = fields.Float('模型体积[m³]')
+    model_machining_precision = fields.Selection([
+        ('0.10', '±0.10mm'),
+        ('0.05', '±0.05mm'),
+        ('0.03', '±0.03mm'),
+        ('0.02', '±0.02mm'),
+        ('0.01', '±0.01mm')], string='加工精度')
+    product_model_type_id = fields.Many2one('sf.model.type', string='产品模型类型')
+    embryo_model_type_id = fields.Many2one('sf.model.type', string='胚料模型类型')
+    model_processing_panel = fields.Char('模型加工面板')
+    model_surface_process_id = fields.Many2one('sf.production.process', string='表面工艺')
+    model_process_parameters_id = fields.Many2one('sf.processing.technology', string='工艺参数')
+    # model_price = fields.Float('模型单价', digits=(16, 3))
+    model_remark = fields.Char('模型备注说明')
+    length = fields.Float('长[mm]', digits=(16, 3))
+    width = fields.Float('宽[mm]', digits=(16, 3))
+    height = fields.Float('高[mm]', digits=(16, 3))
+    materials_id = fields.Many2one('sf.production.materials', string='材料')
+    materials_type_id = fields.Many2one('sf.materials.model', string='材料型号')
+    single_manufacturing = fields.Boolean(string="单个制造")
+    upload_model_file = fields.Many2many('ir.attachment', 'upload_model_file_attachment_ref', string='上传模型文件')
+    model_code = fields.Char('模型编码')
+    is_bfm = fields.Boolean('业务平台是否自动创建', default=False)
+
+    def _get_volume_uom_id_from_ir_config_parameter(self):
+        product_length_in_feet_param = self.env['ir.config_parameter'].sudo().get_param('product.volume_in_cubic_feet')
+        if product_length_in_feet_param == '1':
+            return self.env.ref('uom.product_uom_cubic_foot')
+        else:
+            return self.env.ref('sf_dlm.product_uom_cubic_millimeter')
+
+    # model_file = fields.Binary('模型文件')
+
+    # 胚料的库存路线设置
+    # def _get_routes(self, route_type):
+    #     route_manufacture = self.env.ref('mrp.route_warehouse0_manufacture', raise_if_not_found=False).sudo()
+    #     route_mto = self.env.ref('stock.route_warehouse0_mto', raise_if_not_found=False).sudo()
+    #     route_purchase = self.env.ref('purchase_stock.route_warehouse0_buy', raise_if_not_found=False).sudo()
+    #     if route_manufacture and route_mto:
+    #         # 外协
+    #         if route_type == 'subcontract':
+    #             route_subcontract = self.env.ref('mrp_subcontracting.route_resupply_subcontractor_mto',
+    #                                              raise_if_not_found=False).sudo()
+    #             return [route_mto.id, route_purchase.id, route_subcontract.id]
+    #         elif route_type == 'purchase':
+    #             # 采购
+    #             return [route_mto.id, route_purchase.id]
+    #         else:
+    #             return [route_mto.id, route_manufacture.id]
+    #     return []
+
+    # route_ids = fields.Many2many(default=lambda self: self._get_route())
+
+    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品
+    def product_create(self, product_id, item, order_id, order_number, i):
+        copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
+        copy_product_id.product_tmpl_id.active = True
+        model_type = self.env['sf.model.type'].search([], limit=1)
+        attachment = self.attachment_create(item['model_name'], item['model_data'])
+        vals = {
+            'name': '%s-%s-%s' % ('P', order_id.name, i),
+            'model_long': item['model_long'] + model_type.embryo_tolerance,
+            'model_width': item['model_width'] + model_type.embryo_tolerance,
+            'model_height': item['model_height'] + model_type.embryo_tolerance,
+            'model_volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    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_machining_precision': item['model_machining_precision'],
+            'model_code': item['barcode'],
+            'length': item['model_long'],
+            'width': item['model_width'],
+            'height': item['model_height'],
+            'volume': item['model_long'] * item['model_width'] * item['model_height'],
+            'model_file': '' if not item['model_file'] else base64.b64decode(item['model_file']),
+            'model_name': attachment.name,
+            'upload_model_file': [(6, 0, [attachment.id])],
+            # 'single_manufacturing': True,
+            # 'tracking': 'serial',
+            'list_price': item['price'],
+            # 'categ_id': self.env.ref('sf_dlm.product_category_finished_sf').id,
+            'materials_id': self.env['sf.production.materials'].search(
+                [('materials_no', '=', item['texture_code'])]).id,
+            'materials_type_id': self.env['sf.materials.model'].search(
+                [('materials_no', '=', item['texture_type_code'])]).id,
+            'model_surface_process_id': self.env['sf.production.process'].search(
+                [('process_encode', '=', item['surface_process_code'])]).id,
+            # 'model_process_parameters_id': self.env['sf.processing.technology'].search(
+            #     [('process_encode', '=', item['process_parameters_code'])]).id,
+            'model_remark': item['remark'],
+            'default_code': '%s-%s' % (order_number, i),
+            # 'barcode': item['barcode'],
+            'active': True,
+            # 'route_ids': self._get_routes('')
+        }
+        copy_product_id.sudo().write(vals)
+        # product_id.product_tmpl_id.active = False
+        return copy_product_id
+
+    def attachment_create(self, name, data):
+        attachment = self.env['ir.attachment'].create({
+            'datas': base64.b64decode(data),
+            'type': 'binary',
+            'public': True,
+            'description': '模型文件',
+            'name': name
+        })
+        return attachment
+
+    # 创建胚料
+    def no_bom_product_create(self, product_id, item, order_id, route_type, i):
+        no_bom_copy_product_id = product_id.with_user(self.env.ref("base.user_admin")).copy()
+        no_bom_copy_product_id.product_tmpl_id.active = True
+        materials_id = self.env['sf.production.materials'].search(
+            [('materials_no', '=', item['texture_code'])])
+        materials_type_id = self.env['sf.materials.model'].search(
+            [('materials_no', '=', item['texture_type_code'])])
+        model_type = self.env['sf.model.type'].search([], limit=1)
+        supplier = self.env['mrp.bom'].get_supplier(materials_type_id)
+        logging.info('no_bom_copy_product_supplier-vals:%s' % supplier)
+        vals = {
+            'name': '%s-%s-%s [%s %s-%s * %s * %s]' % ('R',
+                                                       order_id.name, i, materials_id.name, materials_type_id.name,
+                                                       item['model_long'] + model_type.embryo_tolerance,
+                                                       item['model_width'] + model_type.embryo_tolerance,
+                                                       item['model_height'] + model_type.embryo_tolerance),
+            'length': item['model_long'] + model_type.embryo_tolerance,
+            'width': item['model_width'] + model_type.embryo_tolerance,
+            'height': item['model_height'] + model_type.embryo_tolerance,
+            'volume': (item['model_long'] + model_type.embryo_tolerance) * (
+                    item['model_width'] + model_type.embryo_tolerance) * (
+                              item['model_height'] + model_type.embryo_tolerance),
+            'embryo_model_type_id': model_type.id,
+            'list_price': item['price'],
+            'materials_id': materials_id.id,
+            'materials_type_id': materials_type_id.id,
+            'is_bfm': True,
+            # 'route_ids': self._get_routes(route_type),
+            # 'categ_id': self.env.ref('sf_dlm.product_category_embryo_sf').id,
+            # 'model_surface_process_id': self.env['sf.production.process'].search(
+            #     [('process_encode', '=', item['surface_process_code'])]).id,
+            # 'model_process_parameters_id': self.env['sf.processing.technology'].search(
+            #     [('process_encode', '=', item['process_parameters_code'])]).id,
+            'active': True
+        }
+        # 外协和采购生成的胚料需要根据材料型号绑定供应商
+        if route_type == 'subcontract' or route_type == 'purchase':
+            no_bom_copy_product_id.purchase_ok = True
+            no_bom_copy_product_id.seller_ids = [
+                (0, 0, {'partner_id': supplier.partner_id.id, 'delay': 1.0})]
+            if route_type == 'subcontract':
+                partner = self.env['res.partner'].search([('id', '=', supplier.partner_id.id)])
+                partner.is_subcontractor = True
+        no_bom_copy_product_id.write(vals)
+        logging.info('no_bom_copy_product_id-vals:%s' % vals)
+        # product_id.product_tmpl_id.active = False
+        return no_bom_copy_product_id
+
+    # @api.onchange('upload_model_file')
+    # def onchange_model_file(self):
+    #     for item in self:
+    #         if len(item.upload_model_file) > 1:
+    #             raise ValidationError('只允许上传一个文件')
+    #         if item.upload_model_file:
+    #             file_attachment_id = item.upload_model_file[0]
+    #             item.model_name = file_attachment_id.name
+    #             # 附件路径
+    #             report_path = file_attachment_id._full_path(file_attachment_id.store_fname)
+    #             shapes = read_step_file(report_path)
+    #             output_file = get_resource_path('sf_dlm', 'static/file', 'out.stl')
+    #             write_stl_file(shapes, output_file, 'binary', 0.03, 0.5)
+    #             # 转化为glb
+    #             output_glb_file = get_resource_path('sf_dlm', 'static/file', 'out.glb')
+    #             util_path = get_resource_path('sf_dlm', 'static/util')
+    #             cmd = 'python %s/stl2gltf.py %s %s -b' % (util_path, output_file, output_glb_file)
+    #             os.system(cmd)
+    #             # 转base64
+    #             with open(output_glb_file, 'rb') as fileObj:
+    #                 image_data = fileObj.read()
+    #                 base64_data = base64.b64encode(image_data)
+    #                 item.model_file = base64_data
+
+
+class ResMrpBom(models.Model):
+    _inherit = 'mrp.bom'
+
+    subcontractor_id = fields.Many2one('res.partner', string='外包商')
+
+    def bom_create_line_has(self, embryo):
+        vals = {
+            'bom_id': self.id,
+            'product_id': embryo.id,
+            'product_tmpl_id': embryo.product_tmpl_id.id,
+            'product_qty': 1,
+            'product_uom_id': 1
+        }
+        return self.env['mrp.bom.line'].create(vals)
+
+    # 业务平台分配工厂后在智能工厂先创建销售订单再创建该产品后再次进行创建bom
+    def bom_create(self, product, bom_type, product_type):
+        bom_id = self.env['mrp.bom'].create({
+            'product_tmpl_id': product.product_tmpl_id.id,
+            'type': bom_type,
+            # 'subcontractor_id': '' or subcontract.partner_id.id,
+            'product_qty': 1,
+            'product_uom_id': 1
+        })
+        if bom_type == 'subcontract' and product_type is not False:
+            subcontract = self.get_supplier(product.materials_type_id)
+            bom_id.subcontractor_id = subcontract.partner_id.id
+        return bom_id
+
+    # 胚料BOM组件：选取当前胚料原材料，
+    # 然后根据当前的胚料的体积得出需要的原材料重量（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
+    # 胚料所需原材料公式：当前的胚料的体积（立方米m³） *材料密度 * 1000 = 所需原材料重量KG（公斤）
+    def bom_create_line(self, embryo):
+        # 选取当前胚料原材料
+        raw_bom_line = self.get_raw_bom(embryo)
+        if raw_bom_line:
+            bom_line = self.env['mrp.bom.line'].create({
+                'bom_id': self.id,
+                'product_id': raw_bom_line.id,
+                'product_tmpl_id': raw_bom_line.product_tmpl_id.id,
+                'product_qty': round(embryo.volume * raw_bom_line.materials_type_id.density / 1000000),
+                'product_uom_id': raw_bom_line.uom_id.id,
+            })
+            return bom_line
+        else:
+            return False
+
+    # 查询材料型号默认排第一的供应商
+    def get_supplier(self, materials_type):
+        seller_id = self.env['sf.supplier.sort'].search(
+            [('materials_model_id', '=', materials_type.id)],
+            limit=1,
+            order='sequence asc')
+        return seller_id
+
+    # 匹配bom
+    def get_bom(self, product):
+        embryo_has = self.env['product.product'].search(
+            [('categ_id.type', '=', '胚料'), ('materials_type_id', '=', product.materials_type_id.id),
+             ('length', '>', product.length), ('width', '>', product.width),
+             ('height', '>', product.height), ('is_bfm', '=', False)
+             ],
+            limit=1,
+            order='volume desc'
+        )
+        logging.info('get_bom-vals:%s' % embryo_has)
+        if embryo_has:
+            rate_of_waste = ((embryo_has.volume - product.model_volume) % embryo_has.volume) * 100
+            if rate_of_waste <= 20:
+                return embryo_has
+        else:
+            return
+
+    # 查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)])
+        return raw_bom
+
+
+class ResProductCategory(models.Model):
+    _inherit = "product.category"
+
+    type = fields.Selection(
+        [("成品", "成品"), ("胚料", "胚料"), ("原材料", "原材料")],
+        default="", string="类型")
+
+    # @api.constrains('type')
+    # def _check_type(self):
+    #     category = self.env['product.category'].search(
+    #         [('type', '=', self.type)])
+    #     if category:
+    #         raise ValidationError("该类别已存在,请选择其他类别")

sf_dlm/models/product_workorder.py

@@ -0,0 +1,13 @@
+from odoo import api, fields, models
+
+
+
+class ResMrpWorkOrder(models.Model):
+    _inherit = 'mrp.workorder'
+    _order = 'sequence'
+
+    product_tmpl_id_length = fields.Float(related='production_id.product_tmpl_id.length', readonly=True, store=True, check_company=True, string="胚料长度(mm)")
+    product_tmpl_id_width = fields.Float(related='production_id.product_tmpl_id.width', readonly=True, store=True, check_company=True, string="胚料宽度(mm)")
+    product_tmpl_id_height = fields.Float(related='production_id.product_tmpl_id.height', readonly=True, store=True, check_company=True, string="胚料高度(mm)")
+    product_tmpl_id_materials_id = fields.Many2one(related='production_id.product_tmpl_id.materials_id', readonly=True, store=True, check_company=True, string="材料")
+    product_tmpl_id_materials_type_id = fields.Many2one(related='production_id.product_tmpl_id.materials_type_id', readonly=True, store=True, check_company=True, string="型号")

sf_dlm/static/util/stl2gltf.py

@@ -0,0 +1,277 @@
+import os
+
+def stl_to_gltf(binary_stl_path, out_path, is_binary):
+    import struct
+
+    gltf2 = '''
+{
+  "scenes" : [
+    {
+      "nodes" : [ 0 ]
+    }
+  ],
+  "nodes" : [
+    {
+      "mesh" : 0
+    }
+  ],
+  "meshes" : [
+    {
+      "primitives" : [ {
+        "attributes" : {
+          "POSITION" : 1
+        },
+        "indices" : 0
+      } ]
+    }
+  ],
+  "buffers" : [
+    {
+      %s
+      "byteLength" : %d
+    }
+  ],
+  "bufferViews" : [
+    {
+      "buffer" : 0,
+      "byteOffset" : 0,
+      "byteLength" : %d,
+      "target" : 34963
+    },
+    {
+      "buffer" : 0,
+      "byteOffset" : %d,
+      "byteLength" : %d,
+      "target" : 34962
+    }
+  ],
+  "accessors" : [
+    {
+      "bufferView" : 0,
+      "byteOffset" : 0,
+      "componentType" : 5125,
+      "count" : %d,
+      "type" : "SCALAR",
+      "max" : [ %d ],
+      "min" : [ 0 ]
+    },
+    {
+      "bufferView" : 1,
+      "byteOffset" : 0,
+      "componentType" : 5126,
+      "count" : %d,
+      "type" : "VEC3",
+      "min" : [%f, %f, %f],
+      "max" : [%f, %f, %f]
+    }
+  ],
+  "asset" : {
+    "version" : "2.0"
+  }
+}
+'''
+
+    header_bytes = 80
+    unsigned_long_int_bytes = 4
+    float_bytes = 4
+    vec3_bytes = 4 * 3
+    spacer_bytes = 2
+    num_vertices_in_face = 3
+
+    vertices = {}
+    indices = []
+
+    if not is_binary:
+        out_bin = os.path.join(out_path, "out.bin")
+        out_gltf = os.path.join(out_path, "out.gltf")
+    else:
+        out_bin = out_path
+
+    unpack_face = struct.Struct("<12fH").unpack
+    face_bytes = float_bytes*12 + 2
+
+    with open(path_to_stl, "rb") as f:
+        f.seek(header_bytes) # skip 80 bytes headers
+
+        num_faces_bytes = f.read(unsigned_long_int_bytes)
+        number_faces = struct.unpack("<I", num_faces_bytes)[0]
+
+        # the vec3_bytes is for normal
+        stl_assume_bytes = header_bytes + unsigned_long_int_bytes + number_faces * (vec3_bytes*3 + spacer_bytes + vec3_bytes)
+        assert stl_assume_bytes == os.path.getsize(path_to_stl), "stl is not binary or ill formatted"
+
+        minx, maxx = [9999999, -9999999]
+        miny, maxy = [9999999, -9999999]
+        minz, maxz = [9999999, -9999999]
+
+        vertices_length_counter = 0
+
+        data = struct.unpack("<" + "12fH"*number_faces, f.read())
+        len_data = len(data)
+
+        for i in range(0, len_data, 13):
+            for j in range(3, 12, 3):
+                x, y, z = data[i+j:i+j+3]
+
+                x = int(x*100000)/100000
+                y = int(y*100000)/100000
+                z = int(z*100000)/100000
+
+                tuple_xyz = (x, y, z);
+
+                try:
+                    indices.append(vertices[tuple_xyz])
+                except KeyError:
+                    vertices[tuple_xyz] = vertices_length_counter
+                    vertices_length_counter += 1
+                    indices.append(vertices[tuple_xyz])
+
+
+
+                if x < minx: minx = x
+                if x > maxx: maxx = x
+                if y < miny: miny = y
+                if y > maxy: maxy = y
+                if z < minz: minz = z
+                if z > maxz: maxz = z
+
+            # f.seek(spacer_bytes, 1) # skip the spacer
+
+    number_vertices = len(vertices)
+    vertices_bytelength = number_vertices * vec3_bytes # each vec3 has 3 floats, each float is 4 bytes
+    unpadded_indices_bytelength = number_vertices * unsigned_long_int_bytes
+
+    out_number_vertices = len(vertices)
+    out_number_indices = len(indices)
+
+    unpadded_indices_bytelength = out_number_indices * unsigned_long_int_bytes
+    indices_bytelength = (unpadded_indices_bytelength + 3) & ~3
+
+    out_bin_bytelength = vertices_bytelength + indices_bytelength
+
+    if is_binary:
+        out_bin_uir = ""
+    else:
+        out_bin_uir = '"uri": "out.bin",'
+
+    gltf2 = gltf2 % ( out_bin_uir,
+                #buffer
+                out_bin_bytelength,
+
+                # bufferViews[0]
+                indices_bytelength,
+
+                # bufferViews[1]
+                indices_bytelength,
+                vertices_bytelength,
+
+                # accessors[0]
+                out_number_indices,
+                out_number_vertices - 1,
+
+                # accessors[1]
+                out_number_vertices,
+                minx, miny, minz,
+                maxx, maxy, maxz
+    )
+
+    glb_out = bytearray()
+    if is_binary:
+        gltf2 = gltf2.replace(" ", "")
+        gltf2 = gltf2.replace("\n", "")
+
+        scene = bytearray(gltf2.encode())
+
+        scene_len = len(scene)
+        padded_scene_len = (scene_len + 3) & ~3
+        body_offset = padded_scene_len + 12 + 8
+
+        file_len = body_offset + out_bin_bytelength + 8
+
+        # 12-byte header
+        glb_out.extend(struct.pack('<I', 0x46546C67)) # magic number for glTF
+        glb_out.extend(struct.pack('<I', 2))
+        glb_out.extend(struct.pack('<I', file_len))
+
+        # chunk 0
+        glb_out.extend(struct.pack('<I', padded_scene_len))
+        glb_out.extend(struct.pack('<I', 0x4E4F534A)) # magic number for JSON
+        glb_out.extend(scene)
+
+        while len(glb_out) < body_offset:
+            glb_out.extend(b' ')
+
+        # chunk 1
+        glb_out.extend(struct.pack('<I', out_bin_bytelength))
+        glb_out.extend(struct.pack('<I', 0x004E4942)) # magin number for BIN
+
+    # print('<%dI' % len(indices))
+    # print(struct.pack('<%dI' % len(indices), *indices))
+    glb_out.extend(struct.pack('<%dI' % len(indices), *indices))
+
+    for i in range(indices_bytelength - unpadded_indices_bytelength):
+        glb_out.extend(b' ')
+
+    vertices = dict((v, k) for k,v in vertices.items())
+
+    # glb_out.extend(struct.pack('f',
+    # print([each_v for vertices[v_counter] for v_counter in range(number_vertices)]) # magin number for BIN
+    vertices = [vertices[i] for i in range(number_vertices)]
+    flatten = lambda l: [item for sublist in l for item in sublist]
+
+    # for v_counter in :
+        # v_3f = vertices[v_counter]
+        # all_floats_in_vertices.append(v_3f[0])
+        # all_floats_in_vertices.append(v_3f[1])
+        # all_floats_in_vertices.append(v_3f[2])
+
+    # for v_counter in range(number_vertices):
+    glb_out.extend(struct.pack('%df' % number_vertices*3, *flatten(vertices))) # magin number for BIN
+
+    # for v_counter in range(number_vertices):
+        # glb_out.extend(struct.pack('3f', *vertices[v_counter])) # magin number for BIN
+
+    # for (v_x, v_y, v_z), _ in sorted(vertices.items(), key=lambda x: x[1]):
+        # glb_out.extend(struct.pack('3f', v_x, v_y, v_z)) # magin number for BIN
+        # # glb_out.extend(struct.pack('f', v_y)) # magin number for BIN
+        # # glb_out.extend(struct.pack('f', v_z)) # magin number for BIN
+
+    with open(out_bin, "wb") as out:
+        out.write(glb_out)
+
+    if not is_binary:
+        with open(out_gltf, "w") as out:
+            out.write(gltf2)
+
+    print("Done! Exported to %s" %out_path)
+
+if __name__ == '__main__':
+    import sys
+
+    if len(sys.argv) < 3:
+        print("use it like python3 stl_to_gltf.py /path/to/stl /path/to/gltf/folder")
+        print("or          python3 stl_to_gltf.py /path/to/stl /path/to/glb/file -b")
+        sys.exit(1)
+
+    path_to_stl = sys.argv[1]
+    out_path = sys.argv[2]
+    if len(sys.argv) > 3:
+        is_binary = True
+    else:
+        is_binary = False
+
+    if out_path.lower().endswith(".glb"):
+        print("Use binary mode since output file has glb extension")
+        is_binary = True
+    else:
+        if is_binary:
+            print("output file should have glb extension but not %s", out_path)
+
+    if not os.path.exists(path_to_stl):
+        print("stl file does not exists %s" % path_to_stl)
+
+    if not is_binary:
+        if not os.path.isdir(out_path):
+            os.mkdir(out_path)
+
+    stl_to_gltf(path_to_stl, out_path, is_binary)

sf_dlm/views/product_template_view.xml

@@ -55,7 +55,7 @@
                 </page>
                 <page name="inventory" position="attributes">
                     <attribute name="groups">
-                        stock.group_stock_user,product.group_stock_packaging,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director
+                        stock.group_stock_user,product.group_stock_packaging,sf_base.group_sale_salemanager,sf_base.group_sale_director,sf_base.group_purchase,sf_base.group_purchase_director,sf_base.group_plan_dispatch
                     </attribute>
                 </page>
             </field>
@@ -110,6 +110,9 @@
                     <field name="subcontractor_id"
                            attrs="{'invisible': [('type', '!=', 'subcontract')], 'required': [('type', '=', 'subcontract')]}"/>
                 </field>
+                <xpath expr="//group" position="after">
+                    <field name="subcontractor_name" attrs="{'invisible': True}"/>
+                </xpath>
             </field>
         </record>
 

sf_dlm/views/product_workorder.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<odoo>
+    <record id="view_mrp_production_workorder_tray_form_inherit_sf1" model="ir.ui.view">
+        <field name="name">production.workorder.dlm</field>
+        <field name="model">mrp.workorder</field>
+        <field name="inherit_id" ref="sf_manufacturing.view_mrp_production_workorder_tray_form_inherit_sf"/>
+        <field name="arch" type="xml">
+            <xpath expr="//page[1]" position="before">
+                <page string="开料要求" attrs='{"invisible": [("routing_type","!=","切割")]}'>
+                    <group>
+                        <group>
+                            <field name="product_tmpl_id_materials_id" widget="many2one"/>
+                            <field name="product_tmpl_id_materials_type_id" widget="many2one"/>
+
+                        </group>
+                        <group>
+                            <field name="product_tmpl_id_length"/>
+                            <field name="product_tmpl_id_width"/>
+                            <field name="product_tmpl_id_height"/>
+                        </group>
+                    </group>
+                </page>
+            </xpath>
+        </field>
+    </record>
+
+</odoo>

sf_dlm_management/data/stock_data.xml

@@ -22,6 +22,16 @@
             <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,6 +10,7 @@
                     <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"
@@ -31,24 +32,28 @@
                            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"
-                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id)]"
+                           options="{'no_create': True}"
+                           domain="[('cutting_tool_material_id','=',cutting_tool_material_id),('brand_id', '=', brand_id)]"
                            context="{'default_cutting_tool_material_id': cutting_tool_material_id}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}">
                     </field>
                     <!--                                        <button name="%(sf_base.action_sf_cutting_tool_standard_library)d" string="新建" type="action"-->
                     <!--                                                context="{'default_cutting_tool_material_id': cutting_tool_material_id}"/>-->
                     <field name="specification_id" placeholder="请选择" class="custom_required"
+                           options="{'no_create': True}"
                            context="{'default_cutting_tool_type': cutting_tool_type,'default_standard_library_id':cutting_tool_model_id}"
                            attrs="{'invisible': [('categ_type', '!=', '刀具')],'required': [('categ_type', '=', '刀具')],'readonly': [('id', '!=', False)]}"
                            domain="[('standard_library_id','=',cutting_tool_model_id)]"/>
                     <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)]"/>
@@ -83,7 +88,7 @@
                                 </div>
                                 <field name="model_volume" string="体积[mm³]"/>
                                 <field name="product_model_type_id" string="模型类型"/>
-                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板"/>
+                                <field name="model_processing_panel" placeholder="例如R,U" string="加工面板" readonly="1"/>
                                 <field name="model_machining_precision"/>
                                 <field name="model_process_parameters_ids" string="表面工艺参数"
                                        widget="many2many_tags"
@@ -93,6 +98,16 @@
                         </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>
 
@@ -290,7 +305,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="{'required': [('cutting_tool_type','=','整体式刀具')],'invisible': [('cutting_tool_type', 'not in', ('整体式刀具','刀片'))],'readonly': [('id', '!=', False)]}"/>
+                                       attrs="{'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)]}"/>
@@ -436,7 +451,7 @@
                                 <field name="cutting_speed_ids" string="" widget="one2many"
                                        attrs="{'readonly': [('id', '!=', False)]}" class="fixTableCss">
                                     <tree editable="bottom">
-                                        <field name="execution_standard_id"/>
+                                        <field name="execution_standard_id" options="{'no_create': True}"/>
                                         <field name="material_code"/>
                                         <field name="material_grade"/>
                                         <field name="tensile_strength"/>
@@ -453,7 +468,8 @@
                                     <tree editable="bottom">
                                         <!--                                        <field name="cutting_speed"-->
                                         <!--                                               attrs="{'readonly': [('materials_type_id','!=',False)]}"/>-->
-                                        <field name="materials_type_id" placeholder="请选择"/>
+                                        <field name="materials_type_id" options="{'no_create': True}"
+                                               placeholder="请选择"/>
                                         <field name="blade_diameter"/>
                                         <field name="feed_per_tooth"/>
                                     </tree>
@@ -464,8 +480,8 @@
                     <page string="夹具物料参数" attrs="{'invisible': [('categ_type', '!=', '夹具')]}">
                         <group>
                             <group>
-                                <field name="brand_id" placeholder="请选择"/>
-                                <field name="multi_mounting_type_id" placeholder="请选择"
+                                <field name="brand_id" placeholder="请选择" options="{'no_create': True}"/>
+                                <field name="multi_mounting_type_id" placeholder="请选择" options="{'no_create': True}"
                                        attrs="{'required': [('categ_type', '=', '夹具')]}"/>
                                 <field name="length" string="长度(mm)"/>
                                 <field name="width" string="宽度(mm)"/>
@@ -553,14 +569,16 @@
 
                                 <field name="boolean_chip_blowing_function" string="是否有吹屑功能"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘','零点托盘'])]}"/>
-                                <field name="materials_model_id" placeholder="请选择"/>
+                                <field name="materials_model_id" placeholder="请选择" options="{'no_create': True}"/>
                                 <field name="interface_materials_model_id" placeholder="请选择" string="接口类型"
+                                       options="{'no_create': True}"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['气动夹具','虎钳夹具','磁吸夹具'])]}"/>
                                 <field name="type_of_drive" placeholder="请选择" string="驱动方式"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['零点托盘','气动夹具','虎钳夹具','磁吸夹具','转接板(锁板)夹具','三爪卡盘'])]}"/>
                                 <field name="unlocking_method" string="解锁方式" placeholder="请选择"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
                                 <field name="machine_tool_type_id" string="适用机床型号" placeholder="请选择"
+                                       options="{'no_create': True}"
                                        attrs="{'invisible': [('fixture_material_type', 'not in', ['零点卡盘'])]}"/>
 
                             </group>

sf_machine_connect/__init__.py

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

sf_machine_connect/controllers/__init__.py

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

sf_machine_connect/controllers/controllers.py

@@ -0,0 +1,98 @@
+# -*- coding: utf-8 -*-
+import ast
+import json
+import logging
+from odoo import http
+from odoo.http import request
+
+
+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)
+        # 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)])
+                if machine_data:
+                    res['data'].append({
+                        'id': machine_data.id,
+                        'name': machine_data.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,
+                    })
+
+            return json.JSONEncoder().encode(res)
+        except Exception as e:
+            logging.info('前端请求机床数据失败，原因:%s' % e)
+            res['status'] = -1
+            res['message'] = '前端请求机床数据失败，原因:%s' % e
+            return json.JSONEncoder().encode(res)

sf_machine_connect/models/ftp_client.py

@@ -123,128 +123,159 @@ class Machine_ftp(models.Model):
 
     # 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)
-    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)
+    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)
 
-    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')
+    # 机床设定进给速度, 机床实际进给速度, 机床设定主轴转速, 机床实际主轴转速, 机床主轴负载, 机床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)
+
+    # 当前程序名, 机床累计运行时间, 机床系统日期, 机床系统时间, 当前刀具号, 机床循环时间
 
 
 class WorkCenterBarcode(models.Model):
@@ -259,39 +290,59 @@ 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_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_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)
+                                               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)
     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)
+                                               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)
+
+    # 工单状态
+
     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
+        # 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
 
     def compensation(self):
 

sf_machine_connect/models/res_config_setting.py

@@ -8,11 +8,14 @@ _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.jikimo.com")], string='bfm环境', store=True)
-         ("https://bfm.jikimo.com", "正式环境(https://bfm.jikimo.com)")], string='bfm环境', store=True)
+    # 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='请输入当前对应的业务平台环境路径')
 
     @api.model
     def get_values(self):
@@ -22,14 +25,14 @@ class ResBFMConfigSettings(models.TransientModel):
         """
         values = super(ResBFMConfigSettings, self).get_values()
         config = self.env['ir.config_parameter'].sudo()
-        bfm_url = config.get_param('bfm_url', default='')
+        bfm_url_new = config.get_param('bfm_url_new', default='')
 
         values.update(
-            bfm_url=bfm_url,
+            bfm_url_new=bfm_url_new,
         )
         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", self.bfm_url or "")
+        ir_config.set_param("bfm_url_new", self.bfm_url_new or "")

sf_machine_connect/static/src/js/test.js

@@ -0,0 +1,82 @@
+/** @odoo-module **/
+
+import { browser } from "@web/core/browser/browser";
+import { Dialog } from "@web/core/dialog/dialog";
+import { _lt } from "@web/core/l10n/translation";
+import { useChildRef, useOwnedDialogs, useService } from "@web/core/utils/hooks";
+import { sprintf } from "@web/core/utils/strings";
+import { isMobileOS } from "@web/core/browser/feature_detection";
+import * as BarcodeScanner from "@web/webclient/barcode/barcode_scanner";
+
+const {xml, Component} = owl;
+import { standardFieldProps } from "@web/views/fields/standard_field_props";
+// Import the registry
+import {registry} from "@web/core/registry";
+
+
+export class CodeField extends Component {
+    setup() {
+        super.setup();
+    }
+    async onBarcodeBtnClick() {
+        const barcode = await BarcodeScanner.scanBarcode();
+        if (barcode) {
+            await this.onBarcodeScanned(barcode);
+            if ("vibrate" in browser.navigator) {
+                browser.navigator.vibrate(100);
+            }
+        } else {
+            this.notification.add(this.env._t("Please, scan again !"), {
+                type: "warning",
+            });
+        }
+    }
+    async search(barcode) {
+        const results = await this.orm.call("sf.tray", "name_search", [code], {
+            name: barcode,
+            args: this.getDomain(),
+            operator: "ilike",
+            limit: 2, // If one result we set directly and if more than one we use normal flow so no need to search more
+            context: this.context,
+        });
+        return results.map((result) => {
+            const [id, displayName] = result;
+            return {
+                id,
+                name: displayName,
+            };
+        });
+    }
+    async onBarcodeScanned(barcode) {
+        const results = await this.search(barcode);
+        const records = results.filter((r) => !!r.id);
+        if (records.length === 1) {
+            this.update([{ id: records[0].id, name: records[0].name }]);
+        } else {
+            const searchInput = this.autocompleteContainerRef.el.querySelector("input");
+            searchInput.value = barcode;
+            searchInput.dispatchEvent(new Event("input"));
+            if (this.env.isSmall) {
+                searchInput.click();
+            }
+        }
+    }
+}
+
+CodeField.template = xml`
+                <button
+                    t-on-click="onBarcodeBtnClick"
+                    type="button"
+                    class="btn ms-3 o_barcode"
+                    tabindex="-1"
+                    draggable="false"
+                    aria-label="Scan barcode"
+                    title="Scan barcode"
+                    data-tooltip="Scan barcode"
+                />
+`;
+// CodeField.template = 'sf_machine_connect.CodeField';
+CodeField.props = standardFieldProps;
+
+// Add the field to the correct category
+registry.category("fields").add("code", CodeField);

sf_machine_connect/views/WorkCenterBarcodes.xml

@@ -10,6 +10,7 @@
                 <searchpanel>
                     <field name="routing_type" select="multi" string="工序类型" icon="fa-building" enable_counters="1"/>
                     <field name="state" select="multi" string="状态" icon="fa-building" enable_counters="1"/>
+<!--                    <field name="manual_quotation" select="multi" string="" icon="fa-building" enable_counters="1"/>-->
                 </searchpanel>
 
                 <!--                    <field name="name" filter_domain="['|', '|', ('明确的字段内容', 'ilike', self), ('shortdesc', 'ilike', self), ('name', 'ilike', self)]" string="Theme"/>-->
@@ -19,7 +20,15 @@
             <!--                <xpath expr="//search//group//filter[@name='product']" position="before">-->
             <!--                    <filter string="Tray code" name="traycode" domain="[]" context="{'group_by': 'tray_code'}"/>-->
             <!--                </xpath>-->
-
+            <xpath expr="//filter[@name='date_start_filter']" position="after">
+                <separator/>
+                <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="product_tmpl_name"/>
+                <field name="rfid_code"/>
+            </xpath>
         </field>
     </record>
 </odoo>

sf_machine_connect/views/compensation.xml

@@ -5,39 +5,46 @@
         <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">
-                <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">
+<!--           <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>
-                        <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>
+                        <field name="compensation_value_x"/>
+                        <field name="compensation_value_y"/>
                     </group>
-                </xpath>
+                    <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>
 
         </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,294 +13,138 @@
                 <page string="机床运行状态" attrs="{'invisible': [('equipment_type', '!=', '机床')]}">
                     <group string='状态监控'>
                         <group>
-                            <field name="timestamp"/>
-                            <field name="signed"/>
+<!--                             <field name="timestamp"/> -->
                             <field name="status"/>
-                            <field name="time_on"/>
-                            <field name="time_on_now"/>
-                        </group>
-                        <group>
                             <field name="run_status"/>
                             <field name="run_time"/>
+                            <field name="system_date"/>
+                        </group>
+                        <group>
                             <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 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 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>
-                        <group string="补偿值相关">
-                            <group>
-                            <field name="x_compensation_node"/>
-                            </group>
-                            <group>
-                            <field name="y_compensation_node"/>
-                            </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>
-                        <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> -->
-                </page>
-<!--                 <page string="刀位配置"> -->
-<!--                     <group string="刀位配置"> -->
+                    </group>
+<!--                     <group string="ftp相关"> -->
 <!--                         <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> -->
+<!--                             <field name="ftp_num"/> -->
+<!--                             <field name="ftp_pwd"/> -->
+<!--                             <field name="ftp_host"/> -->
 <!--                         </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> -->
+<!--                             <field name="ftp_port"/> -->
+<!--                             <field name="ftp_remote_path"/> -->
 <!--                         </group> -->
 <!--                     </group> -->
-<!--                 </page> -->
-<!--                 </notebook> -->
+<!--                     <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>
             </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/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" />
-                                            <field name="bfm_url" string="访问地址"/>
+                                            <label for="bfm_url_new" />
+                                            <field name="bfm_url_new" 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.Char(string='故障报警信息')
+    fault_alarm_info = fields.Text(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,20 +7,23 @@ 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('故障停机总时长(h)')
+    run_time = fields.Float('加工时长(h)')
+    equipment_time = fields.Float('开机时长(h)')
+    done_nums = fields.Integer('加工件数')
+    utilization_rate = fields.Char('可用率')
+    fault_time = fields.Float('故障时长')
     fault_nums = fields.Integer('故障次数')
+    # 故障率
+    fault_rate = fields.Char('故障率')
+    # 设备故障日志
     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='运行日志')
@@ -38,12 +41,52 @@ class SfMaintenanceEquipmentOEELog(models.Model):
     _name = 'maintenance.equipment.oee.logs'
     _description = '设备运行日志'
 
-    name = fields.Char('运行日志')
-    run_time = fields.Datetime('时间')
-    state = fields.Selection([("开机", "开机"), ("关机", "关机"), ("等待", "等待"), ("开始加工", "开始加工"),
-                              ("结束加工", "结束加工"), ("故障", "故障"),
-                              ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态")
-    workorder_id = fields.Char('加工订单')
-    time = fields.Char('持续时长')
-    color = fields.Char('颜色', default=1)
+    equipment_id = fields.Many2one('maintenance.equipment', '机台号')
+    equipment_code = fields.Char('设备编码')
+    name = fields.Char('设备名称', readonly='True')
+    machine_tool_picture = fields.Binary('设备图片')
+    type_id = fields.Many2one('sf.machine_tool.type', '品牌型号')
+    state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
+                              ("检修", "检修"), ("保养", "保养")], default="", string="实时状态")
+    online_time = fields.Char('开机时长')
+
+    offline_time = fields.Char('关机时长')
+    offline_nums = fields.Integer('关机次数')
+    # 待机时长
+
+    idle_time = fields.Char('待机时长')
+
+    # 待机率
+    idle_rate = fields.Char('待机率')
+
+    work_time = fields.Char('加工时长')
+    work_rate = fields.Char('可用率')
+    fault_time = fields.Char('故障时长')
+    fault_rate = fields.Char('故障率')
+    fault_nums = fields.Integer('故障次数')
+
+    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 = '设备运行日志详情'
+
+    sequence = fields.Integer('序号')
+    time = fields.Datetime('时间')
+    state = fields.Selection([("加工", "加工"), ("关机", "关机"), ("待机", "待机"), ("故障", "故障"),
+                              ("检修", "检修"), ("保养", "保养")], default="", string="事件/状态")
+    production_id = fields.Many2one('mrp.production', '加工工单')
+
+    log_id = fields.Many2one('maintenance.equipment.oee.logs', '日志')
+

sf_maintenance/security/ir.model.access.csv

@@ -1,5 +1,5 @@
 id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink
-access_equipment_maintenance_standards_manager,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_maintenance.sf_group_equipment_manager,1,1,1,0
+access_equipment_maintenance_standards_manager,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_maintenance.sf_group_equipment_manager,1,1,1,1
 access_equipment_maintenance_standards,equipment_maintenance_standards,model_equipment_maintenance_standards,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_maintenance_logs_sf_group_equipment_user,sf_maintenance_logs,model_sf_maintenance_logs,sf_maintenance.sf_group_equipment_user,1,0,0,0
 access_sf_maintenance_logs_sf_group_equipment_manager,sf_maintenance_logs,model_sf_maintenance_logs,sf_maintenance.sf_group_equipment_manager,1,1,1,0
@@ -67,3 +67,6 @@ 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,6 +14,7 @@
                     <field name="utilization_rate"/>
                     <field name="fault_time"/>
                     <field name="fault_nums"/>
+                    <field name="fault_rate"/>
                 </tree>
             </field>
         </record>
@@ -49,19 +50,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,22 +7,20 @@
             <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"/>
-                    <field name="operator"/>
+                    <field name="fault_process" optional="hide"/>
+                    <field name="operator" optional="hide"/>
                     <field name="recovery_time"/>
                     <field name="fault_duration"/>
-                    <field name="note"/>
+                    <field name="note" optional="hide"/>
                 </tree>
             </field>
         </record>
@@ -45,25 +43,32 @@
                         <group>
                             <group>
 
-                                <field name="name"/>
-                                <field name="type" required="1" widget="radio" options="{'horizontal': true}"/>
-                                <field name="brand"/>
+<!--                                 <field name="name"/> -->
+<!--                                 <field name="type" required="1" widget="radio" options="{'horizontal': true}"/> -->
                                 <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="brand"/>
                                 <field name="alarm_time"/>
-                                <field name="alarm_way" required="1" widget="radio" options="{'horizontal': true}"/>
-                                <field name="operator"/>
-                                <field name="recovery_time"/>
-                                <field name="fault_duration"/>
-                                <field name="note"/>
+                                <field name="fault_alarm_info"/>
+
+<!--                                 <field name="code_location"/> -->
+<!--                                 <field name="fault_type" required="1" widget="radio" options="{'horizontal': true}"/> -->
+<!--                                 <field name="fault_code"/> -->
 
                             </group>
+                            <group>
+                                <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"/>
+
+
+                            </group>
+
+                        </group>
+                        <group>
+                        <field name="note"/>
                         </group>
                     </sheet>
                 </form>
@@ -100,6 +105,246 @@
             </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"/>
+                                </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_id"/>
+                                </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_id"/>
+                                </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_id"/>
+                </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_maintenance/views/maintenance_views.xml

@@ -988,7 +988,7 @@
                 <xpath expr="//div[hasclass('o_row')][field[@name='maintenance_duration']]" position="after">
 
 
-                    <field name='overhaul_id'/>
+                    <field name='overhaul_id' options="{'no_create':True}"/>
                     <field name="overhaul_date" string="下次预防检修"/>
                     <label for="overhaul_period" string="预防检修频次"/>
                     <div class="o_row">