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

Merge branch 'develop' of https://e.coding.net/jikimo-hn/jikimo_sfs/jikimo_sf into feature/制造功能优化

Browse Source
This commit is contained in:
mgw
2024-10-18 10:17:38 +08:00
parent 182eb83090 33d23c28b1
commit 953d675dcf
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sf_message/models/sf_message_workorder.py
View File

@@ -153,6 +153,6 @@ class SFMessageWork(models.Model):
getattr(item, queue_method_name)(*args) getattr(item, queue_method_name)(*args)
def _recover_time_warning_func(self): def _recover_time_warning_func(self):
workorder_done = self.env['mrp.workorder'].search([("state", "=", "done")]) workorder_done = self.env['mrp.workorder'].search([("state", "in", ["done", "rework", "cancel"])])
workorder_overdue = workorder_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning']) workorder_overdue = workorder_done.filtered(lambda x: x.delivery_warning in ['overdue', 'warning'])
workorder_overdue.write({'delivery_warning': 'normal'}) workorder_overdue.write({'delivery_warning': 'normal'})

8
sf_tool_management/models/mrp_workorder.py
View File

@@ -175,7 +175,9 @@ class MrpProduction(models.Model):
cnc_ids = self.env['sf.cnc.processing'].sudo().search( cnc_ids = self.env['sf.cnc.processing'].sudo().search(
[('workorder_id', 'in', workorder_ids.ids), ('cutting_tool_name', 'in', invalid_tool)]) [('workorder_id', 'in', workorder_ids.ids), ('cutting_tool_name', 'in', invalid_tool)])
if cnc_ids: if cnc_ids:
cnc_ids.write({'tool_state': '2'}) for cnc_id in cnc_ids:
cnc_id.tool_state = '2'
# cnc_ids.write({'tool_state': '2'})
# 创建制造订单无效刀检测结果记录 # 创建制造订单无效刀检测结果记录
for production_id in self: for production_id in self:
for processing_panel in list(set(invalid_tool_processing_panel)): for processing_panel in list(set(invalid_tool_processing_panel)):
@@ -204,7 +206,9 @@ class MrpProduction(models.Model):
cnc_ids = self.env['sf.cnc.processing'].sudo().search( cnc_ids = self.env['sf.cnc.processing'].sudo().search(
[('workorder_id', 'in', workorder_ids.ids), ('cutting_tool_name', 'in', missing_tool_1)]) [('workorder_id', 'in', workorder_ids.ids), ('cutting_tool_name', 'in', missing_tool_1)])
if cnc_ids: if cnc_ids:
cnc_ids.write({'tool_state': '1'}) for cnc_id in cnc_ids:
cnc_id.tool_state = '1'
# cnc_ids.write({'tool_state': '1'})
if missing_tool_2 and invalid_tool == []: if missing_tool_2 and invalid_tool == []:
logging.info(f'库存缺刀：{missing_tool_2}') logging.info(f'库存缺刀：{missing_tool_2}')
# 调用CAM工单程序用刀计划创建方法 # 调用CAM工单程序用刀计划创建方法