This commit is contained in:
yuxianghui
2024-03-04 17:11:18 +08:00
parent 9d2bad977c
commit d85b05f999

View File

@@ -300,6 +300,7 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
智能工厂组装单处扫码绑定刀具物料') 智能工厂组装单处扫码绑定刀具物料')
""" """
for record in self: for record in self:
if 'DJWL' in barcode:
records = record.env['stock.lot'].search([('name', '=', barcode)]) records = record.env['stock.lot'].search([('name', '=', barcode)])
if not records: if not records:
raise ValidationError('扫描的条形码数据不存在,请重新扫描!') raise ValidationError('扫描的条形码数据不存在,请重新扫描!')
@@ -323,6 +324,8 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
record.chuck_code_id = record_stock_lot.id record.chuck_code_id = record_stock_lot.id
else: else:
raise ValidationError('扫描的刀具物料不存在,请重新扫描!') raise ValidationError('扫描的刀具物料不存在,请重新扫描!')
else:
record.rfid = barcode
# 组装功能刀具参数信息 # 组装功能刀具参数信息
barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号') barcode_id = fields.Many2one('stock.lot', string='功能刀具序列号')
@@ -676,7 +679,8 @@ class ProductProduct(models.Model):
location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')]) location_inventory_id = self.env['stock.location'].search([('name', '=', 'Production')])
stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')]) stock_location_id = self.env['stock.location'].search([('name', '=', '组装后')])
# 创建功能刀具该批次/序列号 库存移动和移动历史 # 创建功能刀具该批次/序列号 库存移动和移动历史
stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id) stock_lot.create_stock_quant(location_inventory_id, stock_location_id, functional_tool_assembly.id,
'功能刀具组装')
return stock_lot return stock_lot
@@ -710,20 +714,20 @@ class ProductProduct(models.Model):
location_inventory_id = tool_material.quant_ids.location_id[-1] location_inventory_id = tool_material.quant_ids.location_id[-1]
stock_location_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')]) stock_location_id = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
# 创建功能刀具该批次/序列号 库存移动和移动历史 # 创建功能刀具该批次/序列号 库存移动和移动历史
tool_material.create_stock_quant(location_inventory_id, stock_location_id, None) tool_material.create_stock_quant(location_inventory_id, stock_location_id, None, '功能刀具组装')
class StockLot(models.Model): class StockLot(models.Model):
_inherit = 'stock.lot' _inherit = 'stock.lot'
def create_stock_quant(self, location_inventory_id, stock_location_id, functional_tool_assembly_id): def create_stock_quant(self, location_inventory_id, stock_location_id, functional_tool_assembly_id, name):
""" """
对功能刀具组装过程的功能刀具和刀具物料进行库存移动,以及创建移动历史 对功能刀具组装过程的功能刀具和刀具物料进行库存移动,以及创建移动历史
""" """
# 创建库存移动记录 # 创建库存移动记录
stock_move_id = self.env['stock.move'].create({ stock_move_id = self.env['stock.move'].sudo().create({
'name': '功能刀具组装', 'name': name,
'product_id': self.product_id.id, 'product_id': self.product_id.id,
'location_id': location_inventory_id.id, 'location_id': location_inventory_id.id,
'location_dest_id': stock_location_id.id, 'location_dest_id': stock_location_id.id,
@@ -732,7 +736,7 @@ class StockLot(models.Model):
}) })
# 创建移动历史记录 # 创建移动历史记录
stock_move_line_id = self.env['stock.move.line'].create({ stock_move_line_id = self.env['stock.move.line'].sudo().create({
'product_id': self.product_id.id, 'product_id': self.product_id.id,
'functional_tool_name_id': functional_tool_assembly_id, 'functional_tool_name_id': functional_tool_assembly_id,
'lot_id': self.id, 'lot_id': self.id,