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

1、优化功能刀具拆解单拆解原因为更换其他刀具时的扫码录入刀具物料货位信息功能；2、优化功能刀具拆解单确认拆解后的刀具物料拆解流程，及其刀具物料功能刀具的数量统计等；3、功能刀具拆解、功能刀具模块添加动作过滤已拆解状态的记录，并添加筛选方法；4、功能刀具组装流程添加刀具物料货位数量校验；

Browse Source
This commit is contained in:
yuxianghui
2024-04-23 14:15:45 +08:00
parent 080a3d7175
commit 8bc23f5136
8 changed files with 114 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

79
sf_tool_management/models/base.py
View File

@@ -647,33 +647,56 @@ class FunctionalToolDismantle(models.Model):
"""
# 对barcode进行校验是否为货位编码
if not re.match(r'^[A-Za-z0-9]+-[A-Za-z0-9]+-\d{3}-\d{3}$', barcode):
tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', barcode)])
tool_id = self.env['sf.functional.cutting.tool.entity'].sudo().search(
[('rfid', '=', barcode), ('functional_tool_status', '!=', '已拆除')])
if tool_id:
self.functional_tool_id = tool_id.id
else:
raise ValidationError('Rfid为【%s】的功能刀具不存在，请重新扫描！' % barcode)
else:
location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
if not location:
raise ValidationError('【%s】该货位不存在，请重新扫码！' % barcode)
else:
# 判断是否有夹头物料
if not self.chuck_product_id:
# 判断是否有整体式刀具物料
if self.integral_product_id:
# 判断货位是否为空货位 或者 是存有整体式刀具的货位
if location.product_id in [False, self.integral_product_id]:
self.integral_freight_id = location.id
else:
raise ValidationError('【%s】该货位已存在【%s】产品，请重新扫码！' % location.barcode,
location.product_id.name)
# 判断是否有刀片物料
elif self.blade_product_id:
# 判断是否有刀杆物料
if self.bar_product_id:
pass
if self.dismantle_cause == '更换为其他刀具':
location = self.env['sf.shelf.location'].sudo().search([('barcode', '=', barcode)])
if not location:
raise ValidationError('【%s】该货位不存在，请重新扫码！' % barcode)
else:
pass
if not location.product_id:
# 判断功能刀具存在哪些刀具物料需要录入库位
if self.chuck_product_id: # 夹头
if not self.chuck_freight_id:
self.chuck_freight_id = location.id
return True
if self.integral_product_id: # 整体式刀具
if not self.integral_freight_id:
self.integral_freight_id = location.id
return True
elif self.blade_product_id: # 刀片
if not self.blade_freight_id:
self.blade_freight_id = location.id
return True
if self.bar_product_id: # 刀杆
if not self.bar_freight_id:
self.bar_freight_id = location.id
return True
elif self.pad_product_id: # 刀盘
if not self.pad_freight_id:
self.pad_freight_id = location.id
return True
else:
# 判断货位存放的是那个刀具物料产品
if self.integral_product_id == location.product_id: # 整体式刀具
self.integral_freight_id = location.id
elif self.blade_product_id == location.product_id: # 刀片
self.blade_freight_id = location.id
elif self.bar_product_id == location.product_id: # 刀杆
self.bar_freight_id = location.id
elif self.pad_product_id == location.product_id: # 刀盘
self.pad_freight_id = location.id
elif self.chuck_product_id == location.product_id: # 夹头
self.chuck_freight_id = location.id
elif self.dismantle_cause in ['寿命到期报废', '崩刀报废']:
raise ValidationError('该功能刀具因为%s拆解，无需录入库位' % self.dismantle_cause)
else:
raise ValidationError('该功能刀具因为%s拆解，无需录入库位' % self.dismantle_cause)
name = fields.Char('名称', related='functional_tool_id.name')
@@ -698,6 +721,7 @@ class FunctionalToolDismantle(models.Model):
grinding_id = fields.Char('磨削单号', readonly=True)
state = fields.Selection([('待拆解', '待拆解'), ('已拆解', '已拆解')], default='待拆解')
active = fields.Boolean('有效', default=True)
# 刀柄
handle_product_id = fields.Many2one('product.product', string='刀柄', compute='_compute_functional_tool_num',
@@ -787,22 +811,24 @@ class FunctionalToolDismantle(models.Model):
item.chuck_product_id = False
def confirmation_disassembly(self):
logging.info('%s刀具确认拆解' % self.dismantle_cause)
logging.info('%s刀具确认开始拆解' % self.dismantle_cause)
if self.functional_tool_id.functional_tool_status == '已拆除':
raise ValidationError('Rfid为【%s】的功能刀具已经拆解，请勿重复操作！' % self.functional_tool_id.rfid_dismantle)
location = self.env['stock.location'].search([('name', '=', '刀具组装位置')])
location_dest = self.env['stock.location'].search([('name', '=', '刀具房')])
# =================刀柄是否报废拆解=======
location_dest_scrap = self.env['stock.location'].search([('name', '=', 'Scrap')])
if self.handle_rfid:
lot = self.env['stock.lot'].sudo().search([('name', '=', self.handle_rfid)])
lot = self.env['stock.lot'].sudo().search([('rfid', '=', self.handle_rfid)])
functional_tool_assembly = self.functional_tool_id.functional_tool_name_id
if self.scrap_boolean:
# 刀柄报废 入库到Scrap
lot.create_stock_quant(location, location_dest_scrap, functional_tool_assembly.id, '功能刀具拆解',
functional_tool_assembly)
functional_tool_assembly, functional_tool_assembly.tool_groups_id)
else:
# 刀柄不报废 入库到刀具房
lot.create_stock_quant(location, location_dest, functional_tool_assembly.id, '功能刀具拆解',
functional_tool_assembly)
functional_tool_assembly, functional_tool_assembly.tool_groups_id)
# ==============功能刀具报废拆解================
if self.dismantle_cause in ['寿命到期报废', '崩刀报废']:
# 除刀柄外物料报废 入库到Scrap
@@ -853,9 +879,12 @@ class FunctionalToolDismantle(models.Model):
# 修改拆解单的值
self.write({
'rfid_dismantle': self.rfid,
'dismantle_data': fields.Datetime.now(),
'dismantle_person': self.env.user.name,
'rfid': '',
'state': '已拆解'
})
logging.info('刀具拆解成功！')
class ProductProduct(models.Model):

11
sf_tool_management/models/functional_tool.py
View File

@@ -45,7 +45,7 @@ class FunctionalCuttingToolEntity(models.Model):
active = fields.Boolean(string='已归档', default=True)
@api.depends('barcode_id.quant_ids')
@api.depends('barcode_id.quant_ids', 'functional_tool_status')
def _compute_current_location_id(self):
for record in self:
if record.barcode_id.quant_ids:
@@ -61,6 +61,12 @@ class FunctionalCuttingToolEntity(models.Model):
else:
record.current_location_id = False
record.current_location = False
if record.functional_tool_status == '已拆除':
record.current_location_id = False
record.current_location = False
record.tool_room_num = 0
record.line_edge_knife_library_num = 0
record.machine_knife_library_num = 0
def get_location_num(self):
"""
@@ -185,7 +191,8 @@ class FunctionalCuttingToolEntity(models.Model):
stock_location_id = self.env['stock.location'].search([('name', '=', '制造前')])
# 创建功能刀具该批次/序列号 库存移动和移动历史
self.barcode_id.create_stock_quant(location_inventory_id, stock_location_id,
self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id)
self.functional_tool_name_id.id, '机床装刀', self.functional_tool_name_id,
self.functional_tool_name_id.tool_groups_id)
# ==========刀具组接口==========
# def _register_functional_tool_groups(self, obj):

2
sf_tool_management/models/maintenance_equipment.py
View File

@@ -112,6 +112,8 @@ class StockLot(models.Model):
record.tool_material_status = '可用'
elif record.quant_ids[-1].location_id.name == '刀具组装位置':
record.tool_material_status = '在用'
elif record.quant_ids[-1].location_id.name == 'Scrap':
record.tool_material_status = '报废'
else:
record.tool_material_status = '未入库'
if record.tool_material_search_id:

4
sf_tool_management/models/tool_material_search.py
View File

@@ -39,9 +39,7 @@ class ToolMaterial(models.Model):
usable_num += quant.quantity
elif location == '刀具组装位置':
have_been_used_num += quant.quantity
elif location == '进货':
pass
elif location != 'Vendors':
elif location == 'Scrap':
scrap_num += quant.quantity
record.usable_num = usable_num
record.have_been_used_num = have_been_used_num