工单优化更新
This commit is contained in:
gqh
@@ -203,115 +203,51 @@ class StockRule(models.Model):
|
||||
|
||||
return True
|
||||
|
||||
# @api.model
|
||||
# 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)
|
||||
#
|
||||
# product = self.env['product.template'].search(
|
||||
# ["&", ("id", '=', procurement.product_id.id), ('single_manufacturing', '!=', False)])
|
||||
# if not product:
|
||||
# productions_values_by_company[procurement.company_id.id].append(
|
||||
# rule._prepare_mo_vals1(*procurement, bom))
|
||||
# else:
|
||||
# orders_vals = rule._prepare_mo_vals(*procurement, bom)
|
||||
#
|
||||
# if isinstance(orders_vals, list):
|
||||
# for vals in orders_vals:
|
||||
# productions_values_by_company[procurement.company_id.id].append(vals)
|
||||
# else:
|
||||
# productions_values_by_company[procurement.company_id.id].append(orders_vals)
|
||||
#
|
||||
# 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)
|
||||
# a = self.env['stock.move'].sudo().create(productions._get_moves_raw_values())
|
||||
# b = self.env['stock.move'].sudo().create(productions._get_moves_finished_values())
|
||||
# c = 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
|
||||
# orderpoint = production.orderpoint_id
|
||||
# if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
|
||||
# production.message_post(
|
||||
# body=_('This production order has been created from Replenishment Report.'),
|
||||
# message_type='comment',
|
||||
# subtype_xmlid='mail.mt_note')
|
||||
# elif orderpoint:
|
||||
# production.message_post_with_view(
|
||||
# 'mail.message_origin_link',
|
||||
# values={'self': production, 'origin': orderpoint},
|
||||
# subtype_id=self.env.ref('mail.mt_note').id)
|
||||
# elif origin_production:
|
||||
# production.message_post_with_view(
|
||||
# 'mail.message_origin_link',
|
||||
# values={'self': production, 'origin': origin_production},
|
||||
# subtype_id=self.env.ref('mail.mt_note').id)
|
||||
# return True
|
||||
#
|
||||
# def _prepare_mo_vals1(self, product_id, product_qty, product_uom, location_id, name, origin, company_id, values,
|
||||
# bom):
|
||||
# date_planned = self._get_date_planned(product_id, company_id, values)
|
||||
# date_deadline = values.get('date_deadline') or date_planned + relativedelta(
|
||||
# days=company_id.manufacturing_lead) + relativedelta(days=product_id.produce_delay)
|
||||
# mo_values = {
|
||||
# 'origin': origin,
|
||||
# 'product_id': product_id.id,
|
||||
# 'product_description_variants': values.get('product_description_variants'),
|
||||
# 'product_qty': product_qty,
|
||||
# 'product_uom_id': product_uom.id,
|
||||
# 'location_src_id': self.location_src_id.id or self.picking_type_id.default_location_src_id.id or location_id.id,
|
||||
# 'location_dest_id': location_id.id,
|
||||
# 'bom_id': bom.id,
|
||||
# 'date_deadline': date_deadline,
|
||||
# 'date_planned_start': date_planned,
|
||||
# 'date_planned_finished': fields.Datetime.from_string(values['date_planned']),
|
||||
# 'procurement_group_id': False,
|
||||
# 'propagate_cancel': self.propagate_cancel,
|
||||
# 'orderpoint_id': values.get('orderpoint_id', False) and values.get('orderpoint_id').id,
|
||||
# 'picking_type_id': self.picking_type_id.id or values['warehouse_id'].manu_type_id.id,
|
||||
# 'company_id': company_id.id,
|
||||
# 'move_dest_ids': values.get('move_dest_ids') and [(4, x.id) for x in values['move_dest_ids']] or False,
|
||||
# 'user_id': False,
|
||||
# }
|
||||
# # Use the procurement group created in _run_pull mrp override
|
||||
# # Preserve the origin from the original stock move, if available
|
||||
# if location_id.warehouse_id.manufacture_steps == 'pbm_sam' and values.get('move_dest_ids') and values.get(
|
||||
# 'group_id') and values['move_dest_ids'][0].origin != values['group_id'].name:
|
||||
# origin = values['move_dest_ids'][0].origin
|
||||
# mo_values.update({
|
||||
# 'name': values['group_id'].name,
|
||||
# 'procurement_group_id': values['group_id'].id,
|
||||
# 'origin': origin,
|
||||
# })
|
||||
# return mo_values
|
||||
#
|
||||
# def _prepare_mo_vals(self, product_id, product_qty, product_uom, location_id, name, origin, company_id, values,
|
||||
# bom):
|
||||
#
|
||||
# mo_lists = []
|
||||
# for num in range(1, int(product_qty) + 1):
|
||||
# vals = super(StockRule, self)._prepare_mo_vals(product_id, 1.0, product_uom, location_id, name, origin,
|
||||
# company_id, values,
|
||||
# bom)
|
||||
# vals.update({
|
||||
# # 'name': values['group_id'].name,
|
||||
# 'procurement_group_id': values['group_id'].id,
|
||||
# # 'origin': origin,
|
||||
# })
|
||||
# mo_lists.append(vals)
|
||||
#
|
||||
# return mo_lists
|
||||
@api.model
|
||||
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))
|
||||
|
||||
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())
|
||||
productions._create_workorder()
|
||||
productions.lot_producing_id._get_next_serial(productions.company_id,productions.product_id)
|
||||
productions.action_generate_serial()
|
||||
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
|
||||
orderpoint = production.orderpoint_id
|
||||
if orderpoint and orderpoint.create_uid.id == SUPERUSER_ID and orderpoint.trigger == 'manual':
|
||||
production.message_post(
|
||||
body=_('This production order has been created from Replenishment Report.'),
|
||||
message_type='comment',
|
||||
subtype_xmlid='mail.mt_note')
|
||||
elif orderpoint:
|
||||
production.message_post_with_view(
|
||||
'mail.message_origin_link',
|
||||
values={'self': production, 'origin': orderpoint},
|
||||
subtype_id=self.env.ref('mail.mt_note').id)
|
||||
elif origin_production:
|
||||
production.message_post_with_view(
|
||||
'mail.message_origin_link',
|
||||
values={'self': production, 'origin': origin_production},
|
||||
subtype_id=self.env.ref('mail.mt_note').id)
|
||||
return True
|
||||
Reference in New Issue
Block a user