Compare commits
6 Commits
master
...
feature/71
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
307e860fe0 | ||
|
|
bd27f288f7 | ||
|
|
5bb6fcd4f7 | ||
|
|
b33c992b25 | ||
|
|
788183e239 | ||
|
|
f38f60a6a8 |
2
jikimo_demand_plan_queue/__init__.py
Normal file
2
jikimo_demand_plan_queue/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from . import models
|
||||||
18
jikimo_demand_plan_queue/__manifest__.py
Normal file
18
jikimo_demand_plan_queue/__manifest__.py
Normal file
@@ -0,0 +1,18 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
{
|
||||||
|
'name': '机企猫 需求计划排程队列',
|
||||||
|
'version': '1.0',
|
||||||
|
'summary': """ 使用队列进行排程 """,
|
||||||
|
'author': 'fox',
|
||||||
|
'website': '',
|
||||||
|
'category': '',
|
||||||
|
'depends': ['queue_job_batch', 'sf_demand_plan'],
|
||||||
|
'data': [
|
||||||
|
|
||||||
|
],
|
||||||
|
|
||||||
|
'application': True,
|
||||||
|
'installable': True,
|
||||||
|
'auto_install': False,
|
||||||
|
'license': 'LGPL-3',
|
||||||
|
}
|
||||||
2
jikimo_demand_plan_queue/models/__init__.py
Normal file
2
jikimo_demand_plan_queue/models/__init__.py
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
# -*- coding: utf-8 -*-
|
||||||
|
from . import production_demand_plan
|
||||||
20
jikimo_demand_plan_queue/models/production_demand_plan.py
Normal file
20
jikimo_demand_plan_queue/models/production_demand_plan.py
Normal file
@@ -0,0 +1,20 @@
|
|||||||
|
from odoo import models, fields
|
||||||
|
|
||||||
|
|
||||||
|
class ProductionDemandPlan(models.Model):
|
||||||
|
_inherit = 'sf.production.demand.plan'
|
||||||
|
|
||||||
|
|
||||||
|
def _do_production_schedule(self, pro_plan_list):
|
||||||
|
"""使用队列进行排程"""
|
||||||
|
batch_size = 10
|
||||||
|
current_time = fields.Datetime.now().strftime('%Y%m%d%H%M%S')
|
||||||
|
index = 1
|
||||||
|
for i in range(0, len(pro_plan_list), batch_size):
|
||||||
|
batch = self.env['queue.job.batch'].get_new_batch('plan-%s-%s' % (current_time, index))
|
||||||
|
pro_plans = pro_plan_list[i:i+batch_size]
|
||||||
|
pro_plans.with_context(
|
||||||
|
job_batch=batch
|
||||||
|
).with_delay().do_production_schedule()
|
||||||
|
index += 1
|
||||||
|
batch.enqueue()
|
||||||
@@ -190,7 +190,7 @@ def _create(self, data_list):
|
|||||||
# 如果该用户组被限制创建或更新操作
|
# 如果该用户组被限制创建或更新操作
|
||||||
if rec['is_create_or_update']:
|
if rec['is_create_or_update']:
|
||||||
raise UserError(
|
raise UserError(
|
||||||
_("您没有执行此操作的权限。请联系管理员"))
|
_("您没有执行此操作(%s)的权限。请联系管理员" % group_xml_id))
|
||||||
else:
|
else:
|
||||||
# 如果 'access.right' 模型不存在,可以在这里定义备选逻辑
|
# 如果 'access.right' 模型不存在,可以在这里定义备选逻辑
|
||||||
# 例如,记录日志、发送通知或者简单地跳过这部分逻辑
|
# 例如,记录日志、发送通知或者简单地跳过这部分逻辑
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
""",
|
""",
|
||||||
'category': 'sf',
|
'category': 'sf',
|
||||||
'website': 'https://www.sf.jikimo.com',
|
'website': 'https://www.sf.jikimo.com',
|
||||||
'depends': ['sf_plan', 'jikimo_printing'],
|
'depends': ['sf_plan'],
|
||||||
'data': [
|
'data': [
|
||||||
'security/ir.model.access.csv',
|
'security/ir.model.access.csv',
|
||||||
'views/demand_plan.xml',
|
'views/demand_plan.xml',
|
||||||
|
|||||||
@@ -323,9 +323,13 @@ class SfProductionDemandPlan(models.Model):
|
|||||||
date_planned_start = datetime.combine(date_part, time_part)
|
date_planned_start = datetime.combine(date_part, time_part)
|
||||||
pro_plan_list.production_line_id = sf_production_line.id
|
pro_plan_list.production_line_id = sf_production_line.id
|
||||||
pro_plan_list.date_planned_start = date_planned_start
|
pro_plan_list.date_planned_start = date_planned_start
|
||||||
|
self._do_production_schedule(pro_plan_list)
|
||||||
|
|
||||||
|
def _do_production_schedule(self, pro_plan_list):
|
||||||
for pro_plan in pro_plan_list:
|
for pro_plan in pro_plan_list:
|
||||||
pro_plan.do_production_schedule()
|
pro_plan.do_production_schedule()
|
||||||
|
|
||||||
|
|
||||||
def button_action_print(self):
|
def button_action_print(self):
|
||||||
return {
|
return {
|
||||||
'res_model': 'sf.demand.plan.print.wizard',
|
'res_model': 'sf.demand.plan.print.wizard',
|
||||||
|
|||||||
Reference in New Issue
Block a user