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

修复CNC工单消息提醒跳转

Browse Source
This commit is contained in:
jinling.yang
2024-10-25 15:41:23 +08:00
parent a3bfbe66c4
commit 651c8f266b
1 changed files with 11 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
sf_message/models/sf_message_workorder.py
View File

@@ -61,10 +61,10 @@ class SFMessageWork(models.Model):
second=0, second=0,
microsecond=0 microsecond=0
) )
logging.info(current_time) # logging.info(current_time)
logging.info(target_time) # logging.info(target_time)
logging.info(target_time - time_range) # logging.info(target_time - time_range)
logging.info(target_time + time_range) # logging.info(target_time + time_range)
if target_time - time_range <= current_time_datetime <= target_time + time_range: if target_time - time_range <= current_time_datetime <= target_time + time_range:
search_condition = [ search_condition = [
('delivery_warning', '=', 'warning')] if bussiness_node in template_names['预警'] else [ ('delivery_warning', '=', 'warning')] if bussiness_node in template_names['预警'] else [
@@ -76,15 +76,13 @@ class SFMessageWork(models.Model):
business_node_key = bussiness_node.split('工单')[0].strip() business_node_key = bussiness_node.split('工单')[0].strip()
workcenter_mapping = { workcenter_mapping = {
'装夹预调': '工件装夹', '装夹预调': '工件装夹',
'CNC加工': '自动产线', 'CNC加工': '自动生产',
'解除装夹': '工件拆卸', '解除装夹': '工件拆卸',
'表面工艺': '表面工艺外协', '表面工艺': '表面工艺外协',
} }
workcenter_name = workcenter_mapping.get(business_node_key) workcenter_name = workcenter_mapping.get(business_node_key)
logging.info(workcenter_name)
active_id = self.env['mrp.workcenter'].search([('name', 'ilike', workcenter_name)], active_id = self.env['mrp.workcenter'].search([('name', 'ilike', workcenter_name)],
limit=1).id limit=1).id
logging.info(active_id)
i += 1 i += 1
if i >= 1: if i >= 1:
action_id = self.env.ref('sf_message.mrp_workorder_action_notify').id action_id = self.env.ref('sf_message.mrp_workorder_action_notify').id
@@ -132,15 +130,15 @@ class SFMessageWork(models.Model):
date_planned_finished = datetime.strptime(date_planned_finished_str, '%Y-%m-%d %H:%M:%S') date_planned_finished = datetime.strptime(date_planned_finished_str, '%Y-%m-%d %H:%M:%S')
twelve_hours_ago = current_time_datetime - timedelta(hours=12) twelve_hours_ago = current_time_datetime - timedelta(hours=12)
if current_time_datetime >= date_planned_finished and item.delivery_warning not in ['overdue']: if current_time_datetime >= date_planned_finished and item.delivery_warning not in ['overdue']:
logging.info("------overdue-------") # logging.info("------overdue-------")
logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, " # logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, "
f"Planned Finish: {date_planned_finished}") # f"Planned Finish: {date_planned_finished}")
item.delivery_warning = 'overdue' item.delivery_warning = 'overdue'
elif twelve_hours_ago <= current_time_datetime <= date_planned_finished and item.delivery_warning not in [ elif twelve_hours_ago <= current_time_datetime <= date_planned_finished and item.delivery_warning not in [
'warning']: 'warning']:
logging.info("------warning-------") # logging.info("------warning-------")
logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, " # logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, "
f"Planned Finish: {date_planned_finished}") # f"Planned Finish: {date_planned_finished}")
item.delivery_warning = 'warning' item.delivery_warning = 'warning'
business_node_ids = { business_node_ids = {
'装夹预调_overdue': self.env.ref('sf_message.bussiness_mrp_workorder_pre_overdue').id, '装夹预调_overdue': self.env.ref('sf_message.bussiness_mrp_workorder_pre_overdue').id,