From 0ef13504e7cfb57f748da51a9f98383de38ddc08 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Mon, 22 Jan 2024 17:33:40 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E6=9E=B6?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E5=85=B3=E8=81=94=E7=A7=BB=E5=8A=A8=E5=8E=86?=
 =?UTF-8?q?=E5=8F=B2=E8=B0=83=E6=8B=A8=E5=8D=95=E5=85=B3=E8=81=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py   |  4 +-
 sf_sale/models/auto_quatotion_common.py       |  2 +-
 sf_sale/models/quick_easy_order.py            |  4 +-
 sf_warehouse/models/model.py                  | 20 +++++-
 .../views/change_stock_move_views.xml         | 22 +++++-
 sf_warehouse/views/shelf_location.xml         | 69 +++++++++++++++++--
 6 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index 42a392e2..cac61045 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+#from OCC.Extend.DataExchange import read_step_file
+#from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 09ea3f0f..1b29c6d2 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-from quatotion import readSql, feature_recognize, auto_quatotion
+#from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 1e5f274c..5ec1fd52 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -5,8 +5,8 @@ import os
 import json
 from datetime import datetime
 import requests
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+#from OCC.Extend.DataExchange import read_step_file
+#from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index d03789cd..a53dae86 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -1,4 +1,5 @@
 # -*- coding: utf-8 -*-
+import datetime
 import logging
 from odoo import api, fields, models
 from odoo.osv import expression
@@ -223,6 +224,23 @@ class ShelfLocation(models.Model):
     _description = '货架货位'
     _order = 'name'
 
+    # current_location_id = fields.Many2one('sf.shelf.location', string='当前位置')
+    # # 目的位置
+    # destination_location_id = fields.Many2one('sf.shelf.location', string='目的位置')
+    current_move_ids = fields.One2many('stock.move.line', 'current_location_id', '当前位置调拨单')
+    destination_move_ids = fields.One2many('stock.move.line', 'destination_location_id', '目标位置调拨单')
+    storage_time = fields.Datetime('入库时间',  compute='_compute_location_status')
+
+    @api.depends('location_status')
+    def _compute_location_status(self):
+        for record in self:
+            if record.location_status == '占用':
+                record.storage_time = datetime.datetime.now()
+            if record.location_status == '空闲':
+                record.storage_time = False
+            else:
+                pass
+
     name = fields.Char('名称', required=True, size=20)
     barcode = fields.Char('编码', copy=False, size=15)
 
@@ -452,7 +470,7 @@ class SfStockPicking(models.Model):
             if line:
                 if line.current_location_id:
                     line.current_location_id.product_sn_id = False
-                    line.current_location_id = False
+                    line.current_location_id.location_status = '空闲'
         return res
 
 
diff --git a/sf_warehouse/views/change_stock_move_views.xml b/sf_warehouse/views/change_stock_move_views.xml
index c53fc1bb..5b8c8c06 100644
--- a/sf_warehouse/views/change_stock_move_views.xml
+++ b/sf_warehouse/views/change_stock_move_views.xml
@@ -7,7 +7,7 @@
             <field name="inherit_id" ref="stock.view_stock_move_line_detailed_operation_tree"/>
             <field name="arch" type="xml">
                 <xpath expr="//field[@name='location_id'][2]" position="after">
-                    <field name="current_location_id"/>
+                    <field name="current_location_id" force_save="1"/>
                 </xpath>
                 <xpath expr="//field[@name='location_dest_id'][2]" position="after">
                     <field name="destination_location_id" domain="[
@@ -23,13 +23,31 @@
             </field>
         </record>
 
+        <record id="sf_view_move_line_tree" model="ir.ui.view">
+            <field name="name">sf.stock.move.line.tree</field>
+            <field name="model">stock.move.line</field>
+            <field name="inherit_id" ref="stock.view_move_line_tree"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='location_id']" position="after">
+                    <field name="current_location_id" force_save="1"/>
+                </xpath>
+                <xpath expr="//field[@name='location_dest_id']" position="after">
+                    <field name="destination_location_id" />
+<!--                     <field name="location_dest_id_product_type"/> -->
+<!--                     <field name="location_dest_id"/> -->
+                    <field name="location_dest_id_value" invisible="1"/>
+<!--                     <button name="button_test" string="测试" type="object" class="oe_highlight"/> -->
+                </xpath>
+            </field>
+        </record>
+
         <record id="sf_stock_move_line_form" model="ir.ui.view">
             <field name="name">sf.stock.move.line.form</field>
             <field name="model">stock.move.line</field>
             <field name="inherit_id" ref="stock.view_move_line_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//form//sheet//group//group//field[@name='location_id']" position="after">
-                    <field name="current_location_id" options="{'no_create': False}"/>
+                    <field name="current_location_id" options="{'no_create': False}" force_save="1"/>
                 </xpath>
                 <xpath expr="//form//sheet//group//group//field[@name='location_dest_id']" position="after">
                     <field name="destination_location_id" options="{'no_create': False}"/>
diff --git a/sf_warehouse/views/shelf_location.xml b/sf_warehouse/views/shelf_location.xml
index 7ac4dcbc..f19a6421 100644
--- a/sf_warehouse/views/shelf_location.xml
+++ b/sf_warehouse/views/shelf_location.xml
@@ -9,26 +9,82 @@
                     <field name="name" string="名称"/>
                     <field name="barcode" string="编码"/>
                     <field name="location_type"/>
-<!--                     <field name="check_state" widget="label_selection"-->
-<!--                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>-->
-<!--                     <button name="action_check" string="审核" type="object"-->
-<!--                                attrs="{'invisible': [('check_state','=', 'enable')]}"-->
-<!--                                groups="sf_warehouse.group_sf_stock_manager"-->
-<!--                                class="oe_highlight"/>-->
+                    <!--                     <field name="check_state" widget="label_selection"-->
+                    <!--                           options="{'classes': {'unchecked':'warning','checked': 'success'}}"/>-->
+                    <!--                     <button name="action_check" string="审核" type="object"-->
+                    <!--                                attrs="{'invisible': [('check_state','=', 'enable')]}"-->
+                    <!--                                groups="sf_warehouse.group_sf_stock_manager"-->
+                    <!--                                class="oe_highlight"/>-->
                 </tree>
             </field>
         </record>
 
+
+        <!--        货架货位移动历史按钮-->
+
+        <record id="sf_stock_move_line_view_search" model="ir.ui.view">
+            <field name="name">sf.view.picking.form</field>
+            <field name="model">stock.move.line</field>
+            <field name="inherit_id" ref="stock.stock_move_line_view_search"/>
+            <field name="arch" type="xml">
+                <xpath expr="//field[@name='product_id']" position="after">
+                    <field name='current_location_id'/>
+                    <field name='destination_location_id'/>
+                </xpath>
+            </field>
+        </record>
+
+        <record id="stock_move_line_action1" model="ir.actions.act_window">
+            <field name="name">移动历史</field>
+            <field name="res_model">stock.move.line</field>
+            <field name="type">ir.actions.act_window</field>
+            <field name="view_mode">tree,form</field>
+            <field name="search_view_id" ref="sf_stock_move_line_view_search"/>
+            <field name="view_id" ref="stock.view_move_line_tree"/>
+            <field name="help" type="html">
+                <p class="oe_view_nocontent_create">
+                    产品移动历史
+                </p>
+            </field>
+        </record>
+
         <record id="view_shelf_location_form" model="ir.ui.view">
             <field name="name">Shelf Location form</field>
             <field name="model">sf.shelf.location</field>
             <field name="arch" type="xml">
                 <form string="Shelf Location">
+
                     <header>
                         <button string="生成货位" name="create_location" type="object" class="oe_highlight"
                                 attrs="{'invisible': [('hide_shelf', '=', False)]}"/>
+
+                        <!--                        <button name="%(shelf_location_kanban_action_id)d"-->
+                        <!--                            type="action"-->
+                        <!--                            class="oe_stat_button"-->
+                        <!--                            context="{'search_default_maintenance_equipment_id': [active_id]}"-->
+                        <!--                            icon="fa-wrench">-->
+                        <!--                        <field string="目标位置调拨" name="destination_move_ids" widget="statinfo"/>-->
+                        <!--                    </button>-->
                     </header>
                     <sheet>
+                        <div class="oe_button_box" name="button_box">
+                            <button name="%(stock_move_line_action1)d"
+                                    type="action"
+                                    class="oe_stat_button"
+                                    context="{'search_default_current_location_id': [active_id]}"
+                                    icon="fa-exchange">
+
+                                <field string="当前位置历史" name="current_move_ids" widget="statinfo"/>
+                            </button>
+                             <button name="%(stock_move_line_action1)d"
+                                    type="action"
+                                    class="oe_stat_button"
+                                    context="{'search_default_destination_location_id': [active_id]}"
+                                    icon="fa-exchange">
+
+                                <field string="目标位置历史" name="destination_move_ids" widget="statinfo"/>
+                            </button>
+                        </div>
                         <group>
                             <field name="hide_shelf" invisible="1"/>
                             <field name="hide_location" invisible="1"/>
@@ -55,6 +111,7 @@
                             <!--                         <field name="product_type" attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False), ('location_status', '=', '占用')]}" widget="many2many_tags"/> -->
                             <field name="location_status"
                                    attrs="{'invisible': [('hide_location', '=', False)], 'required': [('hide_location', '!=', False)]}"/>
+                            <field name="storage_time" widget="datetime"/>
                         </group>
                     </sheet>
                 </form>

From e661297b5d1b227dc53ba6e06a18ef14be150e41 Mon Sep 17 00:00:00 2001
From: "jinling.yang" <jinling.yang@jikimo.com>
Date: Wed, 24 Jan 2024 15:59:58 +0800
Subject: [PATCH 2/6] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=87=87=E8=B4=AD?=
 =?UTF-8?q?=E6=80=BB=E7=9B=91=E5=AE=A1=E6=A0=B8=E8=8F=9C=E5=8D=95=E5=8D=95?=
 =?UTF-8?q?-=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87=E5=90=8E=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=8F=8D=E5=BA=94-=E8=AE=A2=E5=8D=95=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=B2=A1=E6=9C=89=E5=8F=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_sale/views/purchase_order_view.xml | 6 ++----
 sf_sale/views/sale_order_view.xml     | 7 +++++--
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml
index 423742b8..c1794277 100644
--- a/sf_sale/views/purchase_order_view.xml
+++ b/sf_sale/views/purchase_order_view.xml
@@ -10,22 +10,20 @@
                     <field name="partner_id" widget="res_partner_many2one" context="{'is_supplier': True }"/>
                 </field>
                 <field name="currency_id" position="after">
-                    <field name="check_status" invisible="1"/>
-                    <!--                    <field name="state"/>-->
                     <field name="remark" attrs="{'readonly': ['&amp;',('state', 'in', ['purchase']),('check_status','in',
                         ['pending','approved'])]}"/>
                 </field>
                 <xpath expr="//form/header/button[@name='action_rfq_send'][1]" position="after">
                     <button name="sf_sale.action_purchase_order_check_wizard" string="审核" type="action"
                             context="{'default_order_id':active_id}" groups="sf_base.group_purchase_director"
-                            attrs="{'invisible': ['&amp;',('check_status','in', ['approved',False,'fail']),('state', 'in', ['purchase'])]}"
+                            attrs="{'invisible': ['&amp;',('check_status','in', ['approved',False,'fail']),('state', 'in', ['purchase','draft'])]}"
                             class="oe_highlight"/>
 
                 </xpath>
                 <xpath expr="//form/header/button[@name='button_confirm'][2]" position="replace">
                     <button name="button_confirm" type="object" context="{'validate_analytic': True}"
                             string="确认订单" id="draft_confirm"
-                            attrs="{'invisible': ['|','&amp;','&amp;', ('state', 'in', ['purchase']), ('check_status', 'in', ['approved']), ('date_approve', '!=', False),'&amp;', '&amp;',('state', 'in', ['purchase', 'draft']),('check_status', 'in', [False, 'pending', 'fail']),('date_approve', '=', False)]}"
+                            attrs="{'invisible': ['|','&amp;','&amp;', ('state', 'in', ['purchase','draft']), ('check_status', 'in', ['approved']), ('date_approve', '!=', False),'&amp;', '&amp;',('state', 'in', ['purchase', 'draft']),('check_status', 'in', [False, 'pending', 'fail']),('date_approve', '=', False)]}"
                     />
                     <button name="button_confirming" type="object"
                             string="确认订单"
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index f6bef6a6..e6e7e8a2 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -87,8 +87,11 @@
                             attrs="{'invisible': ['|','&amp;',('check_status', '!=', 'approved'),('state', 'in', ['draft','cancel']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in', ['sale','cancel']),('schedule_status', 'not in', False)]}"/>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_cancel']" position="attributes">
-                    <attribute name="attrs">{'invisible': ['|',('state', 'in', ['cancel']),('check_status', 'in',
-                        [False,'approved'])]}
+                    <attribute name="attrs">{'invisible': ['|','&amp;',('state', 'in',
+                        ['cancel','draft']),('check_status',
+                        'in',
+                        [False,'approved']),'&amp;','&amp;',('check_status', '=', 'approved'),('state', 'in',
+                        ['sale','cancel','draft']),('schedule_status', 'not in', False)]}
                     </attribute>
                 </xpath>
                 <xpath expr="//form/header/button[@name='action_draft']" position="attributes">

From fc7c66c61533d2349f844cdda94089f092d8db78 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Wed, 24 Jan 2024 17:29:42 +0800
Subject: [PATCH 3/6] =?UTF-8?q?AGV=E5=A2=9E=E5=8A=A0=E8=BF=90=E8=A1=8C?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97=20=E8=AE=BE=E5=A4=87oee=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=BF=90=E8=A1=8C=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_maintenance/models/sf_maintenance.py       |  19 ++
 sf_maintenance/models/sf_maintenance_oee.py   |  18 +-
 sf_maintenance/security/ir.model.access.csv   |   6 +
 .../views/maintenance_equipment_oee_views.xml |  14 ++
 sf_maintenance/views/maintenance_views.xml    | 173 +++++++++++-------
 5 files changed, 159 insertions(+), 71 deletions(-)

diff --git a/sf_maintenance/models/sf_maintenance.py b/sf_maintenance/models/sf_maintenance.py
index acb87eb6..73826ed9 100644
--- a/sf_maintenance/models/sf_maintenance.py
+++ b/sf_maintenance/models/sf_maintenance.py
@@ -17,12 +17,30 @@ class SfMaintenanceEquipmentCategory(models.Model):
     equipment_type_code = fields.Char('简写')
 
 
+class SfMaintenanceEquipmentAGVLog(models.Model):
+    _name = 'maintenance.equipment.agv.log'
+    _description = 'AGV运行日志'
+
+    run_type = fields.Char('任务类型')
+    run_code = fields.Char('任务指令代码')
+    run_first = fields.Char('任务起点')
+    production_line = fields.Char('目的生产线')
+    run_last = fields.Char('任务终点')
+    workorder = fields.Char('工件编码/任务单号')
+    time = fields.Datetime('日期/事件')
+    state = fields.Char('事件/状体')
+    equipment_id = fields.Many2one('maintenance.equipment', '设备')
+
+
 class SfMaintenanceEquipment(models.Model):
     _inherit = 'maintenance.equipment'
     _description = '设备'
 
     crea_url = "/api/machine_tool/create"
 
+
+    #AGV运行日志
+    agv_logs = fields.One2many('maintenance.equipment.agv.log', 'equipment_id', string='AGV运行日志')
     # 1212修改后的字段
     number_of_axles = fields.Selection(
         [("三轴", "三轴"), ("四轴", "四轴"), ("五轴", "五轴"), ("六轴", "六轴")],
@@ -194,6 +212,7 @@ class SfMaintenanceEquipment(models.Model):
     # 多个型号对应一个机床
     machine_tool_id = fields.Many2one('sf.machine_tool', '机床')
     sf_maintenance_logs_ids = fields.One2many('sf.maintenance.logs', 'maintenance_equipment_id', '设备故障日志')
+    equipment_oee_ids = fields.One2many('maintenance.equipment.oee', 'equipment_id', '设备OEE')
 
     # def name_get(self):
     #     result = []
diff --git a/sf_maintenance/models/sf_maintenance_oee.py b/sf_maintenance/models/sf_maintenance_oee.py
index 71802fda..6d76ffbe 100644
--- a/sf_maintenance/models/sf_maintenance_oee.py
+++ b/sf_maintenance/models/sf_maintenance_oee.py
@@ -23,6 +23,7 @@ class SfMaintenanceEquipmentOEE(models.Model):
     fault_nums = fields.Integer('故障次数')
     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='运行日志')
 
     def name_get(self):
         result = []
@@ -30,4 +31,19 @@ class SfMaintenanceEquipmentOEE(models.Model):
             if parameter.equipment_id:
                 name = parameter.equipment_id.name
                 result.append((parameter.id, name))
-        return result
\ No newline at end of file
+        return result
+
+
+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_oee_id = fields.Many2one('maintenance.equipment.oee', '设备OEE')
diff --git a/sf_maintenance/security/ir.model.access.csv b/sf_maintenance/security/ir.model.access.csv
index 575afec5..602177e9 100644
--- a/sf_maintenance/security/ir.model.access.csv
+++ b/sf_maintenance/security/ir.model.access.csv
@@ -7,12 +7,18 @@ access_maintenance_equipment,maintenance_equipment,model_maintenance_equipment,s
 access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_group_equipment_user,1,0,0,0
 access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,sf_group_equipment_manager,1,1,1,0
 access_maintenance_equipment_oee,maintenance_equipment_oee,model_maintenance_equipment_oee,base.group_user,1,1,1,1
+access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_group_equipment_user,1,0,0,0
+access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,sf_group_equipment_manager,1,1,1,0
+access_maintenance_equipment_oee_logs,maintenance_equipment_oee_logs,model_maintenance_equipment_oee_logs,base.group_user,1,1,1,1
 access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_user,1,0,0,0
 access_maintenance_standards,maintenance_standards,model_maintenance_standards,sf_group_equipment_manager,1,1,1,0
 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_user,1,0,0,0
 access_maintenance_standard_image,maintenance_standard_image,model_maintenance_standard_image,sf_group_equipment_manager,1,1,1,0
 access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_user,1,0,0,0
 access_sf_robot_axis_num,sf_robot_axis_num,model_sf_robot_axis_num,sf_group_equipment_manager,1,1,1,0
+access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_maintenance_equipment_agv_log,sf_group_equipment_user,1,0,0,0
+access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_maintenance_equipment_agv_log,sf_group_equipment_manager,1,1,1,0
+access_maintenance_equipment_agv_log,maintenance_equipment_agv_log,model_maintenance_equipment_agv_log,base.group_user,1,1,1,1
 
 
 access_maintenance_request_group_plan_dispatch,maintenance.request,maintenance.model_maintenance_request,sf_base.group_plan_dispatch,1,0,0,0
diff --git a/sf_maintenance/views/maintenance_equipment_oee_views.xml b/sf_maintenance/views/maintenance_equipment_oee_views.xml
index 60055631..091e3c47 100644
--- a/sf_maintenance/views/maintenance_equipment_oee_views.xml
+++ b/sf_maintenance/views/maintenance_equipment_oee_views.xml
@@ -49,6 +49,19 @@
                             </group>
 
                         </group>
+                        <notebook>
+                        <page string="运行日志">
+                            <field name="oee_logs">
+                                <tree create="1" edit="1" delete="1" editable="bottom">
+                                    <field name = 'run_time'/>
+                                    <field name = 'state'/>
+                                    <field name = 'workorder_id'/>
+                                    <field name = 'time'/>
+                                    <field name = 'color' widget="color"/>
+                                </tree>
+                            </field>
+                        </page>
+                        </notebook>
                     </sheet>
                 </form>
             </field>
@@ -63,6 +76,7 @@
                     <searchpanel>
                         <field name="equipment_id" icon="fa-building" enable_counters="1"/>
                     </searchpanel>
+                      <field name="equipment_id"/>
                 </search>
             </field>
         </record>
diff --git a/sf_maintenance/views/maintenance_views.xml b/sf_maintenance/views/maintenance_views.xml
index 0dc18355..125a86c0 100644
--- a/sf_maintenance/views/maintenance_views.xml
+++ b/sf_maintenance/views/maintenance_views.xml
@@ -32,6 +32,14 @@
                         <field string="设备故障日志" name="sf_maintenance_logs_ids" widget="statinfo"/>
                     </button>
 
+                    <button name="%(action_maintenance_oee)d"
+                            type="action"
+                            class="oe_stat_button"
+                            context="{'search_default_equipment_id': [active_id]}"
+                            icon="fa-exchange"
+                            attrs="{'invisible': [('state_zc', '!=', '已注册')]}">
+                        <field string="设备oee" name="equipment_oee_ids" widget="statinfo"/>
+                    </button>
 
                 </xpath>
                 <xpath expr="//field[@name='maintenance_team_id']" position="before">
@@ -63,15 +71,18 @@
                           attrs="{'invisible': [('equipment_type', '!=', '机床')]}">
                         <group>
                             <group string="基础参数">
-                                <field name="control_system_id" attrs="{'required': [('equipment_type', '=', '机床')]}" options="{'no_create': True}"/>
+                                <field name="control_system_id" attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                       options="{'no_create': True}"/>
                                 <label for="workbench_L" string="工作台尺寸(mm)"/>
                                 <div class="test_model">
                                     <label for="workbench_L" string="长"/>
-                                    <field name="workbench_L" class="o_address_zip" attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                    <field name="workbench_L" class="o_address_zip"
+                                           attrs="{'required': [('equipment_type', '=', '机床')]}"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="workbench_W" string="宽"/>
-                                    <field name="workbench_W" class="o_address_zip" attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                    <field name="workbench_W" class="o_address_zip"
+                                           attrs="{'required': [('equipment_type', '=', '机床')]}"
                                            options="{'format': false}"/>
                                 </div>
                                 <field name="workpiece_load"/>
@@ -115,22 +126,26 @@
 
                                 <!--                                    <field name="lead_screw" required="1"/>-->
                                 <!--                                    <field name="guide_rail" required="1"/>-->
-                                <field name="number_of_axles" attrs="{'required': [('equipment_type', '=', '机床')]}" widget="radio"
+                                <field name="number_of_axles" attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                       widget="radio"
                                        options="{'horizontal': true}"/>
                                 <label for="x_axis" string="加工行程(mm)"
                                        attrs="{'invisible': [('number_of_axles', '=', False)]}"/>
                                 <div class="test_model"
                                      attrs="{'invisible': [('number_of_axles', '=', False)]}">
                                     <label for="x_axis" string="x"/>
-                                    <field name="x_axis" class="o_address_zip" attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                    <field name="x_axis" class="o_address_zip"
+                                           attrs="{'required': [('equipment_type', '=', '机床')]}"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="y_axis" string="y"/>
-                                    <field name="y_axis" class="o_address_zip" attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                    <field name="y_axis" class="o_address_zip"
+                                           attrs="{'required': [('equipment_type', '=', '机床')]}"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="z_axis" string="z"/>
-                                    <field name="z_axis" class="o_address_zip" attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                    <field name="z_axis" class="o_address_zip"
+                                           attrs="{'required': [('equipment_type', '=', '机床')]}"
                                            options="{'format': false}"/>
                                     <span>&amp;nbsp;</span>
                                     <label for="a_axis" string="a"
@@ -177,58 +192,74 @@
 
                                 <!--                                    <field name="distance" required="1"/>-->
                             </group>
-                                <group string="刀具">
-                                    <!--                                    <field name="knife_type" required="1"/>-->
-                                    <field name="number_of_knife_library" attrs="{'required': [('equipment_type', '=', '机床')]}" options="{'format': false}"/>
-                                    <!--                                    <field name="tool_speed" required="1"/>-->
-                                    <field name="tool_full_diameter_max"/>
-                                    <field name="tool_perimeter_diameter_max"/>
-                                    <field name="tool_long_max"/>
-                                    <!--                                    <label for="tool_diameter_min" string="刀具刀径(mm)"/>-->
-                                    <!--                                    <div class="test_model">-->
-                                    <!--                                        <label for="tool_diameter_min" string="最小(min)"/>-->
-                                    <!--                                        <field name="tool_diameter_min" class="o_address_zip" required="1"-->
-                                    <!--                                               options="{'format': false}"/>-->
-                                    <!--                                        <span>&amp;nbsp;</span>-->
-                                    <!--                                        <label for="tool_diameter_max" string="最大(max)"/>-->
-                                    <!--                                        <field name="tool_diameter_max" class="o_address_zip" required="1"-->
-                                    <!--                                               options="{'format': false}"/>-->
-                                    <!--                                    </div>-->
-                                    <field name="tool_quality_max"/>
-                                    <field name="T_tool_time"/>
-                                    <field name="C_tool_time"/>
-                                </group>
-
-                                <group string="进给参数">
-                                    <field name="X_axis_rapid_traverse_speed"/>
-                                    <field name="Y_axis_rapid_traverse_speed"/>
-                                    <field name="Z_axis_rapid_traverse_speed"/>
-                                    <field name="a_axis_rapid_traverse_speed"/>
-                                    <field name="b_axis_rapid_traverse_speed"/>
-                                    <field name="c_axis_rapid_traverse_speed"/>
-                                    <field name="straight_cutting_feed_rate"/>
-                                    <field name="rotary_cutting_feed_rate"/>
-                                </group>
-                                <group string="精度参数">
-                                    <field name="X_precision"/>
-                                    <field name="X_precision_repeat"/>
-                                    <field name="Y_precision"/>
-                                    <field name="Y_precision_repeat"/>
-                                    <field name="Z_precision"/>
-                                    <field name="Z_precision_repeat"/>
-                                    <field name="a_precision"/>
-                                    <field name="a_precision_repeat"/>
-                                    <field name="b_precision"/>
-                                    <field name="b_precision_repeat"/>
-                                    <field name="c_precision"/>
-                                    <field name="c_precision_repeat"/>
-                                </group>
-
+                            <group string="刀具">
+                                <!--                                    <field name="knife_type" required="1"/>-->
+                                <field name="number_of_knife_library"
+                                       attrs="{'required': [('equipment_type', '=', '机床')]}"
+                                       options="{'format': false}"/>
+                                <!--                                    <field name="tool_speed" required="1"/>-->
+                                <field name="tool_full_diameter_max"/>
+                                <field name="tool_perimeter_diameter_max"/>
+                                <field name="tool_long_max"/>
+                                <!--                                    <label for="tool_diameter_min" string="刀具刀径(mm)"/>-->
+                                <!--                                    <div class="test_model">-->
+                                <!--                                        <label for="tool_diameter_min" string="最小(min)"/>-->
+                                <!--                                        <field name="tool_diameter_min" class="o_address_zip" required="1"-->
+                                <!--                                               options="{'format': false}"/>-->
+                                <!--                                        <span>&amp;nbsp;</span>-->
+                                <!--                                        <label for="tool_diameter_max" string="最大(max)"/>-->
+                                <!--                                        <field name="tool_diameter_max" class="o_address_zip" required="1"-->
+                                <!--                                               options="{'format': false}"/>-->
+                                <!--                                    </div>-->
+                                <field name="tool_quality_max"/>
+                                <field name="T_tool_time"/>
+                                <field name="C_tool_time"/>
                             </group>
 
