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

1、功能刀具拆解单添加功能刀具唯一校验；2、功能刀具模型tree视图的状态字段根据不同状态添加不同颜色；当功能刀具状态为报警时，自动创建拆解单和预警记录，并添加拆解单链接按钮；添加tree视图按状态排序，将报警状态刀具记录显示在最前面；3、优化功能刀具预警模型字段及关联关系，添加预警记录跳转到对应由该功能刀具生成的拆解单链接；

Browse Source
This commit is contained in:
yuxianghui
2024-08-12 17:25:56 +08:00
parent e6ca4c27ac
commit 894d3b9ea3
4 changed files with 103 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
sf_tool_management/models/base.py
View File

@@ -760,6 +760,15 @@ class FunctionalToolDismantle(models.Model):
functional_tool_id = fields.Many2one('sf.functional.cutting.tool.entity', '功能刀具', required=True, tracking=True,
domain=[('functional_tool_status', '!=', '已拆除'),
('current_location', '=', '刀具房')])
@api.onchange('functional_tool_id')
def _onchange_functional_tool_id(self):
for item in self:
if item:
dismantle_id = self.search([('functional_tool_id', '=', item.functional_tool_id.id)])
if dismantle_id:
raise ValidationError(f'Rfid为【{item.rfid}】的功能刀具已经存在拆解单，单号是【{dismantle_id[0].code}】')
tool_type_id = fields.Many2one('sf.functional.cutting.tool.model', string='功能刀具类型', store=True,
compute='_compute_functional_tool_num')
tool_groups_id = fields.Many2one('sf.tool.groups', '刀具组', compute='_compute_functional_tool_num', store=True)
@@ -942,11 +951,13 @@ class FunctionalToolDismantle(models.Model):
logging.info('%s刀具确认开始拆解' % self.dismantle_cause)
code = self.code
if self.functional_tool_id.functional_tool_status == '已拆除':
raise ValidationError('Rfid为【%s】的功能刀具已经拆解，请勿重复操作！' % self.functional_tool_id.rfid_dismantle)
raise ValidationError('Rfid为【%s】名称为【%s】的功能刀具已经拆解，请勿重复操作！' % (
self.functional_tool_id.rfid_dismantle, self.name))
# 对拆解的功能刀具进行校验，只有在刀具房的功能刀具才能拆解
if self.functional_tool_id.tool_room_num == 0:
raise ValidationError('Rfid为【%s】的功能刀具当前位置为【%s】，不能进行拆解！' % (
self.rfid, self.functional_tool_id.current_location))
elif self.functional_tool_id.functional_tool_status != '报警':
if self.functional_tool_id.tool_room_num == 0:
raise ValidationError('Rfid为【%s】的功能刀具当前位置为【%s】，不能进行拆解！' % (
self.rfid, self.functional_tool_id.current_location))
# 目标重复校验
self.location_duplicate_check()
datas = {'scrap': [], 'picking': []}