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

Merge branch 'feature/刀具物料查询模型重构' into feature/功能刀具组装优化

Browse Source
This commit is contained in:
yuxianghui
2024-02-20 14:40:28 +08:00
parent 4379854b89 0183a5ab2b
commit 5c24cec4f6
3 changed files with 23 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sf_tool_management/models/base.py
View File

@@ -956,18 +956,6 @@ class FunctionalToolAssembly(models.Model):
return functional_tool
return False
def automated_assembly(self):
"""
todo 自动组装
:return:
"""
def automatic_printing_of_QR_code(self):
"""
todo 自动打印二维码
:return:
"""
def assemble_single_print(self):
"""
todo 组装单打印

20
sf_tool_management/views/tool_base_views.xml
View File

@@ -967,10 +967,10 @@
}"
attrs="{'invisible': [('assemble_status', '!=', '0')]}" groups="sf_base.group_sf_mrp_user"
class="btn-primary"/>
<button string="组装单打印" name="assemble_single_print" type="object"
groups="sf_base.group_sf_mrp_user"
attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
confirm="是否确认打印组装单"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
</tree>
</field>
</record>
@@ -1006,14 +1006,10 @@
attrs="{'invisible': [('assemble_status', '!=', '0')]}"
class="btn-primary"/>
<button string="打印二维码" name="automatic_printing_of_QR_code" type="object"
groups="sf_base.group_sf_mrp_user"
attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
confirm="是否确认打印二维码"/>
<button string="组装单打印" name="assemble_single_print" type="object"
groups="sf_base.group_sf_mrp_user"
attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"
confirm="是否确认打印组装单"/>
<!-- <button string="组装单打印" name="assemble_single_print" type="object"-->
<!-- groups="sf_base.group_sf_mrp_user"-->
<!-- attrs="{'invisible': [('assemble_status', '=', '0')]}" class="btn-primary"-->
<!-- confirm="是否确认打印组装单"/>-->
<field name="assemble_status" widget="statusbar" statusbar_visible="0,1"/>
</header>
<sheet>

15
sf_tool_management/wizard/wizard.py
View File

@@ -445,6 +445,21 @@ class FunctionalToolAssemblyOrder(models.TransientModel):
if obj.after_assembly_functional_tool_length == 0:
raise ValidationError('组装参数信息【伸出长】不能为0！！！')
@api.constrains('rfid')
def _check_rfid(self):
self.get_rfid()
@api.onchange('rfid')
def _onchange_rfid(self):
self.get_rfid()
def get_rfid(self):
for obj in self:
if obj.rfid:
tool_entity = self.env['sf.functional.cutting.tool.entity'].sudo().search([('rfid', '=', obj.rfid)])
if tool_entity:
raise ValidationError('【%s】的rfid已被使用，请重新录入！！！' % obj.rfid)
def functional_tool_assembly(self):
"""
功能刀具组装