jikimo/test
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Browse Source
This commit is contained in:
mgw
2024-12-30 08:57:49 +08:00
parent a3a2c96d00 31187755b9
commit 9330be3753
3 changed files with 52 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sf_manufacturing/models/mrp_production.py
View File

@@ -790,6 +790,7 @@ class MrpProduction(models.Model):
groupby(production_all, key=lambda x: x.product_id.id)} groupby(production_all, key=lambda x: x.product_id.id)}
for product_id, pd in grouped_product_ids.items(): for product_id, pd in grouped_product_ids.items():
product_id_to_production_names[product_id] = [p.name for p in pd] product_id_to_production_names[product_id] = [p.name for p in pd]
sorted_workorders = None
for production in production_all: for production in production_all:
proc_workorders = [] proc_workorders = []
process_parameter_workorder = self.env['mrp.workorder'].search( process_parameter_workorder = self.env['mrp.workorder'].search(
@@ -841,6 +842,8 @@ class MrpProduction(models.Model):
# self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production) # self.env['stock.picking'].create_outcontract_picking(consecutive_workorders, production)
# self.env['purchase.order'].get_purchase_order(consecutive_workorders, production, # self.env['purchase.order'].get_purchase_order(consecutive_workorders, production,
# product_id_to_production_names) # product_id_to_production_names)
if not sorted_workorders:
return
for workorders in reversed(sorted_workorders): for workorders in reversed(sorted_workorders):
self.env['stock.picking'].create_outcontract_picking(workorders, production, 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) self.env['purchase.order'].get_purchase_order(workorders, production, product_id_to_production_names)

85
sf_manufacturing/models/stock.py
View File

@@ -657,52 +657,59 @@ class StockPicking(models.Model):
if move_out: if move_out:
workorder = move_out.subcontract_workorder_id workorder = move_out.subcontract_workorder_id
workorder.button_start() 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)])
if sale_id and all(move.product_uom_qty == move.quantity_done for move in self.move_ids):
sale_id.write({'state':'delivered'})
return res return res
# 创建 外协出库入单 # 创建 外协出库入单
def create_outcontract_picking(self, workorders, item, sorted_workorders): def create_outcontract_picking(self, workorders, item, sorted_workorders):
for workorder in workorders: for workorder in workorders:
if workorder.move_subcontract_workorder_ids: if workorder.move_subcontract_workorder_ids:
workorder.move_subcontract_workorder_ids.write({'state': 'waiting'}) workorder.move_subcontract_workorder_ids.write({'state': 'cancel'})
workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'waiting'}) workorder.move_subcontract_workorder_ids.picking_id.write({'state': 'cancel'})
# 创建一个新的补货组
procurement_group_id = self.env['procurement.group'].create({
'name': workorder.name,
'partner_id': self.partner_id.id,
})
move_dest_id = False
# 如果当前工单是是制造订单的最后一个工艺外协工单
if workorder == next((workorder for workorder in reversed(sorted_workorders) if workorder.is_subcontract), None):
move_dest_id = item.move_raw_ids[0].id
else: else:
# 创建一个新的补货组 # 从sorted_workorders中找到上一工单的move
procurement_group_id = self.env['procurement.group'].create({ if len(sorted_workorders) > 1:
'name': workorder.name, move_dest_id = sorted_workorders[sorted_workorders.index(workorder)+1].move_subcontract_workorder_ids[1].id
'partner_id': self.partner_id.id, new_picking = True
}) outcontract_picking_type_in = self.env.ref(
move_dest_id = False 'sf_manufacturing.outcontract_picking_in').id,
# 如果当前工单是是制造订单的最后一个工艺外协工单 outcontract_picking_type_out = self.env.ref(
if workorder == next((workorder for workorder in reversed(item.workorder_ids) if workorder.is_subcontract), None): 'sf_manufacturing.outcontract_picking_out').id,
move_dest_id = item.move_raw_ids[0].id moves_in = self.env['stock.move'].sudo().create(
else: self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in,
# 从sorted_workorders中找到上一工单的move procurement_group_id.id, move_dest_id))
if len(sorted_workorders) > 1: picking_in = self.create(
move_dest_id = sorted_workorders[sorted_workorders.index(workorder)+1].move_subcontract_workorder_ids[1].id moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/'))
new_picking = True # pick_ids.append(picking_in.id)
outcontract_picking_type_in = self.env.ref( moves_in.write(
'sf_manufacturing.outcontract_picking_in').id, {'picking_id': picking_in.id, 'state': 'waiting'})
outcontract_picking_type_out = self.env.ref( moves_in._assign_picking_post_process(new=new_picking)
'sf_manufacturing.outcontract_picking_out').id, moves_out = self.env['stock.move'].sudo().create(
moves_in = self.env['stock.move'].sudo().create( self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_in, procurement_group_id.id, moves_in.id))
procurement_group_id.id, move_dest_id)) workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
picking_in = self.create( picking_out = self.create(
moves_in._get_new_picking_values_Res(item, workorder, 'WH/OCIN/')) moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
# pick_ids.append(picking_in.id) # pick_ids.append(picking_out.id)
moves_in.write( moves_out.write(
{'picking_id': picking_in.id, 'state': 'waiting'}) {'picking_id': picking_out.id, 'state': 'waiting'})
moves_in._assign_picking_post_process(new=new_picking) moves_out._assign_picking_post_process(new=new_picking)
moves_out = self.env['stock.move'].sudo().create(
self.env['stock.move']._get_stock_move_values_Res(item, outcontract_picking_type_out,
procurement_group_id.id, moves_in.id))
workorder.write({'move_subcontract_workorder_ids': [(6, 0, [moves_in.id, moves_out.id])]})
picking_out = self.create(
moves_out._get_new_picking_values_Res(item, workorder, 'WH/OCOUT/'))
# pick_ids.append(picking_out.id)
moves_out.write(
{'picking_id': picking_out.id, 'state': 'waiting'})
moves_out._assign_picking_post_process(new=new_picking)
@api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id') @api.depends('move_type', 'immediate_transfer', 'move_ids.state', 'move_ids.picking_id')
def _compute_state(self): def _compute_state(self):

6
sf_tool_management/models/maintenance_equipment.py
View File

@@ -126,16 +126,16 @@ class StockLot(models.Model):
tool_material_search_id = fields.Many2one('sf.tool.material.search', string='刀具物料搜索') tool_material_search_id = fields.Many2one('sf.tool.material.search', string='刀具物料搜索')
fixture_material_search_id = fields.Many2one('sf.fixture.material.search', string='夹具物料搜索') fixture_material_search_id = fields.Many2one('sf.fixture.material.search', string='夹具物料搜索')
tool_material_status = fields.Selection( tool_material_status = fields.Selection(
[('未入库', '未入库'), ('可用', '可用'), ('在用', '空闲'), ('报废', '报废')], string='状态', [('未入库', '未入库'), ('可用', '空闲'), ('在用', '占用'), ('报废', '报废')], string='状态',
compute='_compute_tool_material_status', store=True) compute='_compute_tool_material_status', store=True)
@api.depends('quant_ids') @api.depends('quant_ids')
def _compute_tool_material_status(self): def _compute_tool_material_status(self):
for record in self: for record in self:
if record: if record:
if record.product_id.categ_id.name in ['刀具', '夹具']: if record.product_id.categ_id.name in ['刀具']:
if record.quant_ids: if record.quant_ids:
if record.quant_ids[-1].location_id.name in ['刀具房', '夹具房']: if record.quant_ids[-1].location_id.name in ['刀具房']:
record.tool_material_status = '可用' record.tool_material_status = '可用'
elif record.quant_ids[-1].location_id.name == '刀具组装位置': elif record.quant_ids[-1].location_id.name == '刀具组装位置':
record.tool_material_status = '在用' record.tool_material_status = '在用'