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
1
Merge Requests
1
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
ea97d472
Commit
ea97d472
authored
Jan 16, 2025
by
夏超
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[fix] 修改工位机获取工单数据逻辑
parent
55d59b71
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
sdddl_project/controllers/inherit_production_task.py
+2
-2
No files found.
sdddl_project/controllers/inherit_production_task.py
View file @
ea97d472
...
@@ -39,7 +39,7 @@ class InheritRokeWorkstationProductionTask(RokeWorkstationProductionTask):
...
@@ -39,7 +39,7 @@ class InheritRokeWorkstationProductionTask(RokeWorkstationProductionTask):
if
not
process_ids
:
if
not
process_ids
:
return
{
"code"
:
0
,
"message"
:
"获取成功!"
,
"data"
:
[],
"process_ids"
:
[],
"count"
:
0
}
return
{
"code"
:
0
,
"message"
:
"获取成功!"
,
"data"
:
[],
"process_ids"
:
[],
"count"
:
0
}
domain
=
[
domain
=
[
(
"
work_center_id"
,
"="
,
False
),
(
"
routing_line_id.special_process"
,
"="
,
'否'
),
(
"task_id.workshop_id"
,
"="
,
workstation
.
workshop_id
.
id
),
(
"task_id.workshop_id"
,
"="
,
workstation
.
workshop_id
.
id
),
(
"process_id"
,
"in"
,
process_list
),
(
"process_id"
,
"in"
,
process_list
),
(
"state"
,
"in"
,
[
"未完工"
,
"暂停"
])
(
"state"
,
"in"
,
[
"未完工"
,
"暂停"
])
...
@@ -217,7 +217,7 @@ class InheritRokeWorkstationWorkOrder(RokeWorkstationWorkOrder):
...
@@ -217,7 +217,7 @@ class InheritRokeWorkstationWorkOrder(RokeWorkstationWorkOrder):
domain
=
[
domain
=
[
(
"process_id"
,
"in"
,
process_ids
),
(
"process_id"
,
"in"
,
process_ids
),
(
"state"
,
"in"
,
[
"未完工"
,
"暂停"
]),
(
"state"
,
"in"
,
[
"未完工"
,
"暂停"
]),
(
"
work_center_id"
,
"="
,
False
)
(
"
routing_line_id.special_process"
,
"="
,
'否'
)
]
]
domain
=
expression
.
OR
([
domain
,
[(
"work_center_id"
,
"="
,
work_center_id
),
(
"state"
,
"in"
,
[
"未完工"
,
"暂停"
])]])
domain
=
expression
.
OR
([
domain
,
[(
"work_center_id"
,
"="
,
work_center_id
),
(
"state"
,
"in"
,
[
"未完工"
,
"暂停"
])]])
domain
=
expression
.
AND
([[(
"task_id"
,
"="
,
task_id
)],
domain
])
domain
=
expression
.
AND
([[(
"task_id"
,
"="
,
task_id
)],
domain
])
...
...
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