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

Accept Merge Request #1196: (feature/修复返工-cmm -> develop)

Browse Source 
Merge Request: 修复返工-cmm

Created By: @杨金灵
Reviewed By: @马广威
Approved By: @马广威 
Accepted By: @杨金灵
URL: https://jikimo-hn.coding.net/p/jikimo_sfs/d/jikimo_sf/git/merge/1196?initial=true
This commit is contained in:
杨金灵
2024-07-29 16:43:46 +08:00
committed by Coding
parent f0a887887e a81ad08740
commit 362801f527
2 changed files with 8 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
sf_manufacturing/models/mrp_production.py
View File

@@ -36,17 +36,12 @@ class MrpProduction(models.Model):
def _compute_tool_state_remark(self):
for item in self:
if item.workorder_ids:
work_ids = []
for workorder_id in item.workorder_ids:
if workorder_id.tool_state == '1':
work_ids.append(workorder_id)
if work_ids:
workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ('rework', '返工'))
if workorder_ids.filtered(lambda a: a.tool_state_remark):
work_ids = workorder_ids.filtered(lambda a: a.tool_state_remark)
tool_state_remark = ''
for work_id in work_ids:
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}"
tool_state_remark = f"{work_id.tool_state_remark}\n"
item.tool_state_remark = tool_state_remark
else:
item.tool_state_remark = False
@@ -56,16 +51,10 @@ class MrpProduction(models.Model):
for item in self:
if item.workorder_ids:
tool_state = item.tool_state
work_ids_1 = []
work_ids_2 = []
for workorder_id in item.workorder_ids:
if workorder_id.tool_state == '2':
work_ids_2.append(workorder_id)
elif workorder_id.tool_state == '1':
work_ids_1.append(workorder_id)
if work_ids_2:
workorder_ids = item.workorder_ids.filtered(lambda a: a.state not in ('rework', '返工'))
if workorder_ids.filtered(lambda a: a.tool_state == '2'):
item.tool_state = '2'
elif work_ids_1:
elif workorder_ids.filtered(lambda a: a.tool_state == '1'):
item.tool_state = '1'
else:
item.tool_state = '0'

2
sf_manufacturing/wizard/rework_wizard.py
View File

@@ -132,7 +132,7 @@ class ReworkWizard(models.TransientModel):
'sequence_number': cmm_line.sequence_number,
'program_name': cmm_line.program_name,
'program_path': cmm_line.program_path,
'ftp_path': item_line.program_path,
'ftp_path': cmm_line.program_path,
'processing_panel': panel.name,
'program_create_date': datetime.strftime(
cmm_line.program_create_date,