From d63081dffa95a5bf90ff7e0abeeaf0dbcfdd4c26 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Wed, 25 Sep 2024 17:45:15 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E4=BC=98=E5=8C=96=E9=94=80=E5=94=AE?= =?UTF-8?q?=E8=AE=A2=E5=8D=95+=E5=B7=A5=E5=8D=95=E9=80=BE=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 4 +- sf_message/__manifest__.py | 5 +- sf_message/data/bussiness_node.xml | 51 +++++++ sf_message/data/cron_data.xml | 160 ++++++++++++++++++++ sf_message/models/sf_message_sale.py | 11 ++ sf_message/models/sf_message_workorder.py | 3 + sf_sale/models/quick_easy_order.py | 4 +- sf_sale/models/quick_easy_order_old.py | 4 +- sf_tool_management/__manifest__.py | 2 +- 9 files changed, 235 insertions(+), 9 deletions(-) create mode 100644 sf_message/data/cron_data.xml diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index b18ab04c..9dc77bde 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError 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_message/__manifest__.py b/sf_message/__manifest__.py index 0f032a6d..d69c06c1 100644 --- a/sf_message/__manifest__.py +++ b/sf_message/__manifest__.py @@ -11,9 +11,10 @@ """, 'category': 'sf', 'website': 'https://www.sf.jikimo.com', - 'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock'], + 'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock'], 'data': [ - 'data/bussiness_node.xml' + 'data/bussiness_node.xml', + 'data/cron_data.xml', ], 'test': [ ], diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml index 7d66e8d2..fbad5581 100644 --- a/sf_message/data/bussiness_node.xml +++ b/sf_message/data/bussiness_node.xml @@ -1,6 +1,7 @@ + 待接单 sale.order @@ -10,6 +11,17 @@ 确认接单 sale.order + + + 销售订单逾期预警 + sale.order + + + + 销售订单已逾期 + sale.order + + 调拨入库 stock.picking @@ -30,9 +42,48 @@ 坯料发料提醒 stock.picking + + 工单已下发通知 mrp.workorder + + 装夹预调工单逾期预警 + mrp.workorder + + + 装夹预调工单已逾期 + mrp.workorder + + + + CNC工单逾期预警 + mrp.workorder + + + CNC工单已逾期 + mrp.workorder + + + + 解除装夹工单逾期预警 + mrp.workorder + + + + 解除装夹工单已逾期 + mrp.workorder + + + + 表面工艺工单逾期预警 + mrp.workorder + + + + 表面工艺工单已逾期 + mrp.workorder + \ No newline at end of file diff --git a/sf_message/data/cron_data.xml b/sf_message/data/cron_data.xml new file mode 100644 index 00000000..f69dce7b --- /dev/null +++ b/sf_message/data/cron_data.xml @@ -0,0 +1,160 @@ + + + + 销售订单逾期预警 + + code + model._overdue_warning_func() + 1 + minutes + -1 + + + + + + + 销售订单已逾期 + + code + model._overdue_func() + 1 + minutes + -1 + + + + + + + 装夹预调工单逾期预警 + + code + model._overdue_warning_func() + 1 + minutes + -1 + + + + + + + 工单已逾期 + + code + model._overdue_func() + 1 + minutes + -1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py index ef94b7fe..85a7fd3e 100644 --- a/sf_message/models/sf_message_sale.py +++ b/sf_message/models/sf_message_sale.py @@ -1,4 +1,5 @@ # -*- coding: utf-8 -*- +import logging from odoo import models, fields, api, _ @@ -10,6 +11,7 @@ class SFMessageSale(models.Model): res = super(SFMessageSale, self).create(vals_list) if res: try: + logging.info('add_queue res:%s' % res) res.add_queue('待接单') except Exception as e: logging.info('add_queue error:%s' % e) @@ -45,3 +47,12 @@ class SFMessageSale(models.Model): if new_res: res = new_res return res + + # 销售订单逾期预警 + def _overdue_warning_func(self): + sale_order_ + return 1 + + # 销售订单已逾期 + def _overdue_func(self): + return 1 diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 2462b3f1..d1a4f06f 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -31,3 +31,6 @@ class SFMessageWork(models.Model): product_id.append(mrp_workorder_line.product_id.id) contents.append(content) return contents + + + diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index 081807a4..cb1886a1 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -8,8 +8,8 @@ from datetime import datetime import requests from odoo import http from odoo.http import request -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_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py index 4756a2c5..9bd61132 100644 --- a/sf_sale/models/quick_easy_order_old.py +++ b/sf_sale/models/quick_easy_order_old.py @@ -6,8 +6,8 @@ import os from datetime import datetime from stl import mesh # from OCC.Core.GProp import GProp_GProps -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.addons.sf_base.commons.common import Common from odoo import models, fields, api from odoo.modules import get_resource_path diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index 97c26e40..6c3a1e01 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -25,7 +25,7 @@ 'views/stock.xml', 'data/tool_data.xml', 'wizard/jikimo_bom_wizard.xml', - 'views/tool_inventory.xml', + # 'views/tool_inventory.xml', 'views/jikimo_bom.xml', 'views/tool_views.xml', From 198296f0f81c517b0650938d452fbd480fccd54e Mon Sep 17 00:00:00 2001 From: liaodanlong Date: Fri, 27 Sep 2024 18:04:39 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E4=BB=B7=E6=A0=BC=E8=AE=A1=E7=AE=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_mrs_connect/models/order_price.py | 1 + 1 file changed, 1 insertion(+) diff --git a/sf_mrs_connect/models/order_price.py b/sf_mrs_connect/models/order_price.py index 1e373f4d..ec3ff2d5 100644 --- a/sf_mrs_connect/models/order_price.py +++ b/sf_mrs_connect/models/order_price.py @@ -18,6 +18,7 @@ class OrderPrice(models.Model): return True except ValueError: return False + @api.depends('sale_order_id.order_line.remark') def _compute_bfm_amount_total(self): for record in self: amount_total = 0 From 47feb4cf3c0e6eeaf96bfe99e7fc58662f8a5e92 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sun, 29 Sep 2024 15:24:28 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=A8=A1=E7=89=88?= =?UTF-8?q?=E5=88=9D=E5=A7=8B=E5=8C=96=E6=B7=BB=E5=8A=A0=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E6=A8=A1=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/product_template.py | 4 +- sf_message/__manifest__.py | 2 +- sf_message/data/template_data.xml | 26 +++++++++++ sf_message/models/sf_message_sale.py | 52 +++++++++++---------- sf_sale/models/quick_easy_order.py | 4 +- sf_sale/models/quick_easy_order_old.py | 4 +- 6 files changed, 61 insertions(+), 31 deletions(-) diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py index b9f4a4c8..7f4dc2b8 100644 --- a/sf_manufacturing/models/product_template.py +++ b/sf_manufacturing/models/product_template.py @@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError 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_message/__manifest__.py b/sf_message/__manifest__.py index 421abe40..e767ec2d 100644 --- a/sf_message/__manifest__.py +++ b/sf_message/__manifest__.py @@ -14,7 +14,7 @@ 'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock'], 'data': [ 'data/bussiness_node.xml', - 'data/cron_data.xml', + # 'data/cron_data.xml', 'data/template_data.xml', ], diff --git a/sf_message/data/template_data.xml b/sf_message/data/template_data.xml index 868b3f52..3033e687 100644 --- a/sf_message/data/template_data.xml +++ b/sf_message/data/template_data.xml @@ -1,6 +1,32 @@ + + + 待接单 + + sale.order + + markdown + normal + ### 待接单提醒： +单号：销售订单[{{name}}]({{url}}) +事项：请确认是否接单。 + + + + + 确认接单 + + sale.order + + markdown + normal + ### 待排程提醒： +单号：产品[{{product_id}}]({{url}}) +事项：{{mrp_production_count}}个制造订单待计划排程 + + 坯料采购提醒 diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py index ca9ce570..18964a8c 100644 --- a/sf_message/models/sf_message_sale.py +++ b/sf_message/models/sf_message_sale.py @@ -41,30 +41,34 @@ class SFMessageSale(models.Model): # 继承并重写jikimo.message.dispatch的_get_message() def _get_message(self, message_queue_ids): - res = super(SFMessageSale, self)._get_message(message_queue_ids) - new_res = [] - processed_messages = set() # 用于跟踪已经处理过的消息 + contents = [] + url = self.env['ir.config_parameter'].get_param('web.base.url') for item in message_queue_ids: - if item.message_template_id.bussiness_node_id.name == '确认接单': + # 待接单的处理 + if item.message_template_id.bussiness_node_id.name == '待接单': + content = super(SFMessageSale, self)._get_message(item) + action_id = self.env.ref('sale.action_quotations_with_onboarding').id + url = f"{url}/web#id={item.res_id}view_type=form&action={action_id}" + content = content[0].replace('{{url}}', url) + contents.append(content) + # 确认接单的处理 + elif item.message_template_id.bussiness_node_id.name == '确认接单': + content = super(SFMessageSale, self)._get_message(item) sale_order_line = self.env['sale.order.line'].search([('order_id', '=', int(item.res_id))]) - if len(sale_order_line) == 1: - product = sale_order_line[0].product_id.name - elif len(sale_order_line) > 1: - product = '%s...' % sale_order_line[0].product_id.name - for message in res: - message_text = message.replace('{{product_id}}', product) - if message_text not in processed_messages: - new_res.append(message_text) - processed_messages.add(message_text) - if new_res: - res = new_res - return res + product = sale_order_line[0].product_id.name if len(sale_order_line) == 1 else '%s...' % \ + sale_order_line[ + 0].product_id.name + action_id = self.env.ref('sf_plan.sf_production_plan_action1').id + url = f"{url}/web#view_type=list&action={action_id}" + content = content[0].replace('{{product_id}}', product).replace('{{url}}', url) + contents.append(content) + return contents - # 销售订单逾期预警 - def _overdue_warning_func(self): - sale_order_ - return 1 - - # 销售订单已逾期 - def _overdue_func(self): - return 1 + # # 销售订单逾期预警 + # def _overdue_warning_func(self): + # sale_order_ + # return 1 + # + # # 销售订单已逾期 + # def _overdue_func(self): + # return 1 diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py index cb1886a1..081807a4 100644 --- a/sf_sale/models/quick_easy_order.py +++ b/sf_sale/models/quick_easy_order.py @@ -8,8 +8,8 @@ from datetime import datetime import requests from odoo import http from odoo.http import request -# 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_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py index 9bd61132..4756a2c5 100644 --- a/sf_sale/models/quick_easy_order_old.py +++ b/sf_sale/models/quick_easy_order_old.py @@ -6,8 +6,8 @@ import os from datetime import datetime from stl import mesh # from OCC.Core.GProp import GProp_GProps -# 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.addons.sf_base.commons.common import Common from odoo import models, fields, api from odoo.modules import get_resource_path From ff4bdd2f2d69ffcf16c92dd5189a958d0df1b9e0 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sun, 29 Sep 2024 15:27:27 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E8=BF=98=E5=8E=9F=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_sale.py | 1 - sf_tool_management/__manifest__.py | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py index 18964a8c..e8fef9ed 100644 --- a/sf_message/models/sf_message_sale.py +++ b/sf_message/models/sf_message_sale.py @@ -11,7 +11,6 @@ class SFMessageSale(models.Model): res = super(SFMessageSale, self).create(vals_list) if res: try: - logging.info('add_queue res:%s' % res) res.add_queue('待接单') except Exception as e: logging.info('add_queue error:%s' % e) diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py index 6c3a1e01..97c26e40 100644 --- a/sf_tool_management/__manifest__.py +++ b/sf_tool_management/__manifest__.py @@ -25,7 +25,7 @@ 'views/stock.xml', 'data/tool_data.xml', 'wizard/jikimo_bom_wizard.xml', - # 'views/tool_inventory.xml', + 'views/tool_inventory.xml', 'views/jikimo_bom.xml', 'views/tool_views.xml', From 34e2a49bef88a3b260288e79d9d43179b557b193 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sun, 29 Sep 2024 15:30:18 +0800 Subject: [PATCH 05/10] =?UTF-8?q?=E6=B3=A8=E9=87=8A=E9=83=A8=E5=88=86?= =?UTF-8?q?=E4=B8=8D=E4=B8=8A=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_message/data/bussiness_node.xml | 80 +++++++++++++++--------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml index fbad5581..f4a6ddf4 100644 --- a/sf_message/data/bussiness_node.xml +++ b/sf_message/data/bussiness_node.xml @@ -12,15 +12,15 @@ sale.order - - 销售订单逾期预警 - sale.order - + + + + - - 销售订单已逾期 - sale.order - + + + + 调拨入库 @@ -48,42 +48,42 @@ 工单已下发通知 mrp.workorder - - 装夹预调工单逾期预警 - mrp.workorder - - - 装夹预调工单已逾期 - mrp.workorder - + + + + + + + + - - CNC工单逾期预警 - mrp.workorder - - - CNC工单已逾期 - mrp.workorder - + + + + + + + + - - 解除装夹工单逾期预警 - mrp.workorder - + + + + - - 解除装夹工单已逾期 - mrp.workorder - + + + + - - 表面工艺工单逾期预警 - mrp.workorder - + + + + - - 表面工艺工单已逾期 - mrp.workorder - + + + + \ No newline at end of file From c1dc28488a1468564fceeb6176a8bfdfb059c199 Mon Sep 17 00:00:00 2001 From: "jinling.yang" Date: Sun, 29 Sep 2024 16:42:32 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BE=85=E6=8E=A5?= =?UTF-8?q?=E5=8D=95=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_sale.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py index e8fef9ed..8a434541 100644 --- a/sf_message/models/sf_message_sale.py +++ b/sf_message/models/sf_message_sale.py @@ -47,7 +47,7 @@ class SFMessageSale(models.Model): if item.message_template_id.bussiness_node_id.name == '待接单': content = super(SFMessageSale, self)._get_message(item) action_id = self.env.ref('sale.action_quotations_with_onboarding').id - url = f"{url}/web#id={item.res_id}view_type=form&action={action_id}" + url = f"{url}/web#id={item.res_id}&view_type=form&action={action_id}" content = content[0].replace('{{url}}', url) contents.append(content) # 确认接单的处理 From 05f9528ca91d658078b7845e744bdcb7845b5b8b Mon Sep 17 00:00:00 2001 From: hujiaying Date: Sun, 29 Sep 2024 16:44:48 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=8E=92=E7=A8=8B=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_manufacturing/models/mrp_workcenter.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sf_manufacturing/models/mrp_workcenter.py b/sf_manufacturing/models/mrp_workcenter.py index 81a252fb..34185d4e 100644 --- a/sf_manufacturing/models/mrp_workcenter.py +++ b/sf_manufacturing/models/mrp_workcenter.py @@ -1,4 +1,5 @@ import datetime +import logging from datetime import timedelta, time from collections import defaultdict from odoo import fields, models, api @@ -6,6 +7,8 @@ from odoo.addons.resource.models.resource import Intervals from odoo.exceptions import UserError, ValidationError import math +_logger = logging.getLogger(__name__) + class ResWorkcenter(models.Model): _name = "mrp.workcenter" @@ -225,7 +228,11 @@ class ResWorkcenter(models.Model): if plan_ids: sum_qty = sum([p.product_qty for p in plan_ids]) date_planned_working_hours = self._compute_effective_working_hours_day1(date_planned) - if sum_qty >= date_planned_working_hours: + default_capacity = round( + self.production_line_hour_capacity * date_planned_working_hours, 2) + _logger.info('排程日期:%s,计划数量:%s,日产能:%s,日工时:%s' % ( + date_planned, sum_qty, default_capacity, date_planned_working_hours)) + if sum_qty >= default_capacity: return False return True From 11100c9260917db105a9afaa69dfd396129577e4 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Sun, 29 Sep 2024 16:47:35 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_purchase.py | 5 ++--- sf_message/models/sf_message_stock_picking.py | 5 ++--- sf_message/models/sf_message_workorder.py | 5 ++--- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py index 96d0f8dc..b456cc87 100644 --- a/sf_message/models/sf_message_purchase.py +++ b/sf_message/models/sf_message_purchase.py @@ -19,9 +19,8 @@ class SFMessagePurchase(models.Model): return contents def request_url(self, id): - we_config_info = self.env['we.config'].sudo().search([], limit=1) - redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain - full_url = 'https://%s/' % redirect_domain + url = self.env['ir.config_parameter'].get_param('web.base.url') + full_url = 'https://%s/' % url action_id = self.env.ref('purchase.purchase_form_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_website_payment')]).id # 查询参数 diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index fdb9d4cf..68095b68 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -52,9 +52,8 @@ class SFMessageStockPicking(models.Model): return res def request_url(self): - we_config_info = self.env['we.config'].sudo().search([], limit=1) - redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain - full_url = 'https://%s/' % redirect_domain + url = self.env['ir.config_parameter'].get_param('web.base.url') + full_url = 'https://%s/' % url action_id = self.env.ref('stock.stock_picking_type_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).id # 查询参数 diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 9d18e656..1a3bc253 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -62,9 +62,8 @@ class SFMessageWork(models.Model): return res def request_url(self): - we_config_info = self.env['we.config'].sudo().search([], limit=1) - redirect_domain = self.env['we.app'].sudo().search([('id', '=', we_config_info.odoo_app_id.id)]).redirect_domain - full_url = 'https://%s/' % redirect_domain + url = self.env['ir.config_parameter'].get_param('web.base.url') + full_url = 'https://%s/' % url action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id # 查询参数 From 97d33adabd49a9a7fce96e0f459fb7fc3c9edd9a Mon Sep 17 00:00:00 2001 From: guanhuan Date: Sun, 29 Sep 2024 17:03:49 +0800 Subject: [PATCH 09/10] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_purchase.py | 3 +-- sf_message/models/sf_message_stock_picking.py | 3 +-- sf_message/models/sf_message_workorder.py | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py index b456cc87..15ad08d9 100644 --- a/sf_message/models/sf_message_purchase.py +++ b/sf_message/models/sf_message_purchase.py @@ -20,7 +20,6 @@ class SFMessagePurchase(models.Model): def request_url(self, id): url = self.env['ir.config_parameter'].get_param('web.base.url') - full_url = 'https://%s/' % url action_id = self.env.ref('purchase.purchase_form_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_website_payment')]).id # 查询参数 @@ -30,5 +29,5 @@ class SFMessagePurchase(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = full_url + "web#" + query_string + full_url = url + "web#" + query_string return full_url diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index 68095b68..d63d8059 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -53,7 +53,6 @@ class SFMessageStockPicking(models.Model): def request_url(self): url = self.env['ir.config_parameter'].get_param('web.base.url') - full_url = 'https://%s/' % url action_id = self.env.ref('stock.stock_picking_type_action').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_theme_treehouse')]).id # 查询参数 @@ -62,5 +61,5 @@ class SFMessageStockPicking(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = full_url + "web#" + query_string + full_url = url + "web#" + query_string return full_url diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 1a3bc253..6758103a 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -63,7 +63,6 @@ class SFMessageWork(models.Model): def request_url(self): url = self.env['ir.config_parameter'].get_param('web.base.url') - full_url = 'https://%s/' % url action_id = self.env.ref('sf_manufacturing.mrp_workorder_action_tablet').id menu_id = self.env['ir.model.data'].search([('name', '=', 'module_stock_dropshipping')]).id # 查询参数 @@ -72,5 +71,5 @@ class SFMessageWork(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = full_url + "web#" + query_string + full_url = url + "web#" + query_string return full_url From d2ec420f5702259e3f74b8cb1bf83c4ed2b87a50 Mon Sep 17 00:00:00 2001 From: guanhuan Date: Sun, 29 Sep 2024 17:05:42 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E5=9F=9F=E5=90=8D=E8=8E=B7=E5=8F=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sf_message/models/sf_message_purchase.py | 2 +- sf_message/models/sf_message_stock_picking.py | 2 +- sf_message/models/sf_message_workorder.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sf_message/models/sf_message_purchase.py b/sf_message/models/sf_message_purchase.py index 15ad08d9..e3fe269f 100644 --- a/sf_message/models/sf_message_purchase.py +++ b/sf_message/models/sf_message_purchase.py @@ -29,5 +29,5 @@ class SFMessagePurchase(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = url + "web#" + query_string + full_url = url + "/web#" + query_string return full_url diff --git a/sf_message/models/sf_message_stock_picking.py b/sf_message/models/sf_message_stock_picking.py index d63d8059..0ff32f77 100644 --- a/sf_message/models/sf_message_stock_picking.py +++ b/sf_message/models/sf_message_stock_picking.py @@ -61,5 +61,5 @@ class SFMessageStockPicking(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = url + "web#" + query_string + full_url = url + "/web#" + query_string return full_url diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py index 6758103a..2e004b69 100644 --- a/sf_message/models/sf_message_workorder.py +++ b/sf_message/models/sf_message_workorder.py @@ -71,5 +71,5 @@ class SFMessageWork(models.Model): # 拼接查询参数 query_string = urlencode(params) # 拼接URL - full_url = url + "web#" + query_string + full_url = url + "/web#" + query_string return full_url