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

Accept Merge Request #1392: (feature/临时分支 -> develop)

Browse Source 
Merge Request: 修改消息发送前已入库或已发货消息发送内容为null

Created By: @胡嘉莹
Reviewed By: @胡尧
Approved By: @胡尧 
Accepted By: @胡嘉莹
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1392?initial=true
This commit is contained in:
胡嘉莹
2024-10-11 10:10:57 +08:00
committed by Coding
parent 0ed07b024a c3e40fd3aa
commit 797eb9b159
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_message/data/template_data.xml
View File

@@ -130,7 +130,7 @@
<field name="urgency">normal</field> <field name="urgency">normal</field>
<field name="content">### 订单发货提醒： <field name="content">### 订单发货提醒：
单号：发料出库单[{{name}}]({{request_url}}) 单号：发料出库单[{{name}}]({{request_url}})
事项：销售订单{{sale_order_name}}已全部产出并出库，请及时发货</field> 事项：销售订单{{sale_order_name}}已全部产出并入库，请及时发货</field>
</record> </record>
</data> </data>
</odoo> </odoo>

4
sf_message/models/sf_message_stock_picking.py
View File

@@ -33,12 +33,13 @@ class SFMessageStockPicking(models.Model):
record.add_queue('订单发货提醒') record.add_queue('订单发货提醒')
def deal_stock_picking_sfp(self, message_queue_id): # 处理订单发货提醒 def deal_stock_picking_sfp(self, message_queue_id): # 处理订单发货提醒
content = message_queue_id.message_template_id.content content = None
stock_picking = self.env['stock.picking'].search([('id', '=', int(message_queue_id.res_id))]) stock_picking = self.env['stock.picking'].search([('id', '=', int(message_queue_id.res_id))])
stock_picking_out = self.env['stock.picking'].search( stock_picking_out = self.env['stock.picking'].search(
[('origin', '=', stock_picking.origin), ('state', '=', 'assigned'), [('origin', '=', stock_picking.origin), ('state', '=', 'assigned'),
('picking_type_id.sequence_code', '=', 'OUT')]) ('picking_type_id.sequence_code', '=', 'OUT')])
if stock_picking_out and len(stock_picking_out) > 0: if stock_picking_out and len(stock_picking_out) > 0:
content = message_queue_id.message_template_id.content
url = self.request_url() url = self.request_url()
content = content.replace('{{name}}', stock_picking_out.name).replace( content = content.replace('{{name}}', stock_picking_out.name).replace(
'{{sale_order_name}}', stock_picking_out.origin).replace('{{request_url}}', url) '{{sale_order_name}}', stock_picking_out.origin).replace('{{request_url}}', url)
@@ -69,6 +70,7 @@ class SFMessageStockPicking(models.Model):
contents.append(content) contents.append(content)
elif message_queue_id.message_template_id.name == '订单发货提醒': elif message_queue_id.message_template_id.name == '订单发货提醒':
content = self.deal_stock_picking_sfp(message_queue_id) content = self.deal_stock_picking_sfp(message_queue_id)
if content:
contents.append(content) contents.append(content)
return contents return contents