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

1、处理销售订单确认供货路线报错-坯料获取方式是自加工 问题；2、质检完成的消息通知添加超链接；3、添加 库存作业单据没有质检单时-会发送待处理消息通知-不用发送判断条件

Browse Source
This commit is contained in:
yuxianghui
2025-02-25 15:05:30 +08:00
parent 247036209e
commit fb4f08a24a
3 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sf_manufacturing/models/mrp_production.py
View File

@@ -774,11 +774,11 @@ class MrpProduction(models.Model):
self.ensure_one() self.ensure_one()
iot_code = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env[ iot_code = self.env['stock.lot']._get_next_serial(self.company_id, self.product_id) or self.env[
'ir.sequence'].next_by_code('stock.lot.serial') 'ir.sequence'].next_by_code('stock.lot.serial')
iot_code_name = re.sub('[\u4e00-\u9fa5]', "", iot_code) # iot_code_name = re.sub('[\u4e00-\u9fa5]', "", iot_code)
self.lot_producing_id = self.env['stock.lot'].create({ self.lot_producing_id = self.env['stock.lot'].create({
'product_id': self.product_id.id, 'product_id': self.product_id.id,
'company_id': self.company_id.id, 'company_id': self.company_id.id,
'name': iot_code_name, 'name': iot_code,
}) })
if self.move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_line_ids: if self.move_finished_ids.filtered(lambda m: m.product_id == self.product_id).move_line_ids:
self.move_finished_ids.filtered( self.move_finished_ids.filtered(

2
sf_message/data/template_data.xml
View File

@@ -262,7 +262,7 @@
<field name="msgtype">markdown</field> <field name="msgtype">markdown</field>
<field name="urgency">normal</field> <field name="urgency">normal</field>
<field name="content">### {{picking_type_name}}待处理提醒： <field name="content">### {{picking_type_name}}待处理提醒：
单号：{{name}} 单号：[{{name}}]({{request_url}})
事项：质量检查已完成</field> 事项：质量检查已完成</field>
</record> </record>

9
sf_message/models/sf_message_stock_picking.py
View File

@@ -51,7 +51,8 @@ class SFMessageStockPicking(models.Model):
all_ready_or_done = all(picking.state in ['assigned', 'done'] for picking in stock_picking_list) all_ready_or_done = all(picking.state in ['assigned', 'done'] for picking in stock_picking_list)
if all_ready_or_done: if all_ready_or_done:
mrp_production.add_queue('工序外协发料通知') mrp_production.add_queue('工序外协发料通知')
if all(qc.quality_state in ['pass', 'fail'] for qc in record.quality_check_ids): if record.quality_check_ids and all(
qc.quality_state in ['pass', 'fail'] for qc in record.quality_check_ids):
record.add_queue('调拨单质检完成提醒') record.add_queue('调拨单质检完成提醒')
except Exception as e: except Exception as e:
logging.info('add_queue_compute_state error:%s' % e) logging.info('add_queue_compute_state error:%s' % e)
@@ -92,8 +93,12 @@ class SFMessageStockPicking(models.Model):
content = message_queue_id.message_template_id.content content = message_queue_id.message_template_id.content
stock_picking_line = self.env['stock.picking'].sudo().search( stock_picking_line = self.env['stock.picking'].sudo().search(
[('id', '=', int(message_queue_id.res_id))]) [('id', '=', int(message_queue_id.res_id))])
url = self.env['ir.config_parameter'].sudo().get_param('web.base.url')
action_id = self.env.ref('stock.action_picking_tree_ready').id
menu_id = self.env.ref('stock.menu_stock_root').id
url_with_id = f"{url}/web#view_type=form&action={action_id}&menu_id={menu_id}&id={stock_picking_line.id}"
content = content.replace('{{picking_type_name}}', stock_picking_line.picking_type_id.name).replace( content = content.replace('{{picking_type_name}}', stock_picking_line.picking_type_id.name).replace(
'{{name}}', stock_picking_line.name) '{{name}}', stock_picking_line.name).replace('{{request_url}}', url_with_id)
contents.append(content) contents.append(content)
return contents, message_queue_ids return contents, message_queue_ids