Accept Merge Request #1310: (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/1310?initial=true
This commit is contained in:
禹翔辉
2024-09-18 11:56:37 +08:00
committed by Coding

View File

@@ -1025,10 +1025,10 @@ class ResMrpWorkOrder(models.Model):
# 查询工序最小的非完工、非返工的装夹预调工单 # 查询工序最小的非完工、非返工的装夹预调工单
work_id = self.search( work_id = self.search(
[('production_id', '=', workorder.production_id.id), [('production_id', '=', workorder.production_id.id),
('routing_type', '=', '装夹预调'),
('state', 'not in', ['rework', 'done', 'cancel'])], ('state', 'not in', ['rework', 'done', 'cancel'])],
limit=1, limit=1,
order="sequence") order="sequence")
if work_id.routing_type == '装夹预调':
if workorder == work_id: if workorder == work_id:
if workorder.production_id.reservation_state == 'assigned': if workorder.production_id.reservation_state == 'assigned':
workorder.state = 'ready' workorder.state = 'ready'