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

Accept Merge Request #1197: (feature/工单优化_2 -> develop)

Browse Source 
Merge Request: 恢复制造订单的功能刀具备注字段自动计算方法代码

Created By: @禹翔辉
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @禹翔辉
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1197
This commit is contained in:
禹翔辉
2024-07-29 17:05:01 +08:00
committed by Coding
parent 362801f527 683d79a4e3
commit 56317ab111
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sf_manufacturing/models/mrp_production.py
View File

@@ -36,12 +36,15 @@ class MrpProduction(models.Model):
def _compute_tool_state_remark(self): def _compute_tool_state_remark(self):
for item in self: for item in self:
if item.workorder_ids: if item.workorder_ids:
workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ('rework', '返工')) workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ['rework', 'done', 'cancel'])
if workorder_ids.filtered(lambda a: a.tool_state_remark): if workorder_ids.filtered(lambda a: a.tool_state == '1'):
work_ids = workorder_ids.filtered(lambda a: a.tool_state_remark) work_ids = workorder_ids.filtered(lambda a: a.tool_state == '1')
tool_state_remark = '' tool_state_remark = ''
for work_id in work_ids: for work_id in work_ids:
tool_state_remark = f"{work_id.tool_state_remark}\n" if tool_state_remark == '':
tool_state_remark = f'{work_id.tool_state_remark}'
else:
tool_state_remark = f"{tool_state_remark}\n{work_id.tool_state_remark}"
item.tool_state_remark = tool_state_remark item.tool_state_remark = tool_state_remark
else: else:
item.tool_state_remark = False item.tool_state_remark = False
@@ -51,7 +54,7 @@ class MrpProduction(models.Model):
for item in self: for item in self:
if item.workorder_ids: if item.workorder_ids:
tool_state = item.tool_state tool_state = item.tool_state
workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ('rework', '返工')) workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ['rework', 'done', 'cancel'])
if workorder_ids.filtered(lambda a: a.tool_state == '2'): if workorder_ids.filtered(lambda a: a.tool_state == '2'):
item.tool_state = '2' item.tool_state = '2'
elif workorder_ids.filtered(lambda a: a.tool_state == '1'): elif workorder_ids.filtered(lambda a: a.tool_state == '1'):