新增根据模型类型计算出产品的胚料尺寸
This commit is contained in:
@@ -7,40 +7,42 @@ from odoo.addons.stock.models.stock_rule import ProcurementException
|
||||
from odoo.tools import float_compare, OrderedSet
|
||||
|
||||
|
||||
class StockRule(models.Model):
|
||||
class ReStockRule(models.Model):
|
||||
_inherit = 'stock.rule'
|
||||
|
||||
def _run_manufacture(self, procurements):
|
||||
productions_values_by_company = defaultdict(list)
|
||||
errors = []
|
||||
for procurement, rule in procurements:
|
||||
if float_compare(procurement.product_qty, 0, precision_rounding=procurement.product_uom.rounding) <= 0:
|
||||
# If procurement contains negative quantity, don't create a MO that would be for a negative value.
|
||||
continue
|
||||
bom = rule._get_matching_bom(procurement.product_id, procurement.company_id, procurement.values)
|
||||
|
||||
def _run_manufacture(self, procurements):
|
||||
productions_values_by_company = defaultdict(list)
|
||||
errors = []
|
||||
for procurement, rule in procurements:
|
||||
if float_compare(procurement.product_qty, 0, precision_rounding=procurement.product_uom.rounding) <= 0:
|
||||
# If procurement contains negative quantity, don't create a MO that would be for a negative value.
|
||||
continue
|
||||
bom = rule._get_matching_bom(procurement.product_id, procurement.company_id, procurement.values)
|
||||
productions_values_by_company[procurement.company_id.id].append(rule._prepare_mo_vals(*procurement, bom))
|
||||
|
||||
productions_values_by_company[procurement.company_id.id].append(rule._prepare_mo_vals(*procurement, bom))
|
||||
if errors:
|
||||
raise ProcurementException(errors)
|
||||
|
||||
if errors:
|
||||
raise ProcurementException(errors)
|
||||
for company_id, productions_values in productions_values_by_company.items():
|
||||
# create the MO as SUPERUSER because the current user may not have the rights to do it (mto product launched by a sale for example)
|
||||
productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
|
||||
productions_values)
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
|
||||
print(productions.product_id.processing_panel)
|
||||
# 查出产品的加工面板并对根据面板的数量循环生成工序
|
||||
for k in (productions.product_id.processing_panel.split(',')):
|
||||
print(productions.product_id.model_type_id.routing_tmpl_id)
|
||||
for j in productions.product_id.model_type_id.routing_tmpl_id:
|
||||
productions._create_workorder()
|
||||
productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
|
||||
(
|
||||
p.move_dest_ids.procure_method != 'make_to_order' and not p.move_raw_ids and not p.workorder_ids)).action_confirm()
|
||||
|
||||
for company_id, productions_values in productions_values_by_company.items():
|
||||
# create the MO as SUPERUSER because the current user may not have the rights to do it (mto product launched by a sale for example)
|
||||
productions = self.env['mrp.production'].with_user(SUPERUSER_ID).sudo().with_company(company_id).create(
|
||||
productions_values)
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
|
||||
self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
|
||||
# 查出产品的加工面板并对根据面板的数量循环生成工序
|
||||
|
||||
productions._create_workorder()
|
||||
productions.filtered(lambda p: (not p.orderpoint_id and p.move_raw_ids) or \
|
||||
(
|
||||
p.move_dest_ids.procure_method != 'make_to_order' and not p.move_raw_ids and not p.workorder_ids)).action_confirm()
|
||||
|
||||
for production in productions:
|
||||
origin_production = production.move_dest_ids and production.move_dest_ids[
|
||||
0].raw_material_production_id or False
|
||||
for production in productions:
|
||||
origin_production = production.move_dest_ids and production.move_dest_ids[
|
||||
0].raw_material_production_id or False
|
||||
orderpoint = production.orderpoint_id
|
||||
if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
|
||||
production.message_post(
|
||||
@@ -57,7 +59,7 @@ def _run_manufacture(self, procurements):
|
||||
'mail.message_origin_link',
|
||||
values={'self': production, 'origin': origin_production},
|
||||
subtype_id=self.env.ref('mail.mt_note').id)
|
||||
return True
|
||||
return True
|
||||
|
||||
|
||||
class ResMrpWorkOrder(models.Model):
|
||||
@@ -66,16 +68,6 @@ class ResMrpWorkOrder(models.Model):
|
||||
workcenter_id = fields.Many2one('mrp.workcenter', required=False)
|
||||
processing_panel = fields.Char('加工面')
|
||||
|
||||
@api.model_create_multi
|
||||
def create(self, values):
|
||||
res = super().create(values)
|
||||
if self.env.context.get('skip_confirm'):
|
||||
return res
|
||||
to_confirm = res.filtered(lambda wo: wo.production_id.state in ("confirmed", "progress", "to_close"))
|
||||
to_confirm = to_confirm.production_id.workorder_ids
|
||||
to_confirm._action_confirm()
|
||||
return res
|
||||
|
||||
def _action_confirm(self):
|
||||
workorders_by_production = defaultdict(lambda: self.env['mrp.workorder'])
|
||||
for workorder in self:
|
||||
|
||||
Reference in New Issue
Block a user