diff --git a/jikimo_demand_plan_queue/__init__.py b/jikimo_demand_plan_queue/__init__.py
new file mode 100644
index 00000000..a0fdc10f
--- /dev/null
+++ b/jikimo_demand_plan_queue/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import models
diff --git a/jikimo_demand_plan_queue/__manifest__.py b/jikimo_demand_plan_queue/__manifest__.py
new file mode 100644
index 00000000..83f5e07d
--- /dev/null
+++ b/jikimo_demand_plan_queue/__manifest__.py
@@ -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',
+}
diff --git a/jikimo_demand_plan_queue/models/__init__.py b/jikimo_demand_plan_queue/models/__init__.py
new file mode 100644
index 00000000..54314ee3
--- /dev/null
+++ b/jikimo_demand_plan_queue/models/__init__.py
@@ -0,0 +1,2 @@
+# -*- coding: utf-8 -*-
+from . import production_demand_plan
diff --git a/jikimo_demand_plan_queue/models/production_demand_plan.py b/jikimo_demand_plan_queue/models/production_demand_plan.py
new file mode 100644
index 00000000..fd51e055
--- /dev/null
+++ b/jikimo_demand_plan_queue/models/production_demand_plan.py
@@ -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()
\ No newline at end of file
diff --git a/jikimo_purchase_request/__manifest__.py b/jikimo_purchase_request/__manifest__.py
index 2ae6ce67..c6e58a41 100644
--- a/jikimo_purchase_request/__manifest__.py
+++ b/jikimo_purchase_request/__manifest__.py
@@ -10,6 +10,7 @@
'data': [
'security/ir.model.access.csv',
'views/sale_order_view.xml',
+ 'views/purchase_order.xml',
'views/mrp_production.xml',
'views/purchase_request_view.xml',
'wizard/purchase_request_line_make_purchase_order_view.xml',
diff --git a/jikimo_purchase_request/models/purchase_order.py b/jikimo_purchase_request/models/purchase_order.py
index 95f81e9f..29e6c646 100644
--- a/jikimo_purchase_request/models/purchase_order.py
+++ b/jikimo_purchase_request/models/purchase_order.py
@@ -16,6 +16,69 @@ class PurchaseOrder(models.Model):
('rejected', '已驳回')
], string='Status', readonly=True, index=True, copy=False, default='draft', tracking=True)
+ # 成品采购订单对应的坯料采购申请单和采购订单数量
+ purchase_request_count = fields.Integer('子·采购申请数量', compute='_compute_purchase_request')
+ purchase_order_count = fields.Integer('子·采购订单数量', compute='_compute_purchase_request')
+
+ @api.depends('state')
+ def _compute_purchase_request(self):
+ for record in self:
+ purchase_request_ids, purchase_order_ids = record.get_purchase_request_order()
+ record.purchase_request_count = len(purchase_request_ids)
+ record.purchase_order_count = len(purchase_order_ids)
+
+ def action_view_preform_body_purchase_request(self):
+ self.ensure_one()
+ name_list = self._get_pinking_name()
+ purchase_request_ids = self.env['purchase.request'].search([('origin', 'in', name_list)])
+
+ action = {
+ 'res_model': 'purchase.request',
+ 'type': 'ir.actions.act_window',
+ }
+ if len(purchase_request_ids) == 1:
+ action.update({
+ 'view_mode': 'form',
+ 'res_id': purchase_request_ids[0].id,
+ })
+ else:
+ action.update({
+ 'name': _("子·采购申请"),
+ 'domain': [('id', 'in', purchase_request_ids.ids)],
+ 'view_mode': 'tree,form',
+ })
+ return action
+
+ def action_view_preform_body_purchase_order(self):
+ self.ensure_one()
+ name_list = self._get_pinking_name()
+ purchase_order_ids = self.env['purchase.order'].search([('origin', 'in', name_list)])
+
+ action = {
+ 'res_model': 'purchase.order',
+ 'type': 'ir.actions.act_window',
+ }
+ if len(purchase_order_ids) == 1:
+ action.update({
+ 'view_mode': 'form',
+ 'res_id': purchase_order_ids[0].id,
+ })
+ else:
+ action.update({
+ 'name': _("子·采购订单"),
+ 'domain': [('id', 'in', purchase_order_ids.ids)],
+ 'view_mode': 'tree,form',
+ })
+ return action
+
+ def get_purchase_request_order(self):
+ name_list = self._get_pinking_name()
+ purchase_request_ids = self.env['purchase.request'].search([('origin', 'in', name_list)])
+ purchase_order_ids = self.env['purchase.order'].search([('origin', 'in', name_list)])
+ return purchase_request_ids, purchase_order_ids
+
+ def _get_pinking_name(self):
+ return [picking_id.name for picking_id in self.picking_ids if picking_id.name]
def button_confirm(self):
res = super(PurchaseOrder, self).button_confirm()
diff --git a/jikimo_purchase_request/models/purchase_request.py b/jikimo_purchase_request/models/purchase_request.py
index 7287cb6a..3820b1ac 100644
--- a/jikimo_purchase_request/models/purchase_request.py
+++ b/jikimo_purchase_request/models/purchase_request.py
@@ -16,6 +16,7 @@ class PurchaseRequest(models.Model):
)
rule_new_add = fields.Boolean('采购请求为规则创建', default=False, compute='_compute_state', store=True)
+ rule_purchase_to_request = fields.Boolean('采购单根据规则创建坯料采购申请', default=False)
@api.depends('state')
def _compute_state(self):
diff --git a/jikimo_purchase_request/models/stock_picking.py b/jikimo_purchase_request/models/stock_picking.py
index 97b294f3..037484c7 100644
--- a/jikimo_purchase_request/models/stock_picking.py
+++ b/jikimo_purchase_request/models/stock_picking.py
@@ -44,4 +44,15 @@ class StockPicking(models.Model):
purchase_request_lines.move_dest_ids = [
(4, x.id) for x in backorder_ids.move_ids if x.product_id.id in purchase_request_lines.mapped('product_id.id')
]
- return res
\ No newline at end of file
+ return res
+
+ def _subcontracted_produce(self, subcontract_details):
+ super()._subcontracted_produce(subcontract_details)
+
+ # 判断是否根据规则生成新的采购申请单据，如果生成则修改状态为 approved
+ if self:
+ pr_ids = self.env["purchase.request"].sudo().search(
+ [('origin', 'like', self.name), ('rule_purchase_to_request', '=', True), ('state', '=', 'draft')])
+ if pr_ids:
+ pr_ids.write({'need_validation': False})
+ pr_ids.write({"state": "approved", 'need_validation': True, 'rule_new_add': False})
diff --git a/jikimo_purchase_request/models/stock_rule.py b/jikimo_purchase_request/models/stock_rule.py
index 4a99e804..a6d3d893 100644
--- a/jikimo_purchase_request/models/stock_rule.py
+++ b/jikimo_purchase_request/models/stock_rule.py
@@ -26,7 +26,7 @@ class StockRule(models.Model):
request_data = rule._prepare_purchase_request(
procurement.origin, procurement.values
)
- request_data.update({'rule_new_add': True})
+ request_data = self._update_request_data(procurement, request_data)
pr = purchase_request_model.create(request_data)
cache[domain] = pr
elif (
@@ -44,6 +44,18 @@ class StockRule(models.Model):
request_line_data.update({'origin': procurement.origin})
purchase_request_line_model.create(request_line_data)
+ def _update_request_data(self, procurement, request_data):
+ sp = self.env['stock.picking'].sudo().search([('name', '=', procurement.origin)])
+ if len(sp) == 1:
+ po = self.env['purchase.order'].sudo().search(
+ [('name', '=', sp.origin), ('purchase_type', '=', 'outsourcing')])
+ if po:
+ request_data.update({'rule_purchase_to_request': True})
+ else:
+ request_data.update({'rule_new_add': True})
+ return request_data
+
+
def _run_buy(self, procurements):
# 如果补货组相同，并且产品相同，则合并
procurements_dict = defaultdict()
diff --git a/jikimo_purchase_request/views/purchase_order.xml b/jikimo_purchase_request/views/purchase_order.xml
new file mode 100644
index 00000000..78f5b6a8
--- /dev/null
+++ b/jikimo_purchase_request/views/purchase_order.xml
@@ -0,0 +1,28 @@
+
+
+
+ purchase.order.inherited.form.jikimo.purchase.request
+ purchase.order
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/jikimo_purchase_request/views/purchase_request_view.xml b/jikimo_purchase_request/views/purchase_request_view.xml
index 151152e8..f793eaaa 100644
--- a/jikimo_purchase_request/views/purchase_request_view.xml
+++ b/jikimo_purchase_request/views/purchase_request_view.xml
@@ -67,6 +67,16 @@
+
+
+
diff --git a/sf_demand_plan/__manifest__.py b/sf_demand_plan/__manifest__.py
index 2a543f1a..59457102 100644
--- a/sf_demand_plan/__manifest__.py
+++ b/sf_demand_plan/__manifest__.py
@@ -10,10 +10,12 @@
""",
'category': 'sf',
'website': 'https://www.sf.jikimo.com',
- 'depends': ['sf_plan', 'jikimo_printing'],
+ 'depends': ['sf_plan','jikimo_printing'],
'data': [
'security/ir.model.access.csv',
+ 'data/stock_route_group.xml',
'views/demand_plan.xml',
+ 'views/stock_route.xml',
'wizard/sf_demand_plan_print_wizard_view.xml',
],
'demo': [
diff --git a/sf_demand_plan/data/stock_route_group.xml b/sf_demand_plan/data/stock_route_group.xml
new file mode 100644
index 00000000..1b4a0b84
--- /dev/null
+++ b/sf_demand_plan/data/stock_route_group.xml
@@ -0,0 +1,21 @@
+
+
+
+
+ 自动化产线加工
+ automation
+
+
+ 人工线下加工
+ manual
+
+
+ 外购
+ purchase
+
+
+ 委外加工
+ outsourcing
+
+
+
\ No newline at end of file
diff --git a/sf_demand_plan/models/__init__.py b/sf_demand_plan/models/__init__.py
index a0554c11..70c1bbc8 100644
--- a/sf_demand_plan/models/__init__.py
+++ b/sf_demand_plan/models/__init__.py
@@ -2,3 +2,4 @@
from . import sf_production_demand_plan
from . import sale_order
+from . import stock_route
diff --git a/sf_demand_plan/models/sf_production_demand_plan.py b/sf_demand_plan/models/sf_production_demand_plan.py
index 7271e90d..d312a2f5 100644
--- a/sf_demand_plan/models/sf_production_demand_plan.py
+++ b/sf_demand_plan/models/sf_production_demand_plan.py
@@ -89,6 +89,9 @@ class SfProductionDemandPlan(models.Model):
string='订单状态',
related='sale_order_line_id.state')
route_id = fields.Many2one('stock.route', string='路线', related='sale_order_line_id.route_id', store=True)
+ route_ids = fields.Many2many('stock.route', 'stock_route_demand_plan', 'demand_plan_id', 'route_id', '路线',
+ domain=[('demand_plan_selectable', '=', True)], compute='_compute_route_ids',
+ store=True)
contract_date = fields.Date('合同日期', related='sale_order_id.contract_date')
date_order = fields.Datetime('下单日期', related='sale_order_id.date_order')
contract_code = fields.Char('合同号', related='sale_order_id.contract_code', store=True)
@@ -136,6 +139,18 @@ class SfProductionDemandPlan(models.Model):
outsourcing_purchase_request = fields.Char('委外采购申请单')
+ @api.depends('supply_method')
+ def _compute_route_ids(self):
+ for pdp in self:
+ if pdp.supply_method:
+ group_id = self.env['stock.route.group'].sudo().search([('code', '=', pdp.supply_method)])
+ route_ids = self.env['stock.route'].sudo().search(
+ [('demand_plan_selectable', '=', True), ('stock_route_group_ids', '=', group_id.id)])
+ if route_ids:
+ pdp.route_ids = route_ids.ids
+ break
+ pdp.route_ids = None
+
@api.depends('sale_order_id.state', 'sale_order_id.mrp_production_ids.schedule_state', 'sale_order_id.order_line',
'sale_order_id.mrp_production_ids.state')
def _compute_status(self):
@@ -327,8 +342,11 @@ class SfProductionDemandPlan(models.Model):
date_planned_start = datetime.combine(date_part, time_part)
pro_plan_list.production_line_id = sf_production_line.id
pro_plan_list.date_planned_start = date_planned_start
- for pro_plan in pro_plan_list:
- pro_plan.do_production_schedule()
+ self._do_production_schedule(pro_plan_list)
+
+ def _do_production_schedule(self, pro_plan_list):
+ for pro_plan in pro_plan_list:
+ pro_plan.do_production_schedule()
def button_action_print(self):
return {
diff --git a/sf_demand_plan/models/stock_route.py b/sf_demand_plan/models/stock_route.py
new file mode 100644
index 00000000..20e4b3c9
--- /dev/null
+++ b/sf_demand_plan/models/stock_route.py
@@ -0,0 +1,49 @@
+from odoo import models, fields, api, _
+
+
+class SfStockRoute(models.Model):
+ _inherit = 'stock.route'
+
+ demand_plan_selectable = fields.Boolean("需求计划行")
+ stock_route_group_ids = fields.Many2many('stock.route.group', 'route_to_group', string='路线组')
+ demand_plan_ids = fields.Many2many('sf.production.demand.plan', 'stock_route_demand_plan', 'route_id',
+ 'demand_plan_id', '需求计划', copy=False, compute='_compute_demand_plan_ids',
+ store=True)
+
+ @api.depends('demand_plan_selectable', 'stock_route_group_ids')
+ def _compute_demand_plan_ids(self):
+ for sr in self:
+ if sr.demand_plan_selectable:
+ stock_route_group = [srg.code for srg in sr.stock_route_group_ids]
+ demand_plan_ids = self.env['sf.production.demand.plan'].sudo().search(
+ [('supply_method', 'in', stock_route_group)])
+ if demand_plan_ids:
+ sr.demand_plan_ids = demand_plan_ids.ids
+ break
+ sr.demand_plan_ids = None
+
+ # def name_get(self):
+ # res = super().name_get()
+ # if self.env.context.get('demand_plan_search_stock_route_id'):
+ # demand_plan_id = self.env['sf.production.demand.plan'].sudo().browse(
+ # int(self.env.context.get('demand_plan_search_stock_route_id')))
+ # if demand_plan_id and demand_plan_id.supply_method:
+ # supply_method = self._set_supply_method(demand_plan_id.supply_method)
+ # res = [(item[0], f'{item[1]}-{supply_method}') for item in res if len(item) == 2]
+ # return res
+ #
+ # def _set_supply_method(self, supply_method):
+ # return {
+ # 'automation': "自动化产线加工",
+ # 'manual': "人工线下加工",
+ # 'purchase': "外购",
+ # 'outsourcing': "委外加工"
+ # }.get(supply_method)
+
+
+class SfStockRouteGroup(models.Model):
+ _name = 'stock.route.group'
+ _description = '路线组'
+
+ name = fields.Char('名称')
+ code = fields.Char('编码')
diff --git a/sf_demand_plan/security/ir.model.access.csv b/sf_demand_plan/security/ir.model.access.csv
index 56e8e247..a1bef90a 100644
--- a/sf_demand_plan/security/ir.model.access.csv
+++ b/sf_demand_plan/security/ir.model.access.csv
@@ -4,3 +4,6 @@ access_sf_production_demand_plan_for_dispatch,sf.production.demand.plan for disp
access_sf_demand_plan_print_wizard,sf.demand.plan.print.wizard,model_sf_demand_plan_print_wizard,base.group_user,1,0,0,0
access_sf_demand_plan_print_wizard_for_dispatch,sf.demand.plan.print.wizard for dispatch,model_sf_demand_plan_print_wizard,sf_base.group_plan_dispatch,1,1,0,0
+
+access_stock_route_group,stock.route.group,model_stock_route_group,base.group_user,1,0,0,0
+access_stock_route_group_dispatch,stock.route.group.dispatch,model_stock_route_group,sf_base.group_plan_dispatch,1,1,0,0
diff --git a/sf_demand_plan/views/demand_plan.xml b/sf_demand_plan/views/demand_plan.xml
index b70e37db..24ac8416 100644
--- a/sf_demand_plan/views/demand_plan.xml
+++ b/sf_demand_plan/views/demand_plan.xml
@@ -38,7 +38,8 @@
-
+
diff --git a/sf_demand_plan/views/stock_route.xml b/sf_demand_plan/views/stock_route.xml
new file mode 100644
index 00000000..c4581acc
--- /dev/null
+++ b/sf_demand_plan/views/stock_route.xml
@@ -0,0 +1,21 @@
+
+
+
+ stock.route.form
+ stock.route
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
index 2308538f..3b4a635d 100644
--- a/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
+++ b/sf_demand_plan/wizard/sf_demand_plan_print_wizard_view.xml
@@ -4,12 +4,12 @@
sf.demand.plan.print.wizard.tree
sf.demand.plan.print.wizard
-
+
-
-
+
+
diff --git a/sf_machine_connect/controllers/controllers.py b/sf_machine_connect/controllers/controllers.py
index 78202ea6..96461902 100644
--- a/sf_machine_connect/controllers/controllers.py
+++ b/sf_machine_connect/controllers/controllers.py
@@ -437,7 +437,7 @@ class Sf_Dashboard_Connect(http.Controller):
('state', 'in', ['ready', 'progress', 'done'])
])
- plan_data_total_counts = sum(plan_data_total.mapped('qty_produced'))
+ plan_data_total_counts = sum(plan_data_total.mapped('qty_production'))
# # 工单完成量
# plan_data_finish_counts = plan_obj.search_count(
@@ -601,8 +601,11 @@ class Sf_Dashboard_Connect(http.Controller):
line_list = ast.literal_eval(kw['line_list'])
begin_time_str = kw['begin_time'].strip('"')
end_time_str = kw['end_time'].strip('"')
- begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
- end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
+ # 将时间减去8小时（UTC+8转UTC）
+ begin_time = (datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
+ end_time = (datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S') - timedelta(hours=8))
+ # begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
+ # end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
# print('line_list: %s' % line_list)
print('kw', kw)
time_unit = kw.get('time_unit', 'day').strip('"') # 默认单位为天
@@ -636,6 +639,15 @@ class Sf_Dashboard_Connect(http.Controller):
if time_unit == 'hour':
+
+ # 计划量，目前只能从mail.message中筛选出
+ plan_order_messages = request.env['mail.message'].sudo().search([
+ ('model', '=', 'mrp.workorder'),
+ ('create_date', '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
+ ('create_date', '<=', end_time.strftime('%Y-%m-%d %H:%M:%S')),
+ ('tracking_value_ids.field_desc', '=', '状态'),
+ ('tracking_value_ids.new_value_char', '=', '就绪')
+ ])
for line in line_list:
date_field_name = 'date_finished' # 替换为你模型中的实际字段名
@@ -678,19 +690,10 @@ class Sf_Dashboard_Connect(http.Controller):
)
# 使用小时和分钟作为键，确保每个小时的数据有独立的键
- key = start_time.strftime('%H:%M:%S') # 只取小时:分钟:秒作为键
+ key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S') # 只取小时:分钟:秒作为键
# time_count_dict[key] = len(orders)
time_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
- # 计划量，目前只能从mail.message中筛选出
- plan_order_messages = request.env['mail.message'].sudo().search([
- ('model', '=', 'mrp.workorder'),
- ('create_date', '>=', begin_time.strftime('%Y-%m-%d %H:%M:%S')),
- ('create_date', '<=', end_time.strftime('%Y-%m-%d %H:%M:%S')),
- ('tracking_value_ids.field_desc', '=', '状态'),
- ('tracking_value_ids.new_value_char', '=', '就绪')
- ])
-
for time_interval in time_intervals:
start_time, end_time = time_interval
@@ -704,9 +707,11 @@ class Sf_Dashboard_Connect(http.Controller):
interval_plan_orders = plan_order_messages.filtered(
lambda o: o.create_date >= start_time
and o.create_date <= end_time
- )
+ )
- interval_orders = request.env['mrp.workorder'].sudo().browse(interval_plan_orders.mapped('res_id'))
+ interval_order_ids = set(interval_plan_orders.mapped('res_id'))
+
+ interval_orders = request.env['mrp.workorder'].sudo().browse(interval_order_ids)
if line == '业绩总览':
interval_orders = interval_orders.filtered(lambda o: o.routing_type in ['人工线下加工', 'CNC加工'])
elif line == '人工线下加工中心':
@@ -715,9 +720,9 @@ class Sf_Dashboard_Connect(http.Controller):
interval_orders = interval_orders.filtered(lambda o: o.routing_type == 'CNC加工' and o.production_line_id.name == line)
# 使用小时和分钟作为键，确保每个小时的数据有独立的键
- key = start_time.strftime('%H:%M:%S') # 只取小时:分钟:秒作为键
+ key = (start_time + timedelta(hours=8)).strftime('%H:%M:%S') # 只取小时:分钟:秒作为键
# time_count_dict[key] = len(orders)
- plan_count_dict[key] = sum(interval_orders.mapped('qty_produced'))
+ plan_count_dict[key] = sum(interval_orders.mapped('qty_production'))
# order_counts.append()
res['data'][line] = {
@@ -859,21 +864,37 @@ class Sf_Dashboard_Connect(http.Controller):
"""
# res = {'status': 1, 'message': '成功', 'not_done_data': [], 'done_data': []}
res = {'status': 1, 'message': '成功', 'data': {}}
+ # 解决产品名称取到英文的问题
+ request.update_context(lang='zh_CN')
plan_obj = request.env['sf.production.plan'].sudo()
work_order_obj = request.env['mrp.workorder'].sudo()
+ # 获取mrp.workorder的state字段的selection内容
+ state_dict = dict(request.env['mrp.workorder'].sudo()._fields['state'].selection)
line_list = ast.literal_eval(kw['line_list'])
begin_time_str = kw['begin_time'].strip('"')
end_time_str = kw['end_time'].strip('"')
begin_time = datetime.strptime(begin_time_str, '%Y-%m-%d %H:%M:%S')
end_time = datetime.strptime(end_time_str, '%Y-%m-%d %H:%M:%S')
# print('line_list: %s' % line_list)
- not_done_data = []
- done_data = []
final_data = {}
- not_done_index = 1
- done_index = 1
+
+ # 获取当前时间，并计算24小时前的时间
+ current_time = datetime.now()
+ time_48_hours_ago = current_time - timedelta(hours=48)
+
+ # # 计划量，目前只能从mail.message中筛选出
+ # plan_order_messages = request.env['mail.message'].sudo().search([
+ # ('model', '=', 'mrp.workorder'),
+ # ('create_date', '>=', time_48_hours_ago.strftime('%Y-%m-%d %H:%M:%S')),
+ # ('tracking_value_ids.field_desc', '=', '状态'),
+ # ('tracking_value_ids.new_value_char', 'in', ['就绪', '生产中'])
+ # ])
for line in line_list:
+ not_done_data = []
+ done_data = []
+ not_done_index = 1
+ done_index = 1
if line == '业绩总览':
work_order_domain = [('routing_type', 'in', ['人工线下加工', 'CNC加工'])]
@@ -889,21 +910,24 @@ class Sf_Dashboard_Connect(http.Controller):
# [('production_line_id.name', '=', line), ('state', 'not in', ['finished']),
# ('production_id.state', 'not in', ['cancel', 'done']), ('active', '=', True)
# ])
- not_done_orders = work_order_obj.search(work_order_domain +
- [('state', 'in', ['ready', 'progress'])], order='id asc'
+ not_done_orders = work_order_obj.search(work_order_domain + [
+ ('state', 'in', ['ready', 'progress']),
+ ('date_planned_start', '>=', time_48_hours_ago),
+ ('date_planned_start', '<=', current_time)
+ ], order='id asc'
)
# 完成订单
# 获取当前时间，并计算24小时前的时间
- current_time = datetime.now()
- time_24_hours_ago = current_time - timedelta(hours=24)
+ # current_time = datetime.now()
+ # time_24_hours_ago = current_time - timedelta(hours=24)
finish_orders = work_order_obj.search(work_order_domain + [
- ('state', 'in', ['finished']),
+ ('state', 'in', ['done']),
('production_id.state', 'not in', ['cancel']),
- ('date_finished', '>=', time_24_hours_ago)
+ ('date_finished', '>=', time_48_hours_ago)
], order='id asc')
- # print(finish_orders)
+ # logging.info('完成订单: %s' % finish_orders)
# 获取所有未完成订单的ID列表
order_ids = [order.id for order in not_done_orders]
@@ -939,14 +963,6 @@ class Sf_Dashboard_Connect(http.Controller):
material_match = re.search(material_pattern, blank_name)
material = material_match.group(1) if material_match else 'No match found'
- state_dict = {
- 'draft': '待排程',
- 'done': '已排程',
- 'processing': '生产中',
- 'finished': '已完成',
- 'ready': '待加工',
- 'progress': '生产中',
- }
line_dict = {
'sequence': not_done_index,
@@ -962,8 +978,6 @@ class Sf_Dashboard_Connect(http.Controller):
not_done_index += 1
for finish_order in finish_orders:
- if not finish_order.actual_end_time:
- continue
blank_name = ''
try:
blank_name = finish_order.production_id.move_raw_ids[0].product_id.name
@@ -979,13 +993,13 @@ class Sf_Dashboard_Connect(http.Controller):
line_dict = {
'sequence': done_index,
- 'workorder_name': finish_order.name,
+ 'workorder_name': finish_order.production_id.name,
'blank_name': blank_name,
'material': material,
'dimensions': dimensions,
- 'order_qty': order.qty_produced,
- 'finish_time': finish_order.actual_end_time.strftime(
- '%Y-%m-%d %H:%M:%S') if finish_order.actual_end_time else ' '
+ 'order_qty': finish_order.qty_produced,
+ 'finish_time': finish_order.date_finished.strftime(
+ '%Y-%m-%d %H:%M:%S') if finish_order.date_finished else ' '
}
done_data.append(line_dict)
diff --git a/sf_manufacturing/models/__init__.py b/sf_manufacturing/models/__init__.py
index 8af783e7..c8af2d82 100644
--- a/sf_manufacturing/models/__init__.py
+++ b/sf_manufacturing/models/__init__.py
@@ -18,4 +18,5 @@ from . import quick_easy_order
from . import purchase_order
from . import quality_check
from . import purchase_request_line
+from . import bom
# from . import stock_warehouse_orderpoint
\ No newline at end of file
diff --git a/sf_manufacturing/models/bom.py b/sf_manufacturing/models/bom.py
new file mode 100644
index 00000000..d0a35300
--- /dev/null
+++ b/sf_manufacturing/models/bom.py
@@ -0,0 +1,16 @@
+from odoo import models
+from odoo.osv.expression import AND
+
+
+class MrpBom(models.Model):
+ _inherit = 'mrp.bom'
+
+ def _bom_subcontract_find(self, product, picking_type=None, company_id=False, bom_type='subcontract', subcontractor=False):
+ domain = self._bom_find_domain(product, picking_type=picking_type, company_id=company_id, bom_type=bom_type)
+ if self.env.context.get('stock_picking') == 'outsourcing':
+ return self.search(domain, order='sequence, product_id, id', limit=1)
+ if subcontractor:
+ domain = AND([domain, [('subcontractor_ids', 'parent_of', subcontractor.ids)]])
+ return self.search(domain, order='sequence, product_id, id', limit=1)
+ else:
+ return self.env['mrp.bom']
diff --git a/sf_manufacturing/models/mrp_production.py b/sf_manufacturing/models/mrp_production.py
index 46c0ae39..cf196ad6 100644
--- a/sf_manufacturing/models/mrp_production.py
+++ b/sf_manufacturing/models/mrp_production.py
@@ -1709,6 +1709,7 @@ class MrpProduction(models.Model):
vals['procurement_group_id'] = product_group_id[product_id.id]
else:
vals['procurement_group_id'] = is_custemer_group_id[key]
+
return super(MrpProduction, self).create(vals_list)
@api.depends('procurement_group_id.stock_move_ids.created_purchase_line_id.order_id',
diff --git a/sf_manufacturing/models/product_template.py b/sf_manufacturing/models/product_template.py
index c9d3fc48..584399dc 100644
--- a/sf_manufacturing/models/product_template.py
+++ b/sf_manufacturing/models/product_template.py
@@ -35,7 +35,7 @@ class ResProductMo(models.Model):
model_volume = fields.Float('模型体积(m³)')
model_area = fields.Float('模型表面积(m²)')
model_machining_precision = fields.Selection(selection=_get_machining_precision, string='加工精度')
- model_processing_panel = fields.Char('模型加工面板')
+ model_processing_panel = fields.Char('模型加工面板', default='')
model_remark = fields.Char('模型备注说明')
length = fields.Float('长(mm)', digits=(16, 3))
width = fields.Float('宽(mm)', digits=(16, 3))
@@ -913,7 +913,7 @@ class ResProductMo(models.Model):
(item['model_height'] + embryo_redundancy_id.height))) if not blank_bool else (
item.get('blank_length') * item.get('blank_width') * item.get('blank_height')),
'product_model_type_id': model_type.id,
- 'model_processing_panel': item['processing_panel_detail'],
+ 'model_processing_panel': item['processing_panel_detail'] if item['processing_panel_detail'] else '',
'model_machining_precision': item['model_machining_precision'],
'model_code': item['barcode'],
'length': item['model_long'],
diff --git a/sf_manufacturing/models/stock.py b/sf_manufacturing/models/stock.py
index 4134de94..ba6e9d20 100644
--- a/sf_manufacturing/models/stock.py
+++ b/sf_manufacturing/models/stock.py
@@ -21,6 +21,7 @@ from odoo.addons.sf_base.commons.common import Common
from odoo.exceptions import UserError
from io import BytesIO
from odoo.exceptions import ValidationError
+from dateutil.relativedelta import relativedelta
class stockWarehouse(models.Model):
@@ -95,35 +96,36 @@ class StockRule(models.Model):
precision_rounding=proc[
0].product_uom.rounding) > 0)
list2 = []
- for item in procurements:
- num = int(item[0].product_qty)
+ for procurement, rule in procurements:
+ num = int(procurement.product_qty)
- product = self.env['product.product'].search(
- [("id", '=', item[0].product_id.id)])
- product_tmpl = self.env['product.template'].search(
- ["&", ("id", '=', product.product_tmpl_id.id), ('single_manufacturing', "!=", False)])
- if product_tmpl:
+ warehouse_id = rule.warehouse_id
+ if not warehouse_id:
+ warehouse_id = rule.location_dest_id.warehouse_id
+ manu_rule = rule.route_id.rule_ids.filtered(lambda r: r.action == 'manufacture' and r.warehouse_id == warehouse_id)
+
+ if procurement.product_id.product_tmpl_id.single_manufacturing and manu_rule:
if num > 1:
for no in range(1, num + 1):
Procurement = namedtuple('Procurement', ['product_id', 'product_qty',
'product_uom', 'location_id', 'name', 'origin',
'company_id',
'values'])
- s = Procurement(product_id=item[0].product_id, product_qty=1.0, product_uom=item[0].product_uom,
- location_id=item[0].location_id,
- name=item[0].name,
- origin=item[0].origin,
- company_id=item[0].company_id,
- values=item[0].values,
+ s = Procurement(product_id=procurement.product_id, product_qty=1.0, product_uom=procurement.product_uom,
+ location_id=procurement.location_id,
+ name=procurement.name,
+ origin=procurement.origin,
+ company_id=procurement.company_id,
+ values=procurement.values,
)
- item1 = list(item)
- item1[0] = s
+ # item1 = list(item)
+ # item1[0] = s
- list2.append(tuple(item1))
+ list2.append((s, rule))
else:
- list2.append(item)
+ list2.append((procurement, rule))
else:
- list2.append(item)
+ list2.append((procurement, rule))
for procurement, rule in list2:
procure_method = rule.procure_method
@@ -183,18 +185,6 @@ class StockRule(models.Model):
'''创建制造订单'''
productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
productions_values)
- # 将这一批制造订单的采购组根据成品设置为不同的采购组
- # product_group_id = {}
- # for index, production in enumerate(productions):
- # if production.product_id.id not in product_group_id.keys():
- # product_group_id[production.product_id.id] = production.procurement_group_id.id
- # else:
- # productions_values[index].update({'name': production.name})
- # procurement_group_vals = production._prepare_procurement_group_vals(productions_values[index])
- # production.procurement_group_id = self.env["procurement.group"].create(procurement_group_vals).id
-
- # self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
- # self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
'''
创建工单
@@ -738,6 +728,33 @@ class StockPicking(models.Model):
production.workorder_ids.write({'back_button_display': False})
return res
+ def _prepare_subcontract_mo_vals(self, subcontract_move, bom):
+ subcontract_move.ensure_one()
+ group = self.env['procurement.group'].sudo().search([('name', '=', self.name)])
+ if not group:
+ group = self.env['procurement.group'].create({
+ 'name': self.name,
+ 'partner_id': self.partner_id.id,
+ })
+ product = subcontract_move.product_id
+ warehouse = self._get_warehouse(subcontract_move)
+ vals = {
+ 'company_id': subcontract_move.company_id.id,
+ 'procurement_group_id': group.id,
+ 'subcontractor_id': subcontract_move.picking_id.partner_id.commercial_partner_id.id,
+ 'picking_ids': [subcontract_move.picking_id.id],
+ 'product_id': product.id,
+ 'product_uom_id': subcontract_move.product_uom.id,
+ 'bom_id': bom.id,
+ 'location_src_id': subcontract_move.picking_id.partner_id.with_company(subcontract_move.company_id).property_stock_subcontractor.id,
+ 'location_dest_id': subcontract_move.picking_id.partner_id.with_company(subcontract_move.company_id).property_stock_subcontractor.id,
+ 'product_qty': subcontract_move.product_uom_qty,
+ 'picking_type_id': warehouse.subcontracting_type_id.id,
+ 'date_planned_start': subcontract_move.date - relativedelta(days=product.produce_delay)
+ }
+ return vals
+
+
# 创建 外协出库入单
def create_outcontract_picking(self, workorders, item, sorted_workorders):
production = workorders[0].production_id
@@ -1216,6 +1233,20 @@ class ReStockMove(models.Model):
res['lot_id'] = self.subcontract_workorder_id.production_id.move_raw_ids.move_line_ids[0].lot_id.id
return res
+ def _get_subcontract_bom(self):
+ self.ensure_one()
+ purchase_type = getattr(self.picking_id.purchase_id, 'purchase_type', False)
+ if purchase_type:
+ self = self.with_context(stock_picking=purchase_type)
+ bom = self.env['mrp.bom'].sudo()._bom_subcontract_find(
+ self.product_id,
+ picking_type=self.picking_type_id,
+ company_id=self.company_id.id,
+ bom_type='subcontract',
+ subcontractor=self.picking_id.partner_id
+ )
+ return bom
+
class ReStockQuant(models.Model):
_inherit = 'stock.quant'
diff --git a/sf_mrs_connect/models/__init__.py b/sf_mrs_connect/models/__init__.py
index f01fb4fe..01498b21 100644
--- a/sf_mrs_connect/models/__init__.py
+++ b/sf_mrs_connect/models/__init__.py
@@ -1,4 +1,4 @@
from . import ftp_operate
from . import res_config_setting
from . import sync_common
-from . import order_price
\ No newline at end of file
+from . import order_price
diff --git a/sf_quality/data/insepection_report_template.xml b/sf_quality/data/insepection_report_template.xml
index 263afc9d..001a9a84 100644
--- a/sf_quality/data/insepection_report_template.xml
+++ b/sf_quality/data/insepection_report_template.xml
@@ -200,11 +200,11 @@
-->
-
-
-
-
+
+
+
+
@@ -329,9 +329,11 @@
-->
-
-
-
+
+
+
+
+
diff --git a/sf_quality/models/stock.py b/sf_quality/models/stock.py
index add80f8a..7b70b77a 100644
--- a/sf_quality/models/stock.py
+++ b/sf_quality/models/stock.py
@@ -1,59 +1,180 @@
+import logging
+
from odoo import api, models
+from odoo.exceptions import ValidationError, UserError
class StockPicking(models.Model):
_inherit = 'stock.picking'
+ def _compute_check(self):
+ super()._compute_check()
+ for picking in self:
+ picking_to_quality = picking.get_picking_to_quality()
+ if not picking_to_quality:
+ picking.quality_check_todo = False
+ break
+ else:
+ need_quality_line = picking.get_need_quality_line(picking_to_quality)
+ if not need_quality_line or all(not line.get('need_done_check_ids') for line in need_quality_line):
+ picking.quality_check_todo = False
+
+ def check_quality(self):
+ self.ensure_one()
+ # checkable_products = self.mapped('move_line_ids').mapped('product_id')
+ # checks = self.check_ids.filtered(lambda check: check.quality_state == 'none' and (
+ # check.product_id in checkable_products or check.measure_on == 'operation'))
+ checks = self.env['quality.check']
+ picking_to_quality = self._get_picking_to_quality()
+ need_quality_line = self.get_need_quality_line(picking_to_quality)
+ if need_quality_line and any(line.get('need_done_check_ids') for line in need_quality_line):
+ for item in need_quality_line:
+ checks += item.get('need_done_check_ids')
+ if checks:
+ return checks.action_open_quality_check_wizard()
+ return False
+
def button_validate(self):
- """
+ """=
出厂检验报告上传
"""
out_quality_checks = self.env['quality.check'].search(
- [('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告')])
+ [('picking_id', '=', self.id), ('test_type_id.name', '=', '出厂检验报告'),
+ ('quality_state', '=', 'pass')])
# out_quality_checks 可能存在多个
if out_quality_checks:
for out_quality_check in out_quality_checks:
if not out_quality_check.is_factory_report_uploaded:
if out_quality_check and self.state == 'assigned':
out_quality_check.upload_factory_report()
+ quality_action = self.pinking_checkout_quality()
+ if quality_action:
+ return quality_action
+ res = super(StockPicking, self).button_validate()
+ return res
+ def pinking_checkout_quality(self):
"""
调拨单若关联了质量检查单，验证调拨单时，应校验是否有不合格品，若存在，应弹窗提示：
“警告：存在不合格产品XXXX n 件、YYYYY m件，继续调拨请点“确认”，否则请取消？”
"""
- context = self.env.context
- if not context.get('again_validate') and self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail'):
- # 回滚事务，为二次确认/取消做准备
- self.env.cr.rollback()
- quality_check_ids = self.quality_check_ids.filtered(lambda qc: qc.quality_state == 'fail')
- product_list = list(set([quality_check_id.product_id for quality_check_id in quality_check_ids]))
- fail_check_text = ''
- for product_id in product_list:
- check_ids = quality_check_ids.filtered(lambda qc: qc.product_id == product_id)
- if all(check_id.measure_on == 'move_line' for check_id in check_ids):
- number = sum(check_ids.mapped('qty_line'))
- else:
- number = sum(self.move_ids_without_package.filtered(
- lambda ml: ml.product_id == product_id).mapped('quantity_done'))
- if number == 0:
- number = sum(self.move_ids_without_package.filtered(
- lambda ml: ml.product_id == product_id).mapped('reserved_availability'))
- if number == 0:
- number = sum(self.move_ids_without_package.filtered(
- lambda ml: ml.product_id == product_id).mapped('product_uom_qty'))
- fail_check_text = (f'{fail_check_text}、{product_id.display_name} {number}件'
- if fail_check_text != '' else f'{product_id.display_name} {number}件')
- return {
- 'type': 'ir.actions.act_window',
- 'res_model': 'picking.validate.check.wizard',
- 'name': '质检不合格提示',
- 'view_mode': 'form',
- 'target': 'new',
- 'context': {
- 'default_picking_id': self.id,
- 'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
- 'again_validate': True}
- }
- res = super(StockPicking, self).button_validate()
+ try:
+ self.ensure_one()
+ context = self.env.context
+ if not context.get('pinking_checkout_quality'):
+ picking_to_quality = self._get_picking_to_quality()
+ if not picking_to_quality: return False
+ need_quality_val = self.get_need_quality_line(picking_to_quality)
+ if any(line.get('fail_check_ids') for line in need_quality_val):
+ # 回滚事务，为二次确认/取消做准备
+ self.env.cr.rollback()
+ # 获取存在失败的 质检单 调拨单明细行
+ check_list = [item for item in need_quality_val if item.get('fail_check_ids')]
+ fail_check_text = ''
+ for item in check_list:
+ move_id, pre_done_qty = item.get('move_id'), item.get('pre_done_qty')
+ fail_check_text = (f'{fail_check_text}、{move_id.product_id.display_name} {pre_done_qty}件'
+ if fail_check_text != '' else f'{move_id.product_id.display_name} {pre_done_qty}件')
+ return {
+ 'type': 'ir.actions.act_window',
+ 'res_model': 'picking.validate.check.wizard',
+ 'name': '质检不合格提示',
+ 'view_mode': 'form',
+ 'target': 'new',
+ 'context': {
+ 'default_picking_id': self.id,
+ 'default_fail_check_text': f'警告：存在不合格产品{fail_check_text}，继续调拨请点“确认”，否则请取消？',
+ 'pinking_checkout_quality': True}
+ }
+ else:
+ return False
+ except Exception as e:
+ logging.info('pinking_checkout_quality()方法报错：%s' % e)
+ raise ValidationError('调拨单验证质检单是否合格时报错,请联系管理员处理！！')
+
+ def get_need_quality_line(self, picking_to_quality):
+ """
+ # 对需要进行质检，还没有质检完成的明细行进行统计
+ # 1、当【质量标准_控制方式】=“产品、作业”，仅校验“预完成数量”>0的产品行对应的质检单必须处理。
+ 2、当【质量标准_控制方式】=“数量”时，仅校验“预完成数量”>0的产品行对应的质检单必须处理：
+ 1）每一类的“总单数”=【调拨单_需求】时，则已处理的质检单“单数”≥“预完成数量”时，可执行调拨单验证；
+ 2）每一类的“总单数”<【调拨单_需求】时，则已处理的质检单“单数”≥0时，可执行调拨单验证；
+ """
+ res = []
+ for item in picking_to_quality:
+ need_done_check_ids = self.env['quality.check']
+ fail_check_ids = self.env['quality.check']
+ move_id, pre_done_qty, check_ids = item.values()
+ check_ids_1 = check_ids.filtered(lambda qc: qc.measure_on in ('operation', 'product'))
+ if check_ids_1:
+ check_ids_1_done = check_ids_1.filtered(lambda qc: qc.quality_state in ('pass', 'fail'))
+ check_ids_1_fail = check_ids_1.filtered(lambda qc: qc.quality_state == 'fail')
+ check_ids_1_none = check_ids_1.filtered(lambda qc: qc.quality_state == 'none')
+ if check_ids_1 and not check_ids_1_done:
+ need_done_check_ids += check_ids_1_none
+ if check_ids_1_fail:
+ fail_check_ids += check_ids_1_fail
+
+ check_ids_2 = check_ids.filtered(lambda qc: qc.measure_on == 'move_line')
+ if check_ids_2:
+ check_ids_2_done = check_ids_2.filtered(lambda qc: qc.quality_state in ('pass', 'fail'))
+ check_ids_2_fail = check_ids_2.filtered(lambda qc: qc.quality_state == 'fail')
+ check_ids_2_none = check_ids_2.filtered(lambda qc: qc.quality_state == 'none')
+ # 每一类的“总单数”=【调拨单_需求】时，则已处理的质检单“单数”≥“预完成数量”时，可执行调拨单验证；
+ if len(check_ids_2) >= move_id.product_uom_qty and len(check_ids_2_done) < pre_done_qty:
+ need_done_check_ids += check_ids_2_none
+ # 每一类的“总单数”<【调拨单_需求】时，则已处理的质检单“单数”≥0时，可执行调拨单验证
+ elif len(check_ids_2) < move_id.product_uom_qty and len(check_ids_2_done) == 0:
+ need_done_check_ids += check_ids_2_none
+ if check_ids_2_fail:
+ fail_check_ids += check_ids_2_fail
+
+ if need_done_check_ids or fail_check_ids:
+ res.append({'move_id': move_id,
+ 'pre_done_qty': pre_done_qty,
+ 'check_ids': check_ids,
+ 'fail_check_ids': fail_check_ids,
+ 'need_done_check_ids': need_done_check_ids})
return res
+
+ def get_picking_to_quality(self):
+ self.ensure_one()
+ return self._get_picking_to_quality()
+
+ def _get_picking_to_quality(self):
+ """
+ 对需要质检的明细行进行统计(针对“预完成数量”>0的行)
+ """
+ quality_piking_line_list = []
+ pre_done_qty_lines = self._get_pinking_pre_done_qty()
+ for line in pre_done_qty_lines:
+ move_id, pre_done_qty = line.values()
+ if pre_done_qty == 0:
+ continue
+ product_id = move_id.product_id
+ check_ids = self.check_ids.filtered(lambda c: c.product_id == product_id)
+ quality_piking_line_list.append({'move_id': move_id, 'pre_done_qty': pre_done_qty, 'check_ids': check_ids})
+ return quality_piking_line_list
+
+ def _get_pinking_pre_done_qty(self):
+ """
+ return: 明细行 及 预完成数量
+ 1、若调拨单所有明细行的【完成】=0，且任意行的【预留】<【需求】，则验证时将会话是否需创建欠单。
+ ---->此时“预完成数量”=【预留】
+ 2、若调拨单任意行的0<【完成】<【需求】，且则验证时将会话是否需创建欠单
+ ---->此时“预完成数量”=【完成】
+ """
+ # if all(move_id.quantity_done == 0 for move_id in self.move_ids_without_package):
+ # pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.reserved_availability} for move_id in
+ # self.move_ids_without_package]
+ # else:
+ # pre_done_qty = [{'move_id': move_id, 'pre_done_qty': move_id.quantity_done} for move_id in
+ # self.move_ids_without_package]
+ pre_done_qty = []
+ for move_id in self.move_ids_without_package:
+ if move_id.quantity_done > 0:
+ pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.quantity_done})
+ else:
+ pre_done_qty.append({'move_id': move_id, 'pre_done_qty': move_id.reserved_availability})
+ return pre_done_qty