+                            <group string="进给参数">
+                                <field name="X_axis_rapid_traverse_speed"/>
+                                <field name="Y_axis_rapid_traverse_speed"/>
+                                <field name="Z_axis_rapid_traverse_speed"/>
+                                <field name="a_axis_rapid_traverse_speed"/>
+                                <field name="b_axis_rapid_traverse_speed"/>
+                                <field name="c_axis_rapid_traverse_speed"/>
+                                <field name="straight_cutting_feed_rate"/>
+                                <field name="rotary_cutting_feed_rate"/>
+                            </group>
+                            <group string="精度参数">
+                                <field name="X_precision"/>
+                                <field name="X_precision_repeat"/>
+                                <field name="Y_precision"/>
+                                <field name="Y_precision_repeat"/>
+                                <field name="Z_precision"/>
+                                <field name="Z_precision_repeat"/>
+                                <field name="a_precision"/>
+                                <field name="a_precision_repeat"/>
+                                <field name="b_precision"/>
+                                <field name="b_precision_repeat"/>
+                                <field name="c_precision"/>
+                                <field name="c_precision_repeat"/>
+                            </group>
+
+                        </group>
 
 
                     </page>
+                     <page string="AGV运行日志" name="sf_equipment"
+                          attrs="{'invisible': [('equipment_type', '!=', 'AGV小车')]}">
+                         <field name="agv_logs">
+                             <tree create="1" edit="1" delete="1" editable="bottom">
+                                    <field name = 'run_type'/>
+                                    <field name = 'run_code'/>
+                                    <field name = 'run_first'/>
+                                    <field name = 'run_last'/>
+                                    <field name = 'production_line'/>
+                                    <field name = 'workorder'/>
+                                    <field name = 'time'/>
+                                    <field name = 'state'/>
+                                </tree>
+                         </field>
+                     </page>
 
                     <page string="设备参数" name="sf_equipment"
                           attrs="{'invisible': [('equipment_type', '!=', 'AGV小车')]}">
@@ -913,28 +944,30 @@
                 </xpath>
 
                 <xpath expr="//notebook" position="before">
-                    <group string="加工能力" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" class="processingMethod">
+                    <group string="加工能力" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"
+                           class="processingMethod">
                         <div>
-                        <field name='image_id' widget="custom_many2many_checkboxes" string="">
+                            <field name='image_id' widget="custom_many2many_checkboxes" string="">
 
-                            <tree>
-                                <field name="name"/>
-                                <field name="image" widget="image"
-                                       options="{'size': [100, 100], 'click enlarge': True}"/>
-                            </tree>
-                        </field>
+                                <tree>
+                                    <field name="name"/>
+                                    <field name="image" widget="image"
+                                           options="{'size': [100, 100], 'click enlarge': True}"/>
+                                </tree>
+                            </field>
                         </div>
                     </group>
-                    <group string="冷却方式" attrs="{'invisible': [('equipment_type', '!=', '机床')]}" class="processingMethod">
+                    <group string="冷却方式" attrs="{'invisible': [('equipment_type', '!=', '机床')]}"
+                           class="processingMethod">
                         <div>
-                        <field name='image_lq_id' widget="custom_many2many_checkboxes" string="">
+                            <field name='image_lq_id' widget="custom_many2many_checkboxes" string="">
 
-                            <tree>
-                                <field name="name"/>
-                                <field name="image" widget="image"
-                                       options="{'size': [100, 100], 'click enlarge': True}"/>
-                            </tree>
-                        </field>
+                                <tree>
+                                    <field name="name"/>
+                                    <field name="image" widget="image"
+                                           options="{'size': [100, 100], 'click enlarge': True}"/>
+                                </tree>
+                            </field>
                         </div>
                     </group>
                 </xpath>

