From 6cf26e8029ea3d9ff76a36818f13a5b770edd78e Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 29 Nov 2023 17:25:40 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/group_security.xml | 10 +++++++++ sf_manufacturing/models/product_template.py | 12 +++++------ sf_sale/models/auto_quatotion_common.py | 24 ++++++++++----------- sf_sale/models/quick_easy_order.py | 4 ++-- 4 files changed, 30 insertions(+), 20 deletions(-) diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml index 4d57bc43..a671dfe0 100644 --- a/sf_base/security/group_security.xml +++ b/sf_base/security/group_security.xml @@ -65,5 +65,15 @@ + + + 采购岗 + + + + + 采购总监 + + \ No newline at end of file diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index 124e0058..3233e674 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): @@ -88,19 +88,19 @@ class ResProductMo(models.Model): cutting_tool_run_out_accuracy_min = fields.Float('端跳精度min', digits=(6, 1)) cutting_tool_blade_tip_working_size = fields.Char('刀尖处理尺寸(R半径mm/倒角)', size=20) fit_blade_shape_id = fields.Many2one('maintenance.equipment.image', - '适配刀片形状', domain=[('type', '=', '刀片形状')]) + '适配刀片形状', domain=[('type', '=', '刀片形状')]) suitable_machining_method_ids = fields.Many2many('maintenance.equipment.image', 'rel_machining_product_template', '适合加工方式', domain=[('type', '=', '加工能力')]) blade_tip_characteristics_id = fields.Many2one('maintenance.equipment.image', '刀尖特征', - domain=[('type', '=', '刀尖特征')]) - handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型',domain=[('type', '=', '柄部类型')]) + domain=[('type', '=', '刀尖特征')]) + handle_type_id = fields.Many2one('maintenance.equipment.image', '柄部类型', domain=[('type', '=', '柄部类型')]) cutting_direction_ids = fields.Many2many('maintenance.equipment.image', 'rel_cutting_product_template', '走刀方向', domain=[('type', '=', '走刀方向')]) suitable_coolant_ids = fields.Many2many('maintenance.equipment.image', 'rel_coolant_product_template', '适合冷却液', domain=[('type', '=', '冷却液')]) compaction_way_id = fields.Many2one('maintenance.equipment.image', - '压紧方式', domain=[('type', '=', '压紧方式')]) + '压紧方式', domain=[('type', '=', '压紧方式')]) @api.onchange('cutting_tool_material_id') def _onchange_cutting_tool_material_id(self): diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index 09ea3f0f..d1bdb65a 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__) @@ -24,14 +24,14 @@ class AutoQuatotion(models.Model): def get_process_time_db_path(self): return get_resource_path('sf_sale', 'models', 'process_time.db') - def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code): - ''' - 通过打包好的.so库， - 以调用autoQuatotion库中Quatotion类， - 初始化后调用类的analyseShape方法对模型文件进行价格预测 - ''' - # 初始化自动报价类(输入特征数据库和加工时间数据库) - reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path) - # 获取价格、加工时间、尺寸、XYZ、翻面次数 - feature_info = reader.analyseShape(stp_url, InfoJson={}) - return feature_info + # def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code): + # ''' + # 通过打包好的.so库， + # 以调用autoQuatotion库中Quatotion类， + # 初始化后调用类的analyseShape方法对模型文件进行价格预测 + # ''' + # # 初始化自动报价类(输入特征数据库和加工时间数据库) + # reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path) + # # 获取价格、加工时间、尺寸、XYZ、翻面次数 + # feature_info = reader.analyseShape(stp_url, InfoJson={}) + # return feature_info diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 1e5f274c..7419cc9a 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 From 45df8f5bc29edf546c13c719a9754dd0f1f73d3d Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Mon, 4 Dec 2023 17:34:23 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=87=87=E8=B4=AD?= =?UTF-8?q?=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/ir.model.access.csv | 5 ++ sf_sale/__manifest__.py | 1 + sf_sale/models/sale_order.py | 11 +++++ sf_sale/security/group_security.xml | 39 +++++++++++++++ sf_sale/views/purchase_order_view.xml | 68 +++++++++++++++++++++++++++ sf_sale/views/sale_order_view.xml | 3 ++ 6 files changed, 127 insertions(+) create mode 100644 sf_sale/views/purchase_order_view.xml diff --git a/sf_base/security/ir.model.access.csv b/sf_base/security/ir.model.access.csv index 1a550d41..6ff1f8a8 100644 --- a/sf_base/security/ir.model.access.csv +++ b/sf_base/security/ir.model.access.csv @@ -30,6 +30,11 @@ access_sf_tool_materials_basic_parameters,sf_tool_materials_basic_parameters,mod access_sf_cutting_speed,sf_cutting_speed,model_sf_cutting_speed,base.group_user,1,1,1,1 access_sf_feed_per_tooth,sf_feed_per_tooth,model_sf_feed_per_tooth,base.group_user,1,1,1,1 access_maintenance_equipment_image,maintenance_equipment_image,model_maintenance_equipment_image,base.group_user,1,1,1,1 +access_purchase_order_group_purchase,access_purchase_order_group_purchase,purchase.model_purchase_order,sf_base.group_purchase,1,1,1,0 +access_purchase_order_group_purchase_director,access_purchase_order_group_purchase_director,purchase.model_purchase_order,sf_base.group_purchase_director,1,1,1,0 +access_purchase_order_line_group_purchase,access_purchase_order_line_group_purchase,purchase.model_purchase_order_line,sf_base.group_purchase,1,1,1,0 +access_purchase_order_line_group_purchase_director,access_purchase_order_line_group_purchase_director,purchase.model_purchase_order_line,sf_base.group_purchase_director,1,1,1,0 + diff --git a/sf_sale/__manifest__.py b/sf_sale/__manifest__.py index 64d9c41a..a20be38b 100644 --- a/sf_sale/__manifest__.py +++ b/sf_sale/__manifest__.py @@ -16,6 +16,7 @@ 'security/ir.model.access.csv', 'views/sale_team.xml', 'views/sale_order_view.xml', + 'views/purchase_order_view.xml', 'views/quick_easy_order_view.xml' ], 'demo': [ diff --git a/sf_sale/models/sale_order.py b/sf_sale/models/sale_order.py index 0bb6672a..ec994fed 100644 --- a/sf_sale/models/sale_order.py +++ b/sf_sale/models/sale_order.py @@ -74,3 +74,14 @@ class ResaleOrderLine(models.Model): _inherit = 'sale.order.line' model_glb_file = fields.Binary('模型的glb文件') + + +class RePurchaseOrder(models.Model): + _inherit = 'purchase.order' + + check_status = fields.Selection([('unchecked', '未审核'), ('checked', '已审核')], '审核状态', default='unchecked') + + # 审核 + def action_check(self): + self.check_status = 'checked' + diff --git a/sf_sale/security/group_security.xml b/sf_sale/security/group_security.xml index 00e4561a..f498ce73 100644 --- a/sf_sale/security/group_security.xml +++ b/sf_sale/security/group_security.xml @@ -38,5 +38,44 @@ + + + 采购总监查看所有的订单 + + [(1,'=',1)] + + + + + + + 采购岗查看自己的订单 + + ['|',('user_id','=',user.id),('create_uid', '=',user.id)] + + + + + + + + + 采购总监查看所有供应商 + + [(1,'=',1)] + + + + + + + 采购岗查看自己的供应商 + + ['|',('user_id','=',user.id),('create_uid', '=',user.id)] + + + + + \ No newline at end of file diff --git a/sf_sale/views/purchase_order_view.xml b/sf_sale/views/purchase_order_view.xml new file mode 100644 index 00000000..4139dd19 --- /dev/null +++ b/sf_sale/views/purchase_order_view.xml @@ -0,0 +1,68 @@ + + + + + purchase.order.form.inherit.sf + purchase.order + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + sf_base.group_purchase + + + + + + + + + + sf_base.group_purchase + + + + sf_base.group_purchase + + + sf_base.group_purchase + + + + sf_base.group_purchase + + + sf_base.group_purchase + + + + + \ No newline at end of file diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml index a02a8adc..0abe7989 100644 --- a/sf_sale/views/sale_order_view.xml +++ b/sf_sale/views/sale_order_view.xml @@ -71,6 +71,9 @@ sale.order + + False + 订单号 From 71147eb7f925b7110b60178a82fb2a13e1576e92 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Tue, 5 Dec 2023 17:28:32 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=BB=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/group_security.xml | 33 ++++++++++++------- sf_quality/security/ir.model.access.csv | 42 +++++++++++++++++++++++++ 2 files changed, 64 insertions(+), 11 deletions(-) diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml index a671dfe0..6bd24129 100644 --- a/sf_base/security/group_security.xml +++ b/sf_base/security/group_security.xml @@ -1,20 +1,29 @@ + + 维保岗 + + + + + 设备总监 + + 制造普通用户 - + - - - + + + - - - - - - + + + + + + 机床操作岗 @@ -66,7 +75,7 @@ - + 采购岗 @@ -75,5 +84,7 @@ 采购总监 + + \ No newline at end of file diff --git a/sf_quality/security/ir.model.access.csv b/sf_quality/security/ir.model.access.csv index e69de29b..75af2948 100644 --- a/sf_quality/security/ir.model.access.csv +++ b/sf_quality/security/ir.model.access.csv @@ -0,0 +1,42 @@ +id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink +access_quality_point_group_quality,quality_point_group_quality,quality.model_quality_point,sf_base.group_quality,1,0,0,0 +access_quality_point_group_quality_director,quality_point_group_quality_director,quality.model_quality_point,sf_base.group_quality_director,1,0,0,0 +access_quality_point_group_quality_manager,quality_point_group_quality_manager,quality.model_quality_point,sf_base.group_quality_manager,1,1,1,0 +access_quality_point_group_plan_dispatch,quality_point_group_plan_dispatch,quality.model_quality_point,sf_base.group_plan_dispatch,1,0,0,0 +access_quality_point_group_plan_director,quality_point_group_plan_director,quality.model_quality_point,sf_base.group_plan_director,1,0,0,0 +access_quality_point_group_sf_equipment_user,quality_point_group_sf_equipment_user,quality.model_quality_point,sf_base.group_sf_equipment_user,1,0,0,0 +access_quality_point_group_sf_tool_user,quality_point_group_sf_tool_user,quality.model_quality_point,sf_base.group_sf_tool_user,1,0,0,0 +access_quality_point_group_sf_order_user,quality_point_group_sf_order_user,quality.model_quality_point,sf_base.group_sf_order_user,1,0,0,0 +access_quality_point_group_sf_mrp_manager,quality_point_group_sf_mrp_manager,quality.model_quality_point,sf_base.group_sf_mrp_manager,1,0,0,0 + +access_quality_check_group_quality,quality_check_group_quality,quality.model_quality_check,sf_base.group_quality,1,0,0,0 +access_quality_check_group_quality_director,quality_check_group_quality_director,quality.model_quality_check,sf_base.group_quality_director,1,1,1,0 +access_quality_check_group_quality_manager,quality_check_group_quality_manager,quality.model_quality_check,sf_base.group_quality_manager,1,1,1,0 +access_quality_check_group_plan_dispatch,quality_check_group_plan_dispatch,quality.model_quality_check,sf_base.group_plan_dispatch,1,0,0,0 +access_quality_check_group_plan_director,quality_check_group_plan_director,quality.model_quality_check,sf_base.group_plan_director,1,0,0,0 +access_quality_check_group_sf_equipment_user,quality_check_group_sf_equipment_user,quality.model_quality_check,sf_base.group_sf_equipment_user,1,0,0,0 +access_quality_check_group_sf_tool_user,quality_check_group_sf_tool_user,quality.model_quality_check,sf_base.group_sf_tool_user,1,0,0,0 +access_quality_check_group_sf_order_user,quality_check_group_sf_order_user,quality.model_quality_check,sf_base.group_sf_order_user,1,0,0,0 +access_quality_check_group_sf_mrp_manager,quality_check_group_sf_mrp_manager,quality.model_quality_check,sf_base.group_sf_mrp_manager,1,0,0,0 + +access_quality_alert_group_quality,quality_alert_group_quality,quality.model_quality_alert,sf_base.group_quality,1,0,0,0 +access_quality_alert_group_quality_director,quality_alert_group_quality_director,quality.model_quality_alert,sf_base.group_quality_director,1,1,1,0 +access_quality_alert_group_quality_manager,quality_alert_group_quality_manager,quality.model_quality_alert,sf_base.group_quality_manager,1,1,1,0 +access_quality_alert_group_plan_dispatch,quality_alert_group_plan_dispatch,quality.model_quality_alert,sf_base.group_plan_dispatch,1,0,0,0 +access_quality_alert_group_plan_director,quality_alert_group_plan_director,quality.model_quality_alert,sf_base.group_plan_director,1,0,0,0 +access_quality_alert_group_sf_equipment_user,quality_alert_group_sf_equipment_user,quality.model_quality_alert,sf_base.group_sf_equipment_user,1,0,0,0 +access_quality_alert_group_sf_tool_user,quality_alert_group_sf_tool_user,quality.model_quality_alert,sf_base.group_sf_tool_user,1,0,0,0 +access_quality_alert_group_sf_order_user,quality_alert_group_sf_order_user,quality.model_quality_alert,sf_base.group_sf_order_user,1,0,0,0 +access_quality_alert_group_sf_mrp_manager,quality_alert_group_sf_mrp_manager,quality.model_quality_alert,sf_base.group_sf_mrp_manager,1,0,0,0 + +access_quality_alert_team_group_quality,quality_alert_team_group_quality,quality.model_quality_alert_team,sf_base.group_quality,1,0,0,0 +access_quality_alert_team_group_quality_director,quality_alert_team_group_quality_director,quality.model_quality_alert_team,sf_base.group_quality_director,1,1,1,0 +access_quality_alert_team_group_quality_manager,quality_alert_team_group_quality_manager,quality.model_quality_alert_team,sf_base.group_quality_manager,1,1,1,0 +access_quality_alert_team_group_plan_dispatch,quality_alert_team_group_plan_dispatch,quality.model_quality_alert_team,sf_base.group_plan_dispatch,1,0,0,0 +access_quality_alert_team_group_plan_director,quality_alert_team_group_plan_director,quality.model_quality_alert_team,sf_base.group_plan_director,1,0,0,0 +access_quality_alert_team_group_sf_equipment_user,quality_alert_team_group_sf_equipment_user,quality.model_quality_alert_team,sf_base.group_sf_equipment_user,1,0,0,0 +access_quality_alert_team_group_sf_tool_user,quality_alert_team_group_sf_tool_user,quality.model_quality_alert_team,sf_base.group_sf_tool_user,1,0,0,0 +access_quality_alert_team_group_sf_order_user,quality_alert_team_group_sf_order_user,quality.model_quality_alert_team,sf_base.group_sf_order_user,1,0,0,0 +access_quality_alert_team_group_sf_mrp_manager,quality_alert_team_group_sf_mrp_manager,quality.model_quality_alert_team,sf_base.group_sf_mrp_manager,1,0,0,0 + + From 26ec1c9f6e84ccf357a813f625f200612ac48aba Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 6 Dec 2023 14:53:38 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E7=9A=84=E6=9D=83=E9=99=90=E7=BB=84=E5=90=8D?= =?UTF-8?q?=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_base/security/group_security.xml | 4 ++-- sf_quality/security/ir.model.access.csv | 8 +++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/sf_base/security/group_security.xml b/sf_base/security/group_security.xml index 6bd24129..72310cfc 100644 --- a/sf_base/security/group_security.xml +++ b/sf_base/security/group_security.xml @@ -1,12 +1,12 @@ - 维保岗 + 质检岗 - 设备总监 + 质量总监 diff --git a/sf_quality/security/ir.model.access.csv b/sf_quality/security/ir.model.access.csv index 75af2948..a230873a 100644 --- a/sf_quality/security/ir.model.access.csv +++ b/sf_quality/security/ir.model.access.csv @@ -1,7 +1,6 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink access_quality_point_group_quality,quality_point_group_quality,quality.model_quality_point,sf_base.group_quality,1,0,0,0 -access_quality_point_group_quality_director,quality_point_group_quality_director,quality.model_quality_point,sf_base.group_quality_director,1,0,0,0 -access_quality_point_group_quality_manager,quality_point_group_quality_manager,quality.model_quality_point,sf_base.group_quality_manager,1,1,1,0 +access_quality_point_group_quality_director,quality_point_group_quality_director,quality.model_quality_point,sf_base.group_quality_director,1,1,1,0 access_quality_point_group_plan_dispatch,quality_point_group_plan_dispatch,quality.model_quality_point,sf_base.group_plan_dispatch,1,0,0,0 access_quality_point_group_plan_director,quality_point_group_plan_director,quality.model_quality_point,sf_base.group_plan_director,1,0,0,0 access_quality_point_group_sf_equipment_user,quality_point_group_sf_equipment_user,quality.model_quality_point,sf_base.group_sf_equipment_user,1,0,0,0 @@ -11,7 +10,6 @@ access_quality_point_group_sf_mrp_manager,quality_point_group_sf_mrp_manager,qua access_quality_check_group_quality,quality_check_group_quality,quality.model_quality_check,sf_base.group_quality,1,0,0,0 access_quality_check_group_quality_director,quality_check_group_quality_director,quality.model_quality_check,sf_base.group_quality_director,1,1,1,0 -access_quality_check_group_quality_manager,quality_check_group_quality_manager,quality.model_quality_check,sf_base.group_quality_manager,1,1,1,0 access_quality_check_group_plan_dispatch,quality_check_group_plan_dispatch,quality.model_quality_check,sf_base.group_plan_dispatch,1,0,0,0 access_quality_check_group_plan_director,quality_check_group_plan_director,quality.model_quality_check,sf_base.group_plan_director,1,0,0,0 access_quality_check_group_sf_equipment_user,quality_check_group_sf_equipment_user,quality.model_quality_check,sf_base.group_sf_equipment_user,1,0,0,0 @@ -21,17 +19,17 @@ access_quality_check_group_sf_mrp_manager,quality_check_group_sf_mrp_manager,qua access_quality_alert_group_quality,quality_alert_group_quality,quality.model_quality_alert,sf_base.group_quality,1,0,0,0 access_quality_alert_group_quality_director,quality_alert_group_quality_director,quality.model_quality_alert,sf_base.group_quality_director,1,1,1,0 -access_quality_alert_group_quality_manager,quality_alert_group_quality_manager,quality.model_quality_alert,sf_base.group_quality_manager,1,1,1,0 access_quality_alert_group_plan_dispatch,quality_alert_group_plan_dispatch,quality.model_quality_alert,sf_base.group_plan_dispatch,1,0,0,0 access_quality_alert_group_plan_director,quality_alert_group_plan_director,quality.model_quality_alert,sf_base.group_plan_director,1,0,0,0 access_quality_alert_group_sf_equipment_user,quality_alert_group_sf_equipment_user,quality.model_quality_alert,sf_base.group_sf_equipment_user,1,0,0,0 access_quality_alert_group_sf_tool_user,quality_alert_group_sf_tool_user,quality.model_quality_alert,sf_base.group_sf_tool_user,1,0,0,0 access_quality_alert_group_sf_order_user,quality_alert_group_sf_order_user,quality.model_quality_alert,sf_base.group_sf_order_user,1,0,0,0 access_quality_alert_group_sf_mrp_manager,quality_alert_group_sf_mrp_manager,quality.model_quality_alert,sf_base.group_sf_mrp_manager,1,0,0,0 +access_quality_alert_group_sf_order_user,quality_alert_group_sf_order_user,quality.model_quality_alert,sf_base.group_sf_order_user,1,0,0,0 +access_quality_alert_group_sf_mrp_manager,quality_alert_group_sf_mrp_manager,quality.model_quality_alert,sf_base.group_sf_mrp_manager,1,0,0,0 access_quality_alert_team_group_quality,quality_alert_team_group_quality,quality.model_quality_alert_team,sf_base.group_quality,1,0,0,0 access_quality_alert_team_group_quality_director,quality_alert_team_group_quality_director,quality.model_quality_alert_team,sf_base.group_quality_director,1,1,1,0 -access_quality_alert_team_group_quality_manager,quality_alert_team_group_quality_manager,quality.model_quality_alert_team,sf_base.group_quality_manager,1,1,1,0 access_quality_alert_team_group_plan_dispatch,quality_alert_team_group_plan_dispatch,quality.model_quality_alert_team,sf_base.group_plan_dispatch,1,0,0,0 access_quality_alert_team_group_plan_director,quality_alert_team_group_plan_director,quality.model_quality_alert_team,sf_base.group_plan_director,1,0,0,0 access_quality_alert_team_group_sf_equipment_user,quality_alert_team_group_sf_equipment_user,quality.model_quality_alert_team,sf_base.group_sf_equipment_user,1,0,0,0 From d7f85967c97a0e3414cdfd2597f5e56da9fb0d8c Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 6 Dec 2023 15:01:42 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E7=9A=84=E8=AE=BF=E9=97=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_quality/security/ir.model.access.csv | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sf_quality/security/ir.model.access.csv b/sf_quality/security/ir.model.access.csv index a230873a..f6326d5b 100644 --- a/sf_quality/security/ir.model.access.csv +++ b/sf_quality/security/ir.model.access.csv @@ -16,6 +16,8 @@ access_quality_check_group_sf_equipment_user,quality_check_group_sf_equipment_us access_quality_check_group_sf_tool_user,quality_check_group_sf_tool_user,quality.model_quality_check,sf_base.group_sf_tool_user,1,0,0,0 access_quality_check_group_sf_order_user,quality_check_group_sf_order_user,quality.model_quality_check,sf_base.group_sf_order_user,1,0,0,0 access_quality_check_group_sf_mrp_manager,quality_check_group_sf_mrp_manager,quality.model_quality_check,sf_base.group_sf_mrp_manager,1,0,0,0 +access_quality_check_group_equipment_user,quality_check_group_equipment_user,quality.model_quality_check,sf_maintenance.sf_group_equipment_user,1,0,0,0 +access_quality_check_group_equipment_manager,quality_check_group_equipment_manager,quality.model_quality_check,sf_maintenance.sf_group_equipment_manager,1,0,0,0 access_quality_alert_group_quality,quality_alert_group_quality,quality.model_quality_alert,sf_base.group_quality,1,0,0,0 access_quality_alert_group_quality_director,quality_alert_group_quality_director,quality.model_quality_alert,sf_base.group_quality_director,1,1,1,0 @@ -25,8 +27,8 @@ access_quality_alert_group_sf_equipment_user,quality_alert_group_sf_equipment_us access_quality_alert_group_sf_tool_user,quality_alert_group_sf_tool_user,quality.model_quality_alert,sf_base.group_sf_tool_user,1,0,0,0 access_quality_alert_group_sf_order_user,quality_alert_group_sf_order_user,quality.model_quality_alert,sf_base.group_sf_order_user,1,0,0,0 access_quality_alert_group_sf_mrp_manager,quality_alert_group_sf_mrp_manager,quality.model_quality_alert,sf_base.group_sf_mrp_manager,1,0,0,0 -access_quality_alert_group_sf_order_user,quality_alert_group_sf_order_user,quality.model_quality_alert,sf_base.group_sf_order_user,1,0,0,0 -access_quality_alert_group_sf_mrp_manager,quality_alert_group_sf_mrp_manager,quality.model_quality_alert,sf_base.group_sf_mrp_manager,1,0,0,0 +access_quality_alert_group_equipment_user,quality_alert_group_equipment_user,quality.model_quality_alert,sf_maintenance.sf_group_equipment_user,1,0,0,0 +access_quality_alert_group_equipment_manager,quality_alert_group_equipment_manager,quality.model_quality_alert,sf_maintenance.sf_group_equipment_manager,1,0,0,0 access_quality_alert_team_group_quality,quality_alert_team_group_quality,quality.model_quality_alert_team,sf_base.group_quality,1,0,0,0 access_quality_alert_team_group_quality_director,quality_alert_team_group_quality_director,quality.model_quality_alert_team,sf_base.group_quality_director,1,1,1,0 @@ -38,3 +40,4 @@ access_quality_alert_team_group_sf_order_user,quality_alert_team_group_sf_order_ access_quality_alert_team_group_sf_mrp_manager,quality_alert_team_group_sf_mrp_manager,quality.model_quality_alert_team,sf_base.group_sf_mrp_manager,1,0,0,0 + From 1767ada489d8ff6fc35180bfda6623ac81424de4 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 6 Dec 2023 15:03:07 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E9=87=8A=E6=94=BE=E6=B3=A8=E9=87=8A?= =?UTF-8?q?=E7=9A=84=E4=BB=A3=E7=A0=81?= 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/quick_easy_order.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index d28699c3..bed75e6d 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/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 7419cc9a..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 From 6a2a465569eafc37a3d5a9174391c402364fd94e Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 6 Dec 2023 15:07:06 +0800 Subject: [PATCH 7/8] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E6=8E=89=E8=87=AA?= =?UTF-8?q?=E5=8A=A8=E6=8A=A5=E4=BB=B7=E7=9A=84=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_sale/models/__init__.py | 2 +- sf_sale/models/auto_quatotion_common.py | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/sf_sale/models/__init__.py b/sf_sale/models/__init__.py index d8b09a48..7009b4ba 100644 --- a/sf_sale/models/__init__.py +++ b/sf_sale/models/__init__.py @@ -1,3 +1,3 @@ from . import sale_order from . import quick_easy_order -from . import auto_quatotion_common +#from . import auto_quatotion_common diff --git a/sf_sale/models/auto_quatotion_common.py b/sf_sale/models/auto_quatotion_common.py index d1bdb65a..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__) @@ -24,14 +24,14 @@ class AutoQuatotion(models.Model): def get_process_time_db_path(self): return get_resource_path('sf_sale', 'models', 'process_time.db') - # def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code): - # ''' - # 通过打包好的.so库， - # 以调用autoQuatotion库中Quatotion类， - # 初始化后调用类的analyseShape方法对模型文件进行价格预测 - # ''' - # # 初始化自动报价类(输入特征数据库和加工时间数据库) - # reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path) - # # 获取价格、加工时间、尺寸、XYZ、翻面次数 - # feature_info = reader.analyseShape(stp_url, InfoJson={}) - # return feature_info + def get_auto_quatotion(self, stp_url, feature_full_path, process_time_db_path, model_code): + ''' + 通过打包好的.so库， + 以调用autoQuatotion库中Quatotion类， + 初始化后调用类的analyseShape方法对模型文件进行价格预测 + ''' + # 初始化自动报价类(输入特征数据库和加工时间数据库) + reader = auto_quatotion.Quatotion(feature_full_path, process_time_db_path) + # 获取价格、加工时间、尺寸、XYZ、翻面次数 + feature_info = reader.analyseShape(stp_url, InfoJson={}) + return feature_info From 640bf79dc82ed77a977985fbda12cc6b58e2967a Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Thu, 7 Dec 2023 10:50:36 +0800 Subject: [PATCH 8/8] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=B4=A8=E9=87=8F?= =?UTF-8?q?=E5=9B=A2=E9=98=9F=E5=92=8C=E6=8E=A7=E5=88=B6=E7=82=B9=E7=9A=84?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- quality/views/quality_views.xml | 29 ++++++++++++-------- quality_control/views/quality_views.xml | 1 + sf_manufacturing/models/product_template.py | 4 +-- sf_quality/__manifest__.py | 2 +- sf_quality/models/custom_quality.py | 13 +++++++++ sf_quality/views/view.xml | 30 +++++++++++++++------ sf_sale/models/auto_quatotion_common.py | 24 ++++++++--------- sf_sale/models/quick_easy_order.py | 4 +-- 8 files changed, 71 insertions(+), 36 deletions(-) diff --git a/quality/views/quality_views.xml b/quality/views/quality_views.xml index 5ab90921..c64c25d8 100644 --- a/quality/views/quality_views.xml +++ b/quality/views/quality_views.xml @@ -7,10 +7,15 @@ quality.point
+
+
- -

+ +

+ +

@@ -33,13 +38,14 @@ - +
- - + +
@@ -85,17 +91,18 @@ + domain="[('my_activity_date_deadline', '<', context_today().strftime('%Y-%m-%d'))]" + help="Show all records which has next action date is before today"/> + domain="[('my_activity_date_deadline', '=', context_today().strftime('%Y-%m-%d'))]"/> + domain="[('my_activity_date_deadline', '>', context_today().strftime('%Y-%m-%d'))]"/> - + @@ -122,4 +129,4 @@ - + diff --git a/quality_control/views/quality_views.xml b/quality_control/views/quality_views.xml index 6317a85d..4aa2c1b5 100644 --- a/quality_control/views/quality_views.xml +++ b/quality_control/views/quality_views.xml @@ -602,6 +602,7 @@ quality.alert.team
+