Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
dwsproject
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dws
dwsproject
Commits
5fe4b5a3
Commit
5fe4b5a3
authored
Nov 28, 2024
by
夏超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] 继承父级获取工单信息接口,修改获取工艺信息逻辑
parent
03f27621
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
3 deletions
+7
-3
jzjx_project/controllers/roke_work_order.py
+5
-3
jzjx_project/models/inherit_roke_work_order.py
+1
-0
jzjx_project/wizard/inherit_roke_create_work_record_wizard.py
+1
-0
No files found.
jzjx_project/controllers/roke_work_order.py
View file @
5fe4b5a3
...
...
@@ -36,15 +36,17 @@ class InheritRokeWorkstationWorkOrder(RokeWorkstationWorkOrder):
if
not
repair_order_line
:
return
res
res
.
get
(
"data"
,
{})
.
update
({
"routing_id"
:
repair_order_line
.
order_id
.
wr_id
.
work_order_id
.
task_id
.
routing_id
.
id
,
"routing_line_id"
:
repair_order_line
.
order_id
.
wr_id
.
work_order_id
.
routing_line_id
.
id
"routing_id"
:
work_order
.
repair_
wr_id
.
work_order_id
.
task_id
.
routing_id
.
id
,
"routing_line_id"
:
work_order
.
repair_
wr_id
.
work_order_id
.
routing_line_id
.
id
})
elif
work_order
.
type
==
"补件"
:
scrap_order_line
=
_self
.
env
[
"roke.scrap.order.line"
]
.
search
([(
"scrap_work_order_ids"
,
"="
,
work_order
.
id
)],
limit
=
1
)
if
not
scrap_order_line
:
return
res
routing_id
=
scrap_order_line
.
order_id
.
wr_id
.
work_order_id
.
task_id
.
routing_id
task_id
=
scrap_order_line
.
order_id
.
wr_id
.
work_order_id
.
task_id
or
\
scrap_order_line
.
order_id
.
wr_id
.
repair_task_id
routing_id
=
task_id
.
routing_id
line_id
=
0
for
v
in
routing_id
.
line_ids
:
if
work_order
.
process_id
.
id
!=
v
.
process_id
.
id
:
...
...
jzjx_project/models/inherit_roke_work_order.py
View file @
5fe4b5a3
...
...
@@ -8,6 +8,7 @@ class InheritWorkOrder(models.Model):
document_ids
=
fields
.
Many2many
(
related
=
"task_id.document_ids"
,
string
=
"作业指导"
)
task_file_ids
=
fields
.
Many2many
(
related
=
"task_id.file_ids"
)
repair_task_id
=
fields
.
Many2one
(
'roke.production.task'
,
string
=
"上级任务"
)
repair_wr_id
=
fields
.
Many2one
(
'roke.work.record'
,
string
=
"原始返修报工工单"
)
def
write
(
self
,
vals
):
id_dict
=
{}
...
...
jzjx_project/wizard/inherit_roke_create_work_record_wizard.py
View file @
5fe4b5a3
...
...
@@ -46,6 +46,7 @@ class InheritRokeCreateWorkRecordWizard(models.TransientModel):
"planned_start_time"
:
new_record
.
work_order_id
.
planned_start_time
,
"plan_date"
:
new_record
.
work_order_id
.
plan_date
,
"repair_task_id"
:
new_record
.
pt_id
.
id
or
repair
.
wo_id
.
repair_task_id
.
id
,
"repair_wr_id"
:
repair
.
wo_id
.
repair_wr_id
.
id
or
new_record
.
id
,
"repair_line_id"
:
v
.
id
,
"type"
:
"返修"
})
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment