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

Accept Merge Request #996: (feature/制造代码优化 -> develop)

Browse Source 
Merge Request: 处理工单可能为记录集的问题，增加邮件发送公用类

Created By: @马广威
Accepted By: @马广威
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/996?initial=true
This commit is contained in:
马广威
2024-05-09 09:28:18 +08:00
committed by Coding
parent 95a77574ae 8c279828be
commit 72d59c11db
3 changed files with 78 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
sf_base/commons/Email.py Normal file
View File

@@ -0,0 +1,27 @@
from odoo import api, models
class MailSender(models.Model):
_name = 'mail.sender'
_description = 'Mail Sender'
def mail_sender(self, mail_server_name, subject_name, email_to, error_message):
mail_server = self.env['ir.mail_server'].sudo().search([('name', '=', mail_server_name)], limit=1)
if not mail_server:
_logger.info('管理员还未配置名称为 %s 的smtp服务器信息，请联系管理员配置！' % mail_server_name)
return
if not mail_server.smtp_user or not mail_server.smtp_pass:
_logger.info("邮件发送账号未正确设置，请联系管理员！")
return
mail_values = {
'message_type': 'email', 'subject': subject_name,
'mail_server_id': mail_server.id, 'email_from': mail_server.smtp_user,
'email_to': email_to
}
temp_mail_html = """
Hi, <p> 这里是异常提醒通知： </p>
"""
temp_mail_html += """ %s """ % error_message
mail_values['body_html'] = temp_mail_html
self.env['mail.mail'].sudo().create(mail_values).send(auto_commit=True)

1
sf_base/commons/__init__.py
View File

@@ -1,2 +1,3 @@
from . import common from . import common
from . import Printer from . import Printer
from . import Email

98
sf_manufacturing/models/mrp_workorder.py
View File

@@ -817,54 +817,56 @@ class ResMrpWorkOrder(models.Model):
raise UserError(_('请先完成上一步工单')) raise UserError(_('请先完成上一步工单'))
def button_finish(self): def button_finish(self):
if self.routing_type == '装夹预调': for record in self:
if not self.material_center_point and self.X_deviation_angle > 0: if record.routing_type == '装夹预调':
raise UserError("请对前置三元检测定位参数进行计算定位") if not record.material_center_point and record.X_deviation_angle > 0:
if not self.rfid_code: raise UserError("请对前置三元检测定位参数进行计算定位")
raise UserError("请扫RFID码进行绑定") if not record.rfid_code:
if self.routing_type == '解除装夹': raise UserError("请扫RFID码进行绑定")
''' record.workpiece_delivery_ids[0].write({'status': '待下发'})
记录结束时间
''' if record.routing_type == '解除装夹':
self.date_finished = datetime.now() '''
if self.picking_out_id: 记录结束时间
picking_out = self.env['stock.picking'].search([('id', '=', self.picking_out_id.id)]) '''
if picking_out.workorder_out_id: record.date_finished = datetime.now()
order_line_ids = []
for item in picking_out.workorder_out_id: if record.picking_out_id:
server_product = self.env['product.template'].search( picking_out = record.env['stock.picking'].search([('id', '=', record.picking_out_id.id)])
[('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id), if picking_out.workorder_out_id:
('detailed_type', '=', 'service')]) order_line_ids = []
if server_product: for item in picking_out.workorder_out_id:
order_line_ids.append((0, 0, { server_product = record.env['product.template'].search(
'product_id': server_product.product_variant_id.id, [('server_product_process_parameters_id', '=', item.surface_technics_parameters_id.id),
'product_qty': 1, ('detailed_type', '=', 'service')])
'product_uom': server_product.uom_id.id if server_product:
})) order_line_ids.append((0, 0, {
else: 'product_id': server_product.product_variant_id.id,
raise UserError( 'product_qty': 1,
'请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name) 'product_uom': server_product.uom_id.id
self.env['purchase.order'].create({ }))
'partner_id': server_product.seller_ids.partner_id.id, else:
'state': 'draft', raise UserError(
'order_line': order_line_ids, '请先在产品中配置表面工艺为%s相关的外协服务产品' % item.surface_technics_parameters_id.name)
}) record.env['purchase.order'].create({
super().button_finish() 'partner_id': server_product.seller_ids.partner_id.id,
is_production_id = True 'state': 'draft',
for workorder in self.production_id.workorder_ids: 'order_line': order_line_ids,
if workorder.state != 'done': })
is_production_id = False super().button_finish()
if is_production_id == True and self.name == '解除装夹': is_production_id = True
for workorder in self.production_id.workorder_ids: for workorder in record.production_id.workorder_ids:
workorder.rfid_code_old = workorder.rfid_code if workorder.state != 'done':
workorder.rfid_code = None is_production_id = False
for move_raw_id in self.production_id.move_raw_ids: if is_production_id == True and record.name == '解除装夹':
move_raw_id.quantity_done = move_raw_id.product_uom_qty for workorder in record.production_id.workorder_ids:
self.process_state = '已完工' workorder.rfid_code_old = workorder.rfid_code
self.production_id.button_mark_done1() workorder.rfid_code = None
# self.production_id.state = 'done' for move_raw_id in record.production_id.move_raw_ids:
# if self.routing_type == '装夹预调': move_raw_id.quantity_done = move_raw_id.product_uom_qty
# self.workpiece_delivery_ids.write({''}) record.process_state = '已完工'
record.production_id.button_mark_done1()
# self.production_id.state = 'done'
# 将FTP的检测报告文件下载到临时目录 # 将FTP的检测报告文件下载到临时目录
def download_reportfile_tmp(self, workorder, reportpath): def download_reportfile_tmp(self, workorder, reportpath):