Accept Merge Request #1262: (feature/优化下发编程单 -> develop)
Merge Request: 优化下发编程单 Created By: @杨金灵 Reviewed By: @马广威 Approved By: @马广威 Accepted By: @杨金灵 URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1262
This commit is contained in:
@@ -55,8 +55,9 @@ class Sf_Mrs_Connect(http.Controller):
|
|||||||
for panel in ret['processing_panel'].split(','):
|
for panel in ret['processing_panel'].split(','):
|
||||||
# 查询状态为进行中且工序类型为CNC加工的工单
|
# 查询状态为进行中且工序类型为CNC加工的工单
|
||||||
cnc_workorder_has = production.workorder_ids.filtered(
|
cnc_workorder_has = production.workorder_ids.filtered(
|
||||||
lambda ac: ac.routing_type == 'CNC加工' and ac.state not in ['progress', 'done',
|
lambda ach: ach.routing_type == 'CNC加工' and ach.state not in ['progress', 'done',
|
||||||
'cancel'] and ac.processing_panel == panel)
|
'rework',
|
||||||
|
'cancel'] and ach.processing_panel == panel)
|
||||||
if cnc_workorder_has:
|
if cnc_workorder_has:
|
||||||
if cnc_workorder_has.cnc_ids:
|
if cnc_workorder_has.cnc_ids:
|
||||||
cnc_workorder_has.cmm_ids.sudo().unlink()
|
cnc_workorder_has.cmm_ids.sudo().unlink()
|
||||||
|
|||||||
Reference in New Issue
Block a user