回退工艺外协代码
This commit is contained in:
胡尧
@@ -18,4 +18,4 @@ from . import quick_easy_order
|
||||
from . import purchase_order
|
||||
from . import quality_check
|
||||
from . import purchase_request_line
|
||||
from . import stock_warehouse_orderpoint
|
||||
# from . import stock_warehouse_orderpoint
|
||||
@@ -900,41 +900,41 @@ class MrpProduction(models.Model):
|
||||
for workorder in production.workorder_ids:
|
||||
workorder.duration_expected = workorder._get_duration_expected()
|
||||
|
||||
def _create_subcontract_purchase_request(self, purchase_request_line):
|
||||
sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
|
||||
grouped_purchase_request_line = {
|
||||
k: list(g)
|
||||
for k, g in groupby(sorted_list, key=itemgetter('name'))
|
||||
}
|
||||
for name, request_line in grouped_purchase_request_line.items():
|
||||
request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
|
||||
grouped_purchase_request_line_sorted_list = {
|
||||
k: list(g)
|
||||
for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
|
||||
}
|
||||
purchase_request_model = self.env["purchase.request"]
|
||||
origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
|
||||
pr = purchase_request_model.create({
|
||||
"origin": origin,
|
||||
"company_id": self.company_id.id,
|
||||
"picking_type_id": self.env.ref('stock.picking_type_in').id,
|
||||
"group_id": request_line[0].get('group_id'),
|
||||
"requested_by": self.env.context.get("uid", self.env.uid),
|
||||
"assigned_to": False,
|
||||
"bom_id": self[0].bom_id.id,
|
||||
"is_subcontract":True,
|
||||
})
|
||||
self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
|
||||
'sf_stock.stock_route_process_outsourcing').id)]
|
||||
for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
|
||||
cur_request_line = request_line_list[0]
|
||||
# cur_request_line['product_qty'] = cur_request_line['product_qty']
|
||||
cur_request_line['request_id'] = pr.id
|
||||
cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
|
||||
cur_request_line.pop('group_id', None)
|
||||
cur_request_line.pop('production_name', None)
|
||||
self.env["purchase.request.line"].create(cur_request_line)
|
||||
pr.button_approved()
|
||||
# def _create_subcontract_purchase_request(self, purchase_request_line):
|
||||
# sorted_list = sorted(purchase_request_line, key=itemgetter('name'))
|
||||
# grouped_purchase_request_line = {
|
||||
# k: list(g)
|
||||
# for k, g in groupby(sorted_list, key=itemgetter('name'))
|
||||
# }
|
||||
# for name, request_line in grouped_purchase_request_line.items():
|
||||
# request_line_sorted_list = sorted(request_line, key=itemgetter('product_id'))
|
||||
# grouped_purchase_request_line_sorted_list = {
|
||||
# k: list(g)
|
||||
# for k, g in groupby(request_line_sorted_list, key=itemgetter('product_id'))
|
||||
# }
|
||||
# purchase_request_model = self.env["purchase.request"]
|
||||
# origin = ", ".join({item['production_name'] for item in request_line_sorted_list if item.get('production_name')})
|
||||
# pr = purchase_request_model.create({
|
||||
# "origin": origin,
|
||||
# "company_id": self.company_id.id,
|
||||
# "picking_type_id": self.env.ref('stock.picking_type_in').id,
|
||||
# "group_id": request_line[0].get('group_id'),
|
||||
# "requested_by": self.env.context.get("uid", self.env.uid),
|
||||
# "assigned_to": False,
|
||||
# "bom_id": self[0].bom_id.id,
|
||||
# "is_subcontract":True,
|
||||
# })
|
||||
# self[0].bom_id.bom_line_ids.product_id.route_ids = [(4,self.env.ref(
|
||||
# 'sf_stock.stock_route_process_outsourcing').id)]
|
||||
# for product_id, request_line_list in grouped_purchase_request_line_sorted_list.items():
|
||||
# cur_request_line = request_line_list[0]
|
||||
# # cur_request_line['product_qty'] = cur_request_line['product_qty']
|
||||
# cur_request_line['request_id'] = pr.id
|
||||
# cur_request_line['origin'] = ", ".join({item['production_name'] for item in request_line_list if item.get('production_name')})
|
||||
# cur_request_line.pop('group_id', None)
|
||||
# cur_request_line.pop('production_name', None)
|
||||
# self.env["purchase.request.line"].create(cur_request_line)
|
||||
# pr.button_approved()
|
||||
|
||||
# 外协出入库单处理
|
||||
def get_subcontract_pick_purchase(self):
|
||||
@@ -962,14 +962,14 @@ class MrpProduction(models.Model):
|
||||
if not sorted_workorders:
|
||||
return
|
||||
for workorders in reversed(sorted_workorders):
|
||||
# self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
|
||||
# self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
|
||||
purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
|
||||
workorders, production)
|
||||
all_workorders += workorders
|
||||
self._create_subcontract_purchase_request(purchase_request_line)
|
||||
for workorder in all_workorders:
|
||||
workorder._compute_pr_mp_count()
|
||||
self.env['stock.picking'].create_outcontract_picking(workorders, production, sorted_workorders)
|
||||
self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)
|
||||
# purchase_request_line = purchase_request_line + self.env['purchase.order'].get_purchase_request(
|
||||
# workorders, production)
|
||||
# all_workorders += workorders
|
||||
# self._create_subcontract_purchase_request(purchase_request_line)
|
||||
# for workorder in all_workorders:
|
||||
# workorder._compute_pr_mp_count()
|
||||
# 工单排序
|
||||
def _reset_work_order_sequence1(self, k):
|
||||
for rec in self:
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
import logging
|
||||
from odoo import fields, models, api
|
||||
from odoo.exceptions import UserError
|
||||
from odoo.tools import str2bool
|
||||
# from odoo.tools import str2bool
|
||||
|
||||
|
||||
class ResMrpRoutingWorkcenter(models.Model):
|
||||
@@ -25,20 +25,20 @@ class ResMrpRoutingWorkcenter(models.Model):
|
||||
workcenter_ids = fields.Many2many('mrp.workcenter', 'rel_workcenter_route', required=True)
|
||||
bom_id = fields.Many2one('mrp.bom', required=False)
|
||||
surface_technics_id = fields.Many2one('sf.production.process', string="表面工艺")
|
||||
optional_process_parameters = fields.One2many('sf.production.process.parameter','routing_id',string='可选工艺参数')
|
||||
# optional_process_parameters = fields.One2many('sf.production.process.parameter','routing_id',string='可选工艺参数')
|
||||
reserved_duration = fields.Float('预留时长', default=30, tracking=True)
|
||||
is_outsource = fields.Boolean('外协', default=False)
|
||||
individuation_page_ids = fields.Many2many('sf.work.individuation.page', string='个性化记录')
|
||||
|
||||
@api.onchange('surface_technics_id')
|
||||
def optional_process_parameters_date(self):
|
||||
for record in self:
|
||||
if not record.surface_technics_id:
|
||||
continue
|
||||
parameter_ids = self.env['sf.production.process.parameter'].search([
|
||||
('process_id', '=', record.surface_technics_id.id),
|
||||
])
|
||||
record.optional_process_parameters = parameter_ids.ids
|
||||
# @api.onchange('surface_technics_id')
|
||||
# def optional_process_parameters_date(self):
|
||||
# for record in self:
|
||||
# if not record.surface_technics_id:
|
||||
# continue
|
||||
# parameter_ids = self.env['sf.production.process.parameter'].search([
|
||||
# ('process_id', '=', record.surface_technics_id.id),
|
||||
# ])
|
||||
# record.optional_process_parameters = parameter_ids.ids
|
||||
|
||||
# @api.model
|
||||
# def _auto_init(self):
|
||||
|
||||
@@ -21,16 +21,16 @@ class ResWorkcenter(models.Model):
|
||||
related='equipment_id.production_line_id', store=True)
|
||||
is_process_outsourcing = fields.Boolean('工艺外协')
|
||||
users_ids = fields.Many2many("res.users", 'users_workcenter', tracking=True)
|
||||
@api.constrains('name')
|
||||
def _check_unique_name_code(self):
|
||||
for record in self:
|
||||
# 检查是否已经存在相同的 name 和 code 组合
|
||||
existing = self.search([
|
||||
('name', '=', record.name),
|
||||
('id', '!=', record.id) # 排除当前记录
|
||||
])
|
||||
if existing:
|
||||
raise ValueError('记录已存在')
|
||||
# @api.constrains('name')
|
||||
# def _check_unique_name_code(self):
|
||||
# for record in self:
|
||||
# # 检查是否已经存在相同的 name 和 code 组合
|
||||
# existing = self.search([
|
||||
# ('name', '=', record.name),
|
||||
# ('id', '!=', record.id) # 排除当前记录
|
||||
# ])
|
||||
# if existing:
|
||||
# raise ValueError('记录已存在')
|
||||
def write(self, vals):
|
||||
if 'users_ids' in vals:
|
||||
old_users = self.users_ids
|
||||
|
||||
@@ -70,21 +70,21 @@ class ResMrpWorkOrder(models.Model):
|
||||
delivery_warning = fields.Selection([('normal', '正常'), ('warning', '告警'), ('overdue', '逾期')], string='时效',
|
||||
tracking=True)
|
||||
back_button_display = fields.Boolean(default=False, compute='_compute_back_button_display', store=True)
|
||||
pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
|
||||
# pr_mp_count = fields.Integer('采购申请单数量', compute='_compute_pr_mp_count', store=True)
|
||||
|
||||
@api.depends('state')
|
||||
def _compute_pr_mp_count(self):
|
||||
for item in self:
|
||||
if not item.is_subcontract:
|
||||
item.pr_mp_count = 0
|
||||
continue
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
('state', '!=', 'rejected')])
|
||||
if pr_ids:
|
||||
item.pr_mp_count = len(pr_ids)
|
||||
else:
|
||||
item.pr_mp_count = 0
|
||||
# @api.depends('state')
|
||||
# def _compute_pr_mp_count(self):
|
||||
# for item in self:
|
||||
# if not item.is_subcontract:
|
||||
# item.pr_mp_count = 0
|
||||
# continue
|
||||
# pr_ids = self.env['purchase.request'].sudo().search(
|
||||
# [('origin', 'like', item.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
# ('state', '!=', 'rejected')])
|
||||
# if pr_ids:
|
||||
# item.pr_mp_count = len(pr_ids)
|
||||
# else:
|
||||
# item.pr_mp_count = 0
|
||||
|
||||
@api.depends('state')
|
||||
def _compute_back_button_display(self):
|
||||
@@ -444,11 +444,11 @@ class ResMrpWorkOrder(models.Model):
|
||||
def _compute_surface_technics_purchase_ids(self):
|
||||
for order in self:
|
||||
if order.routing_type == '表面工艺' and order.state not in ['cancel']:
|
||||
# domain = [('group_id', '=', self.production_id.procurement_group_id.id),
|
||||
# ('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
|
||||
domain = [('purchase_type', '=', 'consignment'),
|
||||
('origin', 'like', '%' + self.production_id.name + '%'),
|
||||
('state', '!=', 'cancel')]
|
||||
domain = [('group_id', '=', self.production_id.procurement_group_id.id),
|
||||
('purchase_type', '=', 'consignment'), ('state', '!=', 'cancel')]
|
||||
# domain = [('purchase_type', '=', 'consignment'),
|
||||
# ('origin', 'like', '%' + self.production_id.name + '%'),
|
||||
# ('state', '!=', 'cancel')]
|
||||
purchase = self.env['purchase.order'].search(domain)
|
||||
order.surface_technics_purchase_count = 0
|
||||
if not purchase:
|
||||
@@ -461,30 +461,30 @@ class ResMrpWorkOrder(models.Model):
|
||||
else:
|
||||
order.surface_technics_purchase_count = 0
|
||||
|
||||
def action_view_pr_mrp_workorder(self):
|
||||
"""
|
||||
采购请求
|
||||
"""
|
||||
self.ensure_one()
|
||||
pr_ids = self.env['purchase.request'].sudo().search(
|
||||
[('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
('state', '!=', 'rejected')])
|
||||
action = {
|
||||
'res_model': 'purchase.request',
|
||||
'type': 'ir.actions.act_window',
|
||||
}
|
||||
if len(pr_ids) == 1:
|
||||
action.update({
|
||||
'view_mode': 'form',
|
||||
'res_id': pr_ids[0].id,
|
||||
})
|
||||
else:
|
||||
action.update({
|
||||
'name': _("从 %s生成采购请求单", self.name),
|
||||
'domain': [('id', 'in', pr_ids)],
|
||||
'view_mode': 'tree,form',
|
||||
})
|
||||
return action
|
||||
# def action_view_pr_mrp_workorder(self):
|
||||
# """
|
||||
# 采购请求
|
||||
# """
|
||||
# self.ensure_one()
|
||||
# pr_ids = self.env['purchase.request'].sudo().search(
|
||||
# [('origin', 'like', self.production_id.name), ('is_subcontract', '=', 'True'),
|
||||
# ('state', '!=', 'rejected')])
|
||||
# action = {
|
||||
# 'res_model': 'purchase.request',
|
||||
# 'type': 'ir.actions.act_window',
|
||||
# }
|
||||
# if len(pr_ids) == 1:
|
||||
# action.update({
|
||||
# 'view_mode': 'form',
|
||||
# 'res_id': pr_ids[0].id,
|
||||
# })
|
||||
# else:
|
||||
# action.update({
|
||||
# 'name': _("从 %s生成采购请求单", self.name),
|
||||
# 'domain': [('id', 'in', pr_ids)],
|
||||
# 'view_mode': 'tree,form',
|
||||
# })
|
||||
# return action
|
||||
|
||||
def action_view_surface_technics_purchase(self):
|
||||
self.ensure_one()
|
||||
@@ -1245,12 +1245,12 @@ class ResMrpWorkOrder(models.Model):
|
||||
}]
|
||||
return workorders_values_str
|
||||
|
||||
def check_lot_exists(self, picking_id, lot_id):
|
||||
return bool(
|
||||
picking_id.move_ids.move_line_ids.filtered(
|
||||
lambda line: line.lot_id.id == lot_id
|
||||
)
|
||||
)
|
||||
# def check_lot_exists(self, picking_id, lot_id):
|
||||
# return bool(
|
||||
# picking_id.move_ids.move_line_ids.filtered(
|
||||
# lambda line: line.lot_id.id == lot_id
|
||||
# )
|
||||
# )
|
||||
|
||||
def _process_compute_state(self):
|
||||
sorted_workorders = sorted(self, key=lambda x: x.sequence)
|
||||
@@ -1292,10 +1292,10 @@ class ResMrpWorkOrder(models.Model):
|
||||
purchase_orders_id = self._get_surface_technics_purchase_ids()
|
||||
if purchase_orders_id.state == 'purchase':
|
||||
workorder.state = 'ready'
|
||||
picking_id = workorder.production_id.picking_ids.filtered(
|
||||
lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
# move_out = workorder.move_subcontract_workorder_ids[1]
|
||||
# picking_id = workorder.production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
move_out = workorder.move_subcontract_workorder_ids[1]
|
||||
for mo in move_out:
|
||||
if mo.state != 'done':
|
||||
mo.write({'state': 'assigned', 'production_id': False})
|
||||
@@ -1334,10 +1334,11 @@ class ResMrpWorkOrder(models.Model):
|
||||
if purchase_orders_id:
|
||||
if purchase_orders_id.state == 'purchase':
|
||||
workorder.state = 'ready'
|
||||
picking_id = workorder.production_id.picking_ids.filtered(
|
||||
lambda
|
||||
wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
move_out = workorder.move_subcontract_workorder_ids[1]
|
||||
# picking_id = workorder.production_id.picking_ids.filtered(
|
||||
# lambda
|
||||
# wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
for mo in move_out:
|
||||
if mo.state != 'done':
|
||||
mo.write({'state': 'assigned', 'production_id': False})
|
||||
@@ -1411,9 +1412,10 @@ class ResMrpWorkOrder(models.Model):
|
||||
# 表面工艺外协出库单
|
||||
if self.routing_type == '表面工艺':
|
||||
if self.is_subcontract is True:
|
||||
picking_id = self.production_id.picking_ids.filtered(
|
||||
lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
move_out = self.move_subcontract_workorder_ids[1]
|
||||
# picking_id = self.production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
# move_out = self.move_subcontract_workorder_ids[1]
|
||||
# move_out = self.env['stock.move'].search(
|
||||
# [('location_id', '=', self.env['stock.location'].search(
|
||||
|
||||
@@ -59,83 +59,83 @@ class PurchaseOrder(models.Model):
|
||||
production_id = self.env['mrp.production'].search([('origin', 'in', origins)])
|
||||
purchase.production_count = len(production_id)
|
||||
|
||||
def process_replenish(self,production,total_qty):
|
||||
record = self
|
||||
bom_line_id = production.bom_id.bom_line_ids
|
||||
replenish = self.env['stock.warehouse.orderpoint'].search([
|
||||
('product_id', '=', bom_line_id.product_id.id),
|
||||
(
|
||||
'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
|
||||
# ('state', 'in', ['draft', 'confirmed'])
|
||||
], limit=1)
|
||||
if not replenish:
|
||||
replenish_model = self.env['stock.warehouse.orderpoint']
|
||||
replenish = replenish_model.create({
|
||||
'product_id': bom_line_id.product_id.id,
|
||||
'location_id': self.env.ref(
|
||||
'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
'group_id': record.group_id.id,
|
||||
'qty_to_order': total_qty,
|
||||
'origin': record.name,
|
||||
})
|
||||
else:
|
||||
replenish.write({
|
||||
'product_id': bom_line_id.product_id.id,
|
||||
'location_id': self.env.ref(
|
||||
'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
'group_id': record.group_id.id,
|
||||
'qty_to_order': total_qty + replenish.qty_to_order,
|
||||
'origin': record.name + ',' + replenish.origin,
|
||||
})
|
||||
replenish.action_replenish()
|
||||
# def process_replenish(self,production,total_qty):
|
||||
# record = self
|
||||
# bom_line_id = production.bom_id.bom_line_ids
|
||||
# replenish = self.env['stock.warehouse.orderpoint'].search([
|
||||
# ('product_id', '=', bom_line_id.product_id.id),
|
||||
# (
|
||||
# 'location_id', '=', self.env.ref('sf_stock.stock_location_outsourcing_material_receiving_area').id),
|
||||
# # ('state', 'in', ['draft', 'confirmed'])
|
||||
# ], limit=1)
|
||||
# if not replenish:
|
||||
# replenish_model = self.env['stock.warehouse.orderpoint']
|
||||
# replenish = replenish_model.create({
|
||||
# 'product_id': bom_line_id.product_id.id,
|
||||
# 'location_id': self.env.ref(
|
||||
# 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
# 'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
# 'group_id': record.group_id.id,
|
||||
# 'qty_to_order': total_qty,
|
||||
# 'origin': record.name,
|
||||
# })
|
||||
# else:
|
||||
# replenish.write({
|
||||
# 'product_id': bom_line_id.product_id.id,
|
||||
# 'location_id': self.env.ref(
|
||||
# 'sf_stock.stock_location_outsourcing_material_receiving_area').id,
|
||||
# 'route_id': self.env.ref('sf_stock.stock_route_process_outsourcing').id,
|
||||
# 'group_id': record.group_id.id,
|
||||
# 'qty_to_order': total_qty + replenish.qty_to_order,
|
||||
# 'origin': record.name + ',' + replenish.origin,
|
||||
# })
|
||||
# replenish.action_replenish()
|
||||
|
||||
def outsourcing_service_replenishment(self):
|
||||
record = self
|
||||
if record.purchase_type != 'consignment':
|
||||
return
|
||||
grouped_lines = {}
|
||||
for line in record.order_line:
|
||||
if line.related_product.id not in grouped_lines:
|
||||
grouped_lines[line.related_product.id] = []
|
||||
grouped_lines[line.related_product.id].append(line)
|
||||
for product_id,lines in grouped_lines.items():
|
||||
production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
if not production:
|
||||
continue
|
||||
total_qty = sum(line.product_qty for line in lines)
|
||||
record.process_replenish(production,total_qty)
|
||||
for product_id,lines in grouped_lines.items():
|
||||
productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
if not productions:
|
||||
continue
|
||||
# production.bom_id.bom_line_ids.product_id
|
||||
location_id = self.env['stock.location'].search([('name', '=', '制造前')])
|
||||
quants = self.env['stock.quant'].search([
|
||||
('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
|
||||
('location_id', '=', location_id.id)
|
||||
])
|
||||
total_qty = sum(quants.mapped('quantity')) # 计算该位置的总库存量
|
||||
is_available = total_qty > 0
|
||||
if not is_available:
|
||||
raise UserError('请先完成坯料入库')
|
||||
for production_id in productions:
|
||||
work_ids = production_id.workorder_ids.filtered(
|
||||
lambda wk: wk.state not in ['done', 'rework', 'cancel'])
|
||||
if not work_ids:
|
||||
continue
|
||||
min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
|
||||
if min_sequence_wk.is_subcontract:
|
||||
picking_id = production_id.picking_ids.filtered(
|
||||
lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
move_out = picking_id.move_ids
|
||||
for mo in move_out:
|
||||
if mo.state != 'done':
|
||||
mo.write({'state': 'assigned', 'production_id': False})
|
||||
if not mo.move_line_ids:
|
||||
self.env['stock.move.line'].create(
|
||||
mo.get_move_line(production_id, min_sequence_wk))
|
||||
# def outsourcing_service_replenishment(self):
|
||||
# record = self
|
||||
# if record.purchase_type != 'consignment':
|
||||
# return
|
||||
# grouped_lines = {}
|
||||
# for line in record.order_line:
|
||||
# if line.related_product.id not in grouped_lines:
|
||||
# grouped_lines[line.related_product.id] = []
|
||||
# grouped_lines[line.related_product.id].append(line)
|
||||
# for product_id,lines in grouped_lines.items():
|
||||
# production = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
# if not production:
|
||||
# continue
|
||||
# total_qty = sum(line.product_qty for line in lines)
|
||||
# record.process_replenish(production,total_qty)
|
||||
# for product_id,lines in grouped_lines.items():
|
||||
# productions = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
# if not productions:
|
||||
# continue
|
||||
# # production.bom_id.bom_line_ids.product_id
|
||||
# location_id = self.env['stock.location'].search([('name', '=', '制造前')])
|
||||
# quants = self.env['stock.quant'].search([
|
||||
# ('product_id', '=', productions.bom_id.bom_line_ids.product_id.id),
|
||||
# ('location_id', '=', location_id.id)
|
||||
# ])
|
||||
# total_qty = sum(quants.mapped('quantity')) # 计算该位置的总库存量
|
||||
# is_available = total_qty > 0
|
||||
# if not is_available:
|
||||
# raise UserError('请先完成坯料入库')
|
||||
# for production_id in productions:
|
||||
# work_ids = production_id.workorder_ids.filtered(
|
||||
# lambda wk: wk.state not in ['done', 'rework', 'cancel'])
|
||||
# if not work_ids:
|
||||
# continue
|
||||
# min_sequence_wk = min(work_ids, key=lambda wk: wk.sequence)
|
||||
# if min_sequence_wk.is_subcontract:
|
||||
# picking_id = production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '制造前' and wk.location_dest_id.name == '外协加工区')
|
||||
# move_out = picking_id.move_ids
|
||||
# for mo in move_out:
|
||||
# if mo.state != 'done':
|
||||
# mo.write({'state': 'assigned', 'production_id': False})
|
||||
# if not mo.move_line_ids:
|
||||
# self.env['stock.move.line'].create(
|
||||
# mo.get_move_line(production_id, min_sequence_wk))
|
||||
# product = self.env['mrp.production'].search([('product_id', '=', product_id)], limit=1)
|
||||
# match = re.search(r'(S\d{5}-\d)',product.name)
|
||||
# pass
|
||||
@@ -146,7 +146,7 @@ class PurchaseOrder(models.Model):
|
||||
raise UserError('请对【产品】中的【数量】进行输入')
|
||||
if line.price_unit <= 0:
|
||||
raise UserError('请对【产品】中的【单价】进行输入')
|
||||
record.outsourcing_service_replenishment()
|
||||
# record.outsourcing_service_replenishment()
|
||||
|
||||
res = super(PurchaseOrder, self).button_confirm()
|
||||
|
||||
|
||||
@@ -1,30 +1,30 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
import base64
|
||||
import datetime
|
||||
import logging
|
||||
import json
|
||||
import os
|
||||
import re
|
||||
import traceback
|
||||
from operator import itemgetter
|
||||
# import base64
|
||||
# import datetime
|
||||
# import logging
|
||||
# import json
|
||||
# import os
|
||||
# import re
|
||||
# import traceback
|
||||
# from operator import itemgetter
|
||||
|
||||
import requests
|
||||
from itertools import groupby
|
||||
from collections import defaultdict, namedtuple
|
||||
# import requests
|
||||
# from itertools import groupby
|
||||
# from collections import defaultdict, namedtuple
|
||||
|
||||
from odoo import api, fields, models, SUPERUSER_ID, _
|
||||
from odoo.exceptions import UserError, ValidationError
|
||||
from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
|
||||
# from odoo import api, fields, models, SUPERUSER_ID, _
|
||||
# from odoo.exceptions import UserError, ValidationError
|
||||
# from odoo.tools import float_compare, float_round, float_is_zero, format_datetime
|
||||
|
||||
|
||||
class PurchaseRequestLine(models.Model):
|
||||
_inherit = 'purchase.request'
|
||||
is_subcontract = fields.Boolean(string='是否外协',default=False)
|
||||
class PurchaseRequestLine(models.Model):
|
||||
_inherit = 'purchase.request.line'
|
||||
is_subcontract = fields.Boolean(string='是否外协')
|
||||
# class PurchaseRequestLine(models.Model):
|
||||
# _inherit = 'purchase.request'
|
||||
# is_subcontract = fields.Boolean(string='是否外协',default=False)
|
||||
# class PurchaseRequestLine(models.Model):
|
||||
# _inherit = 'purchase.request.line'
|
||||
# is_subcontract = fields.Boolean(string='是否外协')
|
||||
|
||||
|
||||
class PurchaseRequest(models.Model):
|
||||
_inherit = 'purchase.request'
|
||||
bom_id = fields.Many2one('mrp.bom')
|
||||
# class PurchaseRequest(models.Model):
|
||||
# _inherit = 'purchase.request'
|
||||
# bom_id = fields.Many2one('mrp.bom')
|
||||
|
||||
@@ -7,74 +7,74 @@ from odoo.exceptions import UserError, ValidationError
|
||||
|
||||
class SfProductionProcessParameter(models.Model):
|
||||
_inherit = 'sf.production.process.parameter'
|
||||
service_products = fields.Many2one(
|
||||
'product.template',
|
||||
string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
|
||||
store=True
|
||||
)
|
||||
outsourced_service_products = fields.One2many(
|
||||
'product.template', # 另一个模型的名称
|
||||
'server_product_process_parameters_id', # 对应的 Many2one 字段名称
|
||||
string='外协服务产品'
|
||||
)
|
||||
is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
|
||||
is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
|
||||
routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
|
||||
# service_products = fields.Many2one(
|
||||
# 'product.template',
|
||||
# string='外协服务产品',compute='_compute_service_products',inverse='_inverse_service_products',
|
||||
# store=True
|
||||
# )
|
||||
# outsourced_service_products = fields.One2many(
|
||||
# 'product.template', # 另一个模型的名称
|
||||
# 'server_product_process_parameters_id', # 对应的 Many2one 字段名称
|
||||
# string='外协服务产品'
|
||||
# )
|
||||
# is_product_button = fields.Boolean(compute='_compute_is_product_button',default=False)
|
||||
# is_delete_button = fields.Boolean(compute='_compute_is_delete_button', default=False)
|
||||
# routing_id = fields.Many2one('mrp.routing.workcenter', string="工序")
|
||||
|
||||
@api.depends('outsourced_service_products')
|
||||
def _compute_service_products(self):
|
||||
for record in self:
|
||||
# 假设取第一条作为主明细
|
||||
record.service_products = record.outsourced_service_products.ids if record.outsourced_service_products else False
|
||||
# @api.depends('outsourced_service_products')
|
||||
# def _compute_service_products(self):
|
||||
# for record in self:
|
||||
# # 假设取第一条作为主明细
|
||||
# record.service_products = record.outsourced_service_products.ids if record.outsourced_service_products else False
|
||||
|
||||
def _inverse_service_products(self):
|
||||
for record in self:
|
||||
if record.service_products:
|
||||
# 确保关联关系正确
|
||||
record.outsourced_service_products = record.service_products.ids if record.service_products else False
|
||||
else:
|
||||
record.outsourced_service_products = False
|
||||
def name_get(self):
|
||||
result = []
|
||||
for record in self:
|
||||
name = f"{record.process_id.name} - {record.name}" # 自定义显示格式
|
||||
result.append((record.id, name))
|
||||
return result
|
||||
@api.constrains('outsourced_service_products')
|
||||
def _validate_partner_limit(self):
|
||||
for record in self:
|
||||
if len(record.outsourced_service_products) > 1:
|
||||
raise ValidationError("工艺参数不能与多个产品关联")
|
||||
# def _inverse_service_products(self):
|
||||
# for record in self:
|
||||
# if record.service_products:
|
||||
# # 确保关联关系正确
|
||||
# record.outsourced_service_products = record.service_products.ids if record.service_products else False
|
||||
# else:
|
||||
# record.outsourced_service_products = False
|
||||
# def name_get(self):
|
||||
# result = []
|
||||
# for record in self:
|
||||
# name = f"{record.process_id.name} - {record.name}" # 自定义显示格式
|
||||
# result.append((record.id, name))
|
||||
# return result
|
||||
# @api.constrains('outsourced_service_products')
|
||||
# def _validate_partner_limit(self):
|
||||
# for record in self:
|
||||
# if len(record.outsourced_service_products) > 1:
|
||||
# raise ValidationError("工艺参数不能与多个产品关联")
|
||||
|
||||
@api.onchange('outsourced_service_products')
|
||||
def _onchange_validate_partner_limit(self):
|
||||
for record in self:
|
||||
if len(record.outsourced_service_products) > 1:
|
||||
raise ValidationError("工艺参数不能与多个产品关联")
|
||||
@api.depends('outsourced_service_products')
|
||||
def _compute_is_product_button(self):
|
||||
for record in self:
|
||||
if record.outsourced_service_products:
|
||||
record.is_product_button = True
|
||||
else:
|
||||
record.is_product_button = False
|
||||
# @api.onchange('outsourced_service_products')
|
||||
# def _onchange_validate_partner_limit(self):
|
||||
# for record in self:
|
||||
# if len(record.outsourced_service_products) > 1:
|
||||
# raise ValidationError("工艺参数不能与多个产品关联")
|
||||
# @api.depends('outsourced_service_products')
|
||||
# def _compute_is_product_button(self):
|
||||
# for record in self:
|
||||
# if record.outsourced_service_products:
|
||||
# record.is_product_button = True
|
||||
# else:
|
||||
# record.is_product_button = False
|
||||
|
||||
def has_wksp_prefix(self):
|
||||
"""
|
||||
判断字符串是否以WKSP开头（不区分大小写）
|
||||
:param text: 要检查的字符串
|
||||
:return: True/False
|
||||
"""
|
||||
return self.code.upper().startswith('101'+self.routing_id.code)
|
||||
@api.depends('outsourced_service_products','code')
|
||||
def _compute_is_delete_button(self):
|
||||
for record in self:
|
||||
if record.outsourced_service_products and record.has_wksp_prefix():
|
||||
record.is_delete_button = False
|
||||
elif record.outsourced_service_products:
|
||||
record.is_delete_button = True
|
||||
else:
|
||||
record.is_delete_button = True
|
||||
# def has_wksp_prefix(self):
|
||||
# """
|
||||
# 判断字符串是否以WKSP开头（不区分大小写）
|
||||
# :param text: 要检查的字符串
|
||||
# :return: True/False
|
||||
# """
|
||||
# return self.code.upper().startswith('101'+self.routing_id.code)
|
||||
# @api.depends('outsourced_service_products','code')
|
||||
# def _compute_is_delete_button(self):
|
||||
# for record in self:
|
||||
# if record.outsourced_service_products and record.has_wksp_prefix():
|
||||
# record.is_delete_button = False
|
||||
# elif record.outsourced_service_products:
|
||||
# record.is_delete_button = True
|
||||
# else:
|
||||
# record.is_delete_button = True
|
||||
@api.model
|
||||
def _name_search(self, name, args=None, operator='ilike', limit=100, name_get_uid=None):
|
||||
if self._context.get('route_id'):
|
||||
@@ -90,19 +90,19 @@ class SfProductionProcessParameter(models.Model):
|
||||
return self._search(domain, limit=limit, access_rights_uid=name_get_uid)
|
||||
return super()._name_search(name, args, operator, limit, name_get_uid)
|
||||
|
||||
def action_create_service_product(self):
|
||||
if self.id: # 如果是已存在的记录
|
||||
self.write({}) # 空写入会触发保存
|
||||
else: # 如果是新记录
|
||||
self = self.create(self._convert_to_write(self.read()[0]))
|
||||
return {
|
||||
'type': 'ir.actions.act_window',
|
||||
'name': '向导名称',
|
||||
'res_model': 'product.creation.wizard',
|
||||
'view_mode': 'form',
|
||||
'target': 'new',
|
||||
'context': {'default_process_parameter_id': self.id}, # 传递当前记录ID
|
||||
}
|
||||
# def action_create_service_product(self):
|
||||
# if self.id: # 如果是已存在的记录
|
||||
# self.write({}) # 空写入会触发保存
|
||||
# else: # 如果是新记录
|
||||
# self = self.create(self._convert_to_write(self.read()[0]))
|
||||
# return {
|
||||
# 'type': 'ir.actions.act_window',
|
||||
# 'name': '向导名称',
|
||||
# 'res_model': 'product.creation.wizard',
|
||||
# 'view_mode': 'form',
|
||||
# 'target': 'new',
|
||||
# 'context': {'default_process_parameter_id': self.id}, # 传递当前记录ID
|
||||
# }
|
||||
#
|
||||
# return {
|
||||
# 'name': '创建服务产品',
|
||||
@@ -116,6 +116,6 @@ class SfProductionProcessParameter(models.Model):
|
||||
# },
|
||||
# }
|
||||
|
||||
def action_hide_service_products(self):
|
||||
# self.outsourced_service_products.active = False
|
||||
self.active = False
|
||||
# def action_hide_service_products(self):
|
||||
# # self.outsourced_service_products.active = False
|
||||
# self.active = False
|
||||
|
||||
@@ -631,62 +631,84 @@ class StockPicking(models.Model):
|
||||
move.action_clear_lines_show_details()
|
||||
move.action_show_details()
|
||||
res = super().button_validate()
|
||||
lot_ids = None
|
||||
product_ids = self.move_ids.mapped('product_id')
|
||||
if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
|
||||
lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
|
||||
production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
|
||||
if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
|
||||
# 如果是最后一张外协入库单，则设置库存位置的预留数量
|
||||
for production_id in production_ids:
|
||||
if lot_ids:
|
||||
lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# picking_ids = production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
if lot_id in lot_ids:
|
||||
workorder_id = production_id.workorder_ids.filtered(
|
||||
lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_finish()
|
||||
else:
|
||||
workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_finish()
|
||||
# lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# picking_ids = workorder.production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
# lot_ids = None
|
||||
# product_ids = self.move_ids.mapped('product_id')
|
||||
# if not self.move_ids[0].product_id.single_manufacturing and self.move_ids[0].product_id.tracking == 'none':
|
||||
# lot_ids = self.move_ids.move_line_ids.mapped('lot_id')
|
||||
# production_ids = self.sale_order_id.mrp_production_ids if self.sale_order_id else self.env['mrp.production']
|
||||
# if res and self.location_id.name == '外协收料区' and self.location_dest_id.name == '制造前':
|
||||
# # 如果是最后一张外协入库单，则设置库存位置的预留数量
|
||||
# for production_id in production_ids:
|
||||
# if lot_ids:
|
||||
# lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# # picking_ids = production_id.picking_ids.filtered(
|
||||
# # lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
# if lot_id in lot_ids:
|
||||
# workorder_id = production_id.workorder_ids.filtered(
|
||||
# lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_finish()
|
||||
# else:
|
||||
# workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_finish()
|
||||
# # lot_id = workorder.production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# # picking_ids = workorder.production_id.picking_ids.filtered(
|
||||
# # lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
|
||||
# if move_in:
|
||||
# workorder = move_in.subcontract_workorder_id
|
||||
# workorders = workorder.production_id.workorder_ids
|
||||
# subcontract_workorders = workorders.filtered(
|
||||
# lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||
# # if workorder == subcontract_workorders[-1]:
|
||||
# # self.env['stock.quant']._update_reserved_quantity(
|
||||
# # move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
||||
# # lot_id=move_in.move_line_ids.lot_id,
|
||||
# # package_id=False, owner_id=False, strict=False
|
||||
# # )
|
||||
# workorder.button_finish()
|
||||
if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
|
||||
for production_id in production_ids:
|
||||
if lot_ids:
|
||||
lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# picking_ids = production_id.picking_ids.filtered(
|
||||
# lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
if lot_id in lot_ids:
|
||||
workorder_id = production_id.workorder_ids.filtered(
|
||||
lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_finish()
|
||||
else:
|
||||
workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
|
||||
if not workorder_id:
|
||||
continue
|
||||
workorder_id.button_start()
|
||||
# # if move_in:
|
||||
# # workorder = move_in.subcontract_workorder_id
|
||||
# # workorders = workorder.production_id.workorder_ids
|
||||
# # subcontract_workorders = workorders.filtered(
|
||||
# # lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||
# # # if workorder == subcontract_workorders[-1]:
|
||||
# # # self.env['stock.quant']._update_reserved_quantity(
|
||||
# # # move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
||||
# # # lot_id=move_in.move_line_ids.lot_id,
|
||||
# # # package_id=False, owner_id=False, strict=False
|
||||
# # # )
|
||||
# # workorder.button_finish()
|
||||
# if res and self.location_id.name == '制造前' and self.location_dest_id.name == '外协加工区':
|
||||
# for production_id in production_ids:
|
||||
# if lot_ids:
|
||||
# lot_id = production_id.move_raw_ids.move_line_ids.lot_id
|
||||
# # picking_ids = production_id.picking_ids.filtered(
|
||||
# # lambda wk: wk.location_id.name == '外协收料区' and wk.location_dest_id.name == '制造前')
|
||||
# if lot_id in lot_ids:
|
||||
# workorder_id = production_id.workorder_ids.filtered(
|
||||
# lambda a: a.state == 'progress' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_finish()
|
||||
# else:
|
||||
# workorder_id = production_id.workorder_ids.filtered(lambda a: a.state == 'ready' and a.is_subcontract)
|
||||
# if not workorder_id:
|
||||
# continue
|
||||
# workorder_id.button_start()
|
||||
picking_type_in = self.env.ref('sf_manufacturing.outcontract_picking_in').id
|
||||
if res is True and self.picking_type_id.id == picking_type_in:
|
||||
# 如果是最后一张外协入库单，则设置库存位置的预留数量
|
||||
move_in = self.move_ids
|
||||
if move_in:
|
||||
workorder = move_in.subcontract_workorder_id
|
||||
workorders = workorder.production_id.workorder_ids
|
||||
subcontract_workorders = workorders.filtered(
|
||||
lambda wo: wo.is_subcontract == True and wo.state != 'cancel').sorted('sequence')
|
||||
# if workorder == subcontract_workorders[-1]:
|
||||
# self.env['stock.quant']._update_reserved_quantity(
|
||||
# move_in.product_id, move_in.location_dest_id, move_in.product_uom_qty,
|
||||
# lot_id=move_in.move_line_ids.lot_id,
|
||||
# package_id=False, owner_id=False, strict=False
|
||||
# )
|
||||
workorder.button_finish()
|
||||
picking_type_out = self.env.ref('sf_manufacturing.outcontract_picking_out').id
|
||||
if res and self.picking_type_id.id == picking_type_out:
|
||||
move_out = self.move_ids
|
||||
if move_out:
|
||||
workorder = move_out.subcontract_workorder_id
|
||||
workorder.button_start()
|
||||
if self.location_id.name == '成品存货区' and self.location_dest_id.name == '客户':
|
||||
sale_id = self.env['sale.order'].sudo().search(
|
||||
[('name', '=', self.origin)])
|
||||
|
||||
Reference in New Issue
Block a user