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

1、优化组装单扫描验证物料方法；2、对组装单物料批次进行调整，删除部分字段和方法；优化获取BOM并自动初始化物料数据方法；3、货位批次模型新增物料字段，新增tree视图，并且除刀柄外物料点击【更多】时跳转至不同的货位批次模型tree视图；4、添加刀柄和其他物料在点击【更多】按钮后选取新物料点击【确认】后回填物料信息到组装单并给出提示信息；5、添加组装物料信息校验功能，初始化或重新选取物料后需进行验证才能进行组装；6、组装单form视图布局调整；

Browse Source
This commit is contained in:
yuxianghui
2024-09-12 17:20:58 +08:00
parent da5e322229
commit 2e5694cd1a
4 changed files with 295 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

106
sf_tool_management/models/stock.py
View File

@@ -115,6 +115,13 @@ class StockPicking(models.Model):
num = "%03d" % m
return name + str(num)
def tool_location_num(self, freight_barcode_id, lot_id):
location_lot = self.env['sf.shelf.location.lot'].sudo().search([('lot_id', '=', lot_id.id), (
'shelf_location_id', '=', freight_barcode_id.id)])
if not location_lot:
raise ValidationError(
f'[{freight_barcode_id.barcode}]货位的[{lot_id.name}]批次物料已用完，请重新选择！')
def create_tool_stocking_picking1(self, obj):
"""
创建刀具物料出库单
@@ -133,25 +140,32 @@ class StockPicking(models.Model):
stock_move_id = self.env['stock.move']
datas = {'data': [], 'picking_id': picking_id}
if obj.handle_code_id:
if obj.handle_code_id.tool_material_status == '在用':
raise ValidationError(f'Rfid为{obj.handle_code_id.rfid}的刀柄已被使用，请重新选择！')
# 修改刀柄序列号状态为【在用】
obj.handle_code_id.sudo().write({'tool_material_status': '在用'})
datas['data'].append(
{'current_location_id': self.env['sf.shelf.location'], 'lot_id': obj.handle_code_id})
if obj.integral_product_id:
self.tool_location_num(obj.integral_freight_barcode_id, obj.integral_lot_id)
datas['data'].append(
{'current_location_id': obj.integral_freight_barcode_id, 'lot_id': obj.integral_freight_lot_id.lot_id})
{'current_location_id': obj.integral_freight_barcode_id, 'lot_id': obj.integral_lot_id})
if obj.blade_product_id:
self.tool_location_num(obj.blade_freight_barcode_id, obj.blade_lot_id)
datas['data'].append(
{'current_location_id': obj.blade_freight_barcode_id, 'lot_id': obj.blade_freight_lot_id.lot_id})
{'current_location_id': obj.blade_freight_barcode_id, 'lot_id': obj.blade_lot_id})
if obj.bar_product_id:
self.tool_location_num(obj.bar_freight_barcode_id, obj.bar_lot_id)
datas['data'].append(
{'current_location_id': obj.bar_freight_barcode_id, 'lot_id': obj.bar_freight_lot_id.lot_id})
{'current_location_id': obj.bar_freight_barcode_id, 'lot_id': obj.bar_lot_id})
if obj.pad_product_id:
self.tool_location_num(obj.pad_freight_barcode_id, obj.pad_lot_id)
datas['data'].append(
{'current_location_id': obj.pad_freight_barcode_id, 'lot_id': obj.pad_freight_lot_id.lot_id})
{'current_location_id': obj.pad_freight_barcode_id, 'lot_id': obj.pad_lot_id})
if obj.chuck_product_id:
self.tool_location_num(obj.chuck_freight_barcode_id, obj.chuck_lot_id)
datas['data'].append(
{'current_location_id': obj.chuck_freight_barcode_id, 'lot_id': obj.chuck_freight_lot_id.lot_id})
{'current_location_id': obj.chuck_freight_barcode_id, 'lot_id': obj.chuck_lot_id})
# 创建刀具物料出库库存移动记录
stock_move_id.create_tool_material_stock_moves(datas)
# 将刀具物料出库库单的状态更改为就绪
@@ -187,6 +201,9 @@ class StockMove(models.Model):
stock_move_ids = []
for res in data:
if res:
if res['lot_id'].product_qty <= 0:
raise ValidationError(
f'[{res["lot_id"].product_id.name}产品的{res["lot_id"].name}]批次/序列号库存不足！')
# 创建库存移动记录
stock_move_id = self.env['stock.move'].sudo().create({
'name': picking_id.name,
@@ -248,8 +265,87 @@ class ProductProduct(models.Model):
num = "%03d" % m
return '%s-%s' % (code, num)
def set_tool_material(self):
tool_id = self.env.context.get('tool_id')
tool_assembly_id = self.env['sf.functional.tool.assembly'].sudo().search([('id', '=', tool_id)])
if len(self) > 1:
raise ValidationError('请不要多选')
else:
tool_assembly_id.handle_product_id = self.id
tool_assembly_id.handle_code_id = False
return {
'type': 'ir.actions.client',
'tag': 'display_notification',
'params': {
'message': '刀柄信息更改成功',
'type': 'success',
'next': {'type': 'ir.actions.act_window_close'}
}
}
class SfShelfLocationLot(models.Model):
_inherit = 'sf.shelf.location.lot'
product_id = fields.Many2one('product.product', '产品', compute='_compute_product_id', store=True)
cutting_tool_type = fields.Char(string="刀具物料类型", compute='_compute_product_id', store=True)
cutting_tool_type_id = fields.Many2one('sf.cutting.tool.type', string='类型',
related='product_id.cutting_tool_type_id')
cutting_tool_model_id = fields.Many2one('sf.cutting_tool.standard.library', string='型号名称',
related='product_id.cutting_tool_model_id')
specification_id = fields.Many2one('sf.tool.materials.basic.parameters', string='物料号',
related='product_id.specification_id')
brand_id = fields.Many2one('sf.machine.brand', '品牌', related='product_id.brand_id')
cutting_tool_blade_diameter = fields.Float('刃部直径(mm)', related='product_id.cutting_tool_blade_diameter')
cutting_tool_blade_tip_working_size = fields.Char('刀尖R角(mm)',
related='product_id.cutting_tool_blade_tip_working_size')
cutting_tool_blade_radius = fields.Char('刀尖圆弧半径(mm)',
related='product_id.cutting_tool_blade_tip_circular_arc_radius')
cutting_tool_cutter_arbor_diameter = fields.Float('刀杆直径(mm)',
related='product_id.cutting_tool_cutter_arbor_diameter')
cutting_tool_cutter_head_diameter = fields.Float('刀盘直径(mm)',
related='product_id.cutting_tool_cutter_head_diameter')
fit_blade_shape_id = fields.Many2one('maintenance.equipment.image', '适配刀片形状',
related='product_id.fit_blade_shape_id')
@api.depends('lot_id')
def _compute_product_id(self):
for item in self:
if item.lot_id:
item.product_id = item.lot_id.product_id.id
item.cutting_tool_type = item.lot_id.product_id.cutting_tool_type
def set_tool_material(self):
tool_type = self.env.context.get('tool_type')
tool_id = self.env.context.get('tool_id')
tool_assembly_id = self.env['sf.functional.tool.assembly'].sudo().search([('id', '=', tool_id)])
if len(self) > 1:
raise ValidationError('请不要多选')
if tool_type == '整体式刀具':
tool_assembly_id.integral_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.integral_lot_id = self.lot_id.id
tool_assembly_id.integral_verify = False
elif tool_type == '刀片':
tool_assembly_id.blade_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.blade_lot_id = self.lot_id.id
tool_assembly_id.blade_verify = False
elif tool_type == '刀杆':
tool_assembly_id.bar_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.bar_lot_id = self.lot_id.id
tool_assembly_id.bar_verify = False
elif tool_type == '刀盘':
tool_assembly_id.pad_freight_barcode_id = self.shelf_location_id.id
tool_assembly_id.pad_lot_id = self.lot_id.id
tool_assembly_id.pad_verify = False
return {
'type': 'ir.actions.client',
'tag': 'display_notification',
'params': {
'message': f'[{tool_type}]物料信息更改成功',
'type': 'success',
'next': {'type': 'ir.actions.act_window_close'}
}
}