jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accept Merge Request #2005: (feature/6684 -> develop)

Browse Source 
Merge Request: 修改sf定时任务不在部署时更新配置

Created By: @胡尧
Accepted By: @胡尧
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/2005?initial=true
This commit is contained in:
胡尧
2025-04-16 09:29:59 +08:00
committed by Coding
parent 06e9d5a538 026697f363
commit f87a6690fe
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
jikimo_workorder_exception_notify/models/jikimo_workorder_exception.py
View File

@@ -52,10 +52,10 @@ class JikimoWorkorderException(models.Model):
def _get_message(self, message_queue_ids):
contents, _ = super(JikimoWorkorderException, self)._get_message(message_queue_ids)
url = self.env['ir.config_parameter'].get_param('web.base.url')
base_url = self.env['ir.config_parameter'].get_param('web.base.url')
action_id = self.env.ref('mrp.mrp_production_action').id
for index, content in enumerate(contents):
exception_id = self.env['jikimo.workorder.exception'].browse(message_queue_ids[index].res_id)
url = url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
url = base_url + '/web#id=%s&view_type=form&action=%s' % (exception_id.workorder_id.production_id.id, action_id)
contents[index] = content.replace('{{url}}', url)
return contents, message_queue_ids

23
sf_mrs_connect/data/ir_cron_data.xml
View File

@@ -1,16 +1,16 @@
<?xml version="1.0" encoding='UTF-8'?>
<odoo>
<record model="ir.cron" id="ir_cron_sf_static_resource_datasync">
<field name="name">制造-配置：每日定时同步cloud的静态资源库</field>
<field name="model_id" ref="model_res_config_settings"/>
<field name="state">code</field>
<field name="code">model.sf_all_sync()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<data noupdate="1">
<record model="ir.cron" id="ir_cron_sf_static_resource_datasync">
<field name="name">制造-配置：每日定时同步cloud的静态资源库</field>
<field name="model_id" ref="model_res_config_settings"/>
<field name="state">code</field>
<field name="code">model.sf_all_sync()</field>
<field name="interval_number">1</field>
<field name="interval_type">days</field>
<field name="numbercall">-1</field>
<field name="doall" eval="False"/>
</record>
<!-- <record model="ir.cron" id="sf_cron1">-->
<!-- <field name="name">同步静态资源库材料</field>-->
<!-- <field name="model_id" ref="model_sf_production_materials"/>-->
@@ -220,4 +220,5 @@
<!-- <field name="numbercall">-1</field>-->
<!-- <field name="doall" eval="False"/>-->
<!-- </record>-->
</data>
</odoo>