diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index b18ab04c..9dc77bde 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -9,8 +9,8 @@ from odoo.exceptions import ValidationError, UserError
from odoo.modules import get_resource_path
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
class ResProductMo(models.Model):
diff --git a/sf_message/__manifest__.py b/sf_message/__manifest__.py
index 0f032a6d..d69c06c1 100644
--- a/sf_message/__manifest__.py
+++ b/sf_message/__manifest__.py
@@ -11,9 +11,10 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
- 'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify','stock'],
+ 'depends': ['sale', 'purchase', 'sf_plan', 'jikimo_message_notify', 'stock'],
'data': [
- 'data/bussiness_node.xml'
+ 'data/bussiness_node.xml',
+ 'data/cron_data.xml',
],
'test': [
],
diff --git a/sf_message/data/bussiness_node.xml b/sf_message/data/bussiness_node.xml
index 7d66e8d2..fbad5581 100644
--- a/sf_message/data/bussiness_node.xml
+++ b/sf_message/data/bussiness_node.xml
@@ -1,6 +1,7 @@
+
待接单
sale.order
@@ -10,6 +11,17 @@
确认接单
sale.order
+
+
+ 销售订单逾期预警
+ sale.order
+
+
+
+ 销售订单已逾期
+ sale.order
+
+
调拨入库
stock.picking
@@ -30,9 +42,48 @@
坯料发料提醒
stock.picking
+
+
工单已下发通知
mrp.workorder
+
+ 装夹预调工单逾期预警
+ mrp.workorder
+
+
+ 装夹预调工单已逾期
+ mrp.workorder
+
+
+
+ CNC工单逾期预警
+ mrp.workorder
+
+
+ CNC工单已逾期
+ mrp.workorder
+
+
+
+ 解除装夹工单逾期预警
+ mrp.workorder
+
+
+
+ 解除装夹工单已逾期
+ mrp.workorder
+
+
+
+ 表面工艺工单逾期预警
+ mrp.workorder
+
+
+
+ 表面工艺工单已逾期
+ mrp.workorder
+
\ No newline at end of file
diff --git a/sf_message/data/cron_data.xml b/sf_message/data/cron_data.xml
new file mode 100644
index 00000000..f69dce7b
--- /dev/null
+++ b/sf_message/data/cron_data.xml
@@ -0,0 +1,160 @@
+
+
+
+ 销售订单逾期预警
+
+ code
+ model._overdue_warning_func()
+ 1
+ minutes
+ -1
+
+
+
+
+
+
+ 销售订单已逾期
+
+ code
+ model._overdue_func()
+ 1
+ minutes
+ -1
+
+
+
+
+
+
+ 装夹预调工单逾期预警
+
+ code
+ model._overdue_warning_func()
+ 1
+ minutes
+ -1
+
+
+
+
+
+
+ 工单已逾期
+
+ code
+ model._overdue_func()
+ 1
+ minutes
+ -1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/sf_message/models/sf_message_sale.py b/sf_message/models/sf_message_sale.py
index ef94b7fe..85a7fd3e 100644
--- a/sf_message/models/sf_message_sale.py
+++ b/sf_message/models/sf_message_sale.py
@@ -1,4 +1,5 @@
# -*- coding: utf-8 -*-
+import logging
from odoo import models, fields, api, _
@@ -10,6 +11,7 @@ class SFMessageSale(models.Model):
res = super(SFMessageSale, self).create(vals_list)
if res:
try:
+ logging.info('add_queue res:%s' % res)
res.add_queue('待接单')
except Exception as e:
logging.info('add_queue error:%s' % e)
@@ -45,3 +47,12 @@ class SFMessageSale(models.Model):
if new_res:
res = new_res
return res
+
+ # 销售订单逾期预警
+ def _overdue_warning_func(self):
+ sale_order_
+ return 1
+
+ # 销售订单已逾期
+ def _overdue_func(self):
+ return 1
diff --git a/sf_message/models/sf_message_workorder.py b/sf_message/models/sf_message_workorder.py
index 2462b3f1..d1a4f06f 100644
--- a/sf_message/models/sf_message_workorder.py
+++ b/sf_message/models/sf_message_workorder.py
@@ -31,3 +31,6 @@ class SFMessageWork(models.Model):
product_id.append(mrp_workorder_line.product_id.id)
contents.append(content)
return contents
+
+
+
diff --git a/sf_sale/models/quick_easy_order.py b/sf_sale/models/quick_easy_order.py
index 081807a4..cb1886a1 100644
--- a/sf_sale/models/quick_easy_order.py
+++ b/sf_sale/models/quick_easy_order.py
@@ -8,8 +8,8 @@ from datetime import datetime
import requests
from odoo import http
from odoo.http import request
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
from odoo import models, fields, api
from odoo.modules import get_resource_path
from odoo.exceptions import ValidationError, UserError
diff --git a/sf_sale/models/quick_easy_order_old.py b/sf_sale/models/quick_easy_order_old.py
index 4756a2c5..9bd61132 100644
--- a/sf_sale/models/quick_easy_order_old.py
+++ b/sf_sale/models/quick_easy_order_old.py
@@ -6,8 +6,8 @@ import os
from datetime import datetime
from stl import mesh
# from OCC.Core.GProp import GProp_GProps
-from OCC.Extend.DataExchange import read_step_file
-from OCC.Extend.DataExchange import write_stl_file
+# from OCC.Extend.DataExchange import read_step_file
+# from OCC.Extend.DataExchange import write_stl_file
from odoo.addons.sf_base.commons.common import Common
from odoo import models, fields, api
from odoo.modules import get_resource_path
diff --git a/sf_tool_management/__manifest__.py b/sf_tool_management/__manifest__.py
index 97c26e40..6c3a1e01 100644
--- a/sf_tool_management/__manifest__.py
+++ b/sf_tool_management/__manifest__.py
@@ -25,7 +25,7 @@
'views/stock.xml',
'data/tool_data.xml',
'wizard/jikimo_bom_wizard.xml',
- 'views/tool_inventory.xml',
+ # 'views/tool_inventory.xml',
'views/jikimo_bom.xml',
'views/tool_views.xml',