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

1、质检单类型为出厂检测报告时，隐藏通过状态下的不合格按钮；2、功能刀具组装检测BOM物料时过滤产品的追溯类型为不追溯的产品。

Browse Source
This commit is contained in:
yuxianghui
2025-06-17 11:47:26 +08:00
parent 397d4f29a1
commit 0eeebf437a
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_quality/views/quality_check_view.xml
View File

@@ -66,7 +66,7 @@
<attribute name="string">不合格</attribute>
</xpath>
<xpath expr="//header//button[@name='do_fail'][2]" position="attributes">
<attribute name="attrs">{'invisible': ['|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework'))]}</attribute>
<attribute name="attrs">{'invisible': ['|','|',('quality_state', '!=', 'pass'),('work_state','in', ('done', 'rework')),'&amp;',('quality_state', '=', 'pass'), ('test_type', '=', '出厂检验报告')]}</attribute>
<attribute name="string">不合格</attribute>
</xpath>

1
sf_tool_management/models/base.py
View File

@@ -818,6 +818,7 @@ class FunctionalToolAssembly(models.Model):
def _get_old_tool_material_lot(self, material_ids):
""" 根据先进先出原则选择物料批次 """
material_ids = material_ids.filtered(lambda m: m.tracking != 'none')
location_id = self.env['stock.location'].search([('name', '=', '刀具房')])
stock_quant = self.env['stock.quant'].sudo().search(
[('location_id', '=', location_id.id), ('product_id', 'in', material_ids.ids), ('quantity', '>', '0')],