diff --git a/sf_message/models/sf_message_maintenance_logs.py b/sf_message/models/sf_message_maintenance_logs.py
index b830d806..e5a53eef 100644
--- a/sf_message/models/sf_message_maintenance_logs.py
+++ b/sf_message/models/sf_message_maintenance_logs.py
@@ -8,7 +8,7 @@ class SFMessageMaintenanceLogs(models.Model):
def create(self, vals_list):
res = super(SFMessageMaintenanceLogs, self).create(vals_list)
for rec in res:
- rec.add_queue('设备故障')
+ rec.add_queue('豸')
return res
def _get_message(self, message_queue_ids):
diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index 13a5f796..7bdb95a7 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -103,39 +103,54 @@ class SFMessageSale(models.Model):
today = datetime.today().date()
deadline_check = today + timedelta(days=1)
logging.info(f"today: {today}, deadline_check: {deadline_check}")
- sale_order = self.sudo().search([('state', 'in', ['sale']), ('deadline_of_delivery', '!=', False)])
+ sale_order = self.sudo().search(
+ [('state', 'in', ['sale']), ('deadline_of_delivery', '!=', False), ('delivery_status', '!=', 'full')])
for item in sale_order:
production = self.env['mrp.production'].search([('origin', '=', item.name)])
production_not_done = production.filtered(lambda p: p.state not in ['done', 'scrap', 'cancel'])
production_done_count = len(production.filtered(lambda p: p.state in ['done', 'scrap', 'cancel']))
- if len(production_not_done) != item.mrp_production_count:
- if deadline_check == item.deadline_of_delivery:
+ if len(production_not_done) >= 1 and len(production_not_done) != item.mrp_production_count:
+ logging.info("-----不等于----")
+ logging.info(f"name: {item.name}")
+ logging.info(
+ f"production_not_done: {len(production_not_done)}, production_done_count: {production_done_count}")
+ logging.info(f"deadline_of_delivery: {item.deadline_of_delivery}")
+ if deadline_check == item.deadline_of_delivery and item.delivery_warning not in ['warning']:
item.delivery_warning = 'warning'
- elif today == item.deadline_of_delivery:
+ elif today >= item.deadline_of_delivery and item.delivery_warning not in ['overdue']:
item.delivery_warning = 'overdue'
elif production_done_count == item.mrp_production_count:
+ logging.info("-----等于----")
+ logging.info(f"name: {item.name}")
+ logging.info(
+ f"production_not_done: {len(production_not_done)}, production_done_count: {production_done_count}")
+ logging.info(f"deadline_of_delivery: {item.deadline_of_delivery}")
if item.delivery_status in ['pending', 'partial']:
- if deadline_check == item.deadline_of_delivery:
+ if deadline_check == item.deadline_of_delivery and item.delivery_warning not in ['warning']:
item.delivery_warning = 'warning'
- elif today == item.deadline_of_delivery:
+ elif today >= item.deadline_of_delivery and item.delivery_warning not in ['overdue']:
item.delivery_warning = 'overdue'
else:
+ logging.info("-----1111111----")
continue
+ # 获取业务节点
+ business_node_ids = {
+ 'warning': self.env.ref('sf_message.bussiness_sale_order_overdue_warning').id,
+ 'overdue': self.env.ref('sf_message.bussiness_sale_order_overdue').id
+ }
overdue_orders = self.sudo().search([('delivery_warning', 'in', ['warning', 'overdue'])])
for wo in overdue_orders:
- message_template = self.env["jikimo.message.template"].search([
- ("model", "=", self._name),
- ("bussiness_node_id", "=", self.env.ref('sf_message.bussiness_sale_order_overdue_warning').id)
- ])
- sale_order_has = self.env['jikimo.message.queue'].search([
- ('res_id', '=', wo.id),
- ('message_status', '=', 'pending'),
- ('message_template_id', '=', message_template.id)
- ])
- if not sale_order_has:
- if wo.delivery_warning == 'warning':
- wo.add_queue('销售订单逾期预警')
- elif wo.delivery_warning == 'overdue':
- wo.add_queue('销售订单已逾期')
-
-
+ business_node_id = business_node_ids.get(wo.delivery_warning)
+ if business_node_id:
+ message_template = self.env["jikimo.message.template"].search([
+ ("model", "=", self._name),
+ ("bussiness_node_id", "=", business_node_id)
+ ], limit=1)
+ sale_order_has = self.env['jikimo.message.queue'].search([
+ ('res_id', '=', wo.id),
+ ('message_status', '=', 'pending'),
+ ('message_template_id', '=', message_template.id)
+ ])
+ if not sale_order_has:
+ message_name = '销售订单逾期预警' if wo.delivery_warning == 'warning' else '销售订单已逾期'
+ wo.add_queue(message_name)
diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py
index 4b3d0a9a..c531e013 100644
--- a/sf_message/models/sf_message_workorder.py
+++ b/sf_message/models/sf_message_workorder.py
@@ -115,12 +115,13 @@ class SFMessageWork(models.Model):
item.date_planned_finished.strftime("%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)
- if current_time_datetime >= date_planned_finished:
+ if current_time_datetime >= date_planned_finished and item.delivery_warning not in ['overdue']:
logging.info("------overdue-------")
logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, "
f"Planned Finish: {date_planned_finished}")
item.delivery_warning = 'overdue'
- elif twelve_hours_ago <= current_time_datetime <= date_planned_finished:
+ elif twelve_hours_ago <= current_time_datetime <= date_planned_finished and item.delivery_warning not in [
+ 'warning']:
logging.info("------warning-------")
logging.info(f"Workorder: {item.production_id.name}, Current Time: {current_time_datetime}, "
f"Planned Finish: {date_planned_finished}")
diff --git a/sf_quality/models/quality_cnc_test.py b/sf_quality/models/quality_cnc_test.py
index f911fb43..d0301a7f 100644
--- a/sf_quality/models/quality_cnc_test.py
+++ b/sf_quality/models/quality_cnc_test.py
@@ -31,8 +31,8 @@ class SfQualityCncTest(models.Model):
("technology", "工艺"), ("customer redrawing", "客户改图")], string="原因")
detailed_reason = fields.Text('详细原因')
- # machining_drawings = fields.Binary(related='workorder_id.machining_drawings', string='2D加工图纸', readonly=True)
- # quality_standard = fields.Binary(related='workorder_id.quality_standard', string='质检标准', readonly=True)
+ machining_drawings = fields.Binary('2D加工图纸', related='workorder_id.machining_drawings', readonly=True)
+ quality_standard = fields.Binary('质检标准', related='workorder_id.quality_standard', readonly=True)
def submit_pass(self):
if self.test_results in ['返工', '报废']:
diff --git a/sf_quality/views/quality_cnc_test_view.xml b/sf_quality/views/quality_cnc_test_view.xml
index 85f92bfb..2cfc8cda 100644
--- a/sf_quality/views/quality_cnc_test_view.xml
+++ b/sf_quality/views/quality_cnc_test_view.xml
@@ -107,10 +107,10 @@
-
+
-
+
diff --git a/sf_sale/views/sale_order_view.xml b/sf_sale/views/sale_order_view.xml
index be8c469b..a84a2b44 100644
--- a/sf_sale/views/sale_order_view.xml
+++ b/sf_sale/views/sale_order_view.xml
@@ -95,7 +95,7 @@
{'readonly': [('state', 'in', ['cancel','sale'])]}
-
+