Accept Merge Request #1170: (feature/修复工单cnc校验bug_2 -> 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/1170
This commit is contained in:
禹翔辉
2024-07-24 16:24:13 +08:00
committed by Coding

View File

@@ -777,6 +777,8 @@ class ResMrpWorkOrder(models.Model):
if workorder.production_id.is_rework is True:
if re_work or cnc_workorder:
workorder.state = 'waiting'
if workorder.production_id.tool_state in ['1', '2'] and workorder.state != 'pending':
workorder.state = 'waiting'
elif workorder.routing_type == 'CNC加工' and workorder.state not in ['done', 'rework', 'cancel']:
pre_workorder = self.env['mrp.workorder'].search(