From 50ced99785afdc9c7f7cd70da6c50aa6a76ee56b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E7=84=B1?= <huangyan@jikimo.com>
Date: Thu, 25 Jan 2024 10:03:53 +0800
Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E6=9E=B6?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=A9=BA=E9=97=B2=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_warehouse/static/src/css/kanban_color_change.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sf_warehouse/static/src/css/kanban_color_change.scss b/sf_warehouse/static/src/css/kanban_color_change.scss
index aeb75150..c532bf96 100644
--- a/sf_warehouse/static/src/css/kanban_color_change.scss
+++ b/sf_warehouse/static/src/css/kanban_color_change.scss
@@ -52,7 +52,7 @@
 }
 
 .green {
-    background-color: #fff !important;
+    background-color: #27FEA9 !important;
     border: 1px solid #ccc;
 }
 

From 6461e3a42379f0d7368175ef8e8c314b9d86dc42 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Thu, 25 Jan 2024 17:36:34 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A7=E6=9E=B6?=
 =?UTF-8?q?=E8=B4=A7=E4=BD=8D=E7=9C=8B=E6=9D=BF=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jikimo_frontend/static/src/scss/custom_style.scss | 4 ++--
 sf_warehouse/models/model.py                      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/jikimo_frontend/static/src/scss/custom_style.scss b/jikimo_frontend/static/src/scss/custom_style.scss
index d8e2ab85..12e18c1c 100644
--- a/jikimo_frontend/static/src/scss/custom_style.scss
+++ b/jikimo_frontend/static/src/scss/custom_style.scss
@@ -79,9 +79,9 @@ td.o_required_modifier {
 }
 
 .oe_kanban_card.kanban_color_1 {
-  background-color: #27FEA9 !important;
+  background-color: #fff !important;
   opacity: 0.7;
-  color: #fff;
+  color: #777;
 }
 
 .oe_kanban_card.kanban_color_3 {
diff --git a/sf_warehouse/models/model.py b/sf_warehouse/models/model.py
index a53dae86..bb2e23e5 100644
--- a/sf_warehouse/models/model.py
+++ b/sf_warehouse/models/model.py
@@ -238,8 +238,8 @@ class ShelfLocation(models.Model):
                 record.storage_time = datetime.datetime.now()
             if record.location_status == '空闲':
                 record.storage_time = False
-            else:
-                pass
+            if record.location_status == '禁用':
+                record.storage_time = False
 
     name = fields.Char('名称', required=True, size=20)
     barcode = fields.Char('编码', copy=False, size=15)
@@ -309,7 +309,7 @@ class ShelfLocation(models.Model):
                 record.location_status = '占用'
             else:
                 record.product_id = False
-                record.location_status = '空闲'
+                # record.location_status = '空闲'
 
     @api.depends('location_type')
     def _compute_hide_what(self):

From 207cd83d3cc4d9fc2618ea5780550e27f7b8dd88 Mon Sep 17 00:00:00 2001
From: "qihao.gong@jikimo.com" <qihao.gong@jikimo.com>
Date: Fri, 26 Jan 2024 11:27:12 +0800
Subject: [PATCH 6/6] =?UTF-8?q?=E5=8F=96=E6=B6=88OCC=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 sf_manufacturing/models/product_template.py | 4 ++--
 sf_sale/models/auto_quatotion_common.py     | 2 +-
 sf_sale/models/quick_easy_order.py          | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index cac61045..42a392e2 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -6,8 +6,8 @@ import os
 from odoo import models, fields, api, _
 from odoo.exceptions import ValidationError
 from odoo.modules import get_resource_path
-#from OCC.Extend.DataExchange import read_step_file
-#from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 
 
 class ResProductMo(models.Model):
diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py
index 1b29c6d2..09ea3f0f 100644
--- a/sf_sale/models/auto_quatotion_common.py
+++ b/sf_sale/models/auto_quatotion_common.py
@@ -2,7 +2,7 @@
 import logging
 from odoo.modules import get_resource_path
 from odoo import fields, models, api
-#from quatotion import readSql, feature_recognize, auto_quatotion
+from quatotion import readSql, feature_recognize, auto_quatotion
 
 __author__ = 'jinling.yang'
 _logger = logging.getLogger(__name__)
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 5ec1fd52..1e5f274c 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -5,8 +5,8 @@ import os
 import json
 from datetime import datetime
 import requests
-#from OCC.Extend.DataExchange import read_step_file
-#from OCC.Extend.DataExchange import write_stl_file
+from OCC.Extend.DataExchange import read_step_file
+from OCC.Extend.DataExchange import write_stl_file
 from odoo import models, fields, api
 from odoo.modules import get_resource_path
 from odoo.exceptions import ValidationError, UserError