Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
I
integrated-scheduling-v3
Project
Project
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
张晓彤
integrated-scheduling-v3
Commits
a98830d6
Commit
a98830d6
authored
Dec 30, 2021
by
张晓彤
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
019e2ea2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
dump.py
equipment/dump.py
+2
-2
excavator.py
equipment/excavator.py
+2
-2
No files found.
equipment/dump.py
View file @
a98830d6
...
@@ -148,8 +148,8 @@ class DumpInfo(WalkManage):
...
@@ -148,8 +148,8 @@ class DumpInfo(WalkManage):
unload_ability
=
session_postgre
.
query
(
DumpArea
)
.
filter_by
(
Id
=
unload_area_id
)
.
first
()
.
UnloadAbililty
unload_ability
=
session_postgre
.
query
(
DumpArea
)
.
filter_by
(
Id
=
unload_area_id
)
.
first
()
.
UnloadAbililty
self
.
dump_strength
[
dump_index
]
=
unload_ability
# 卸载设备最大卸载能力,单位吨/小时
self
.
dump_strength
[
dump_index
]
=
unload_ability
# 卸载设备最大卸载能力,单位吨/小时
if
unload_ability
<
200
:
#
if unload_ability < 200:
raise
Exception
(
"卸载点卸载能力异常"
)
#
raise Exception("卸载点卸载能力异常")
else
:
else
:
self
.
dump_strength
=
np
.
full
(
self
.
dynamic_dump_num
,
5000
)
self
.
dump_strength
=
np
.
full
(
self
.
dynamic_dump_num
,
5000
)
...
...
equipment/excavator.py
View file @
a98830d6
...
@@ -174,8 +174,8 @@ class ExcavatorInfo(WalkManage):
...
@@ -174,8 +174,8 @@ class ExcavatorInfo(WalkManage):
filter
(
Equipment
.
id
==
self
.
excavator_index_to_uuid_dict
[
excavator_index
])
.
first
()
filter
(
Equipment
.
id
==
self
.
excavator_index_to_uuid_dict
[
excavator_index
])
.
first
()
self
.
excavator_strength
[
excavator_index
]
=
load_ability
.
mining_abililty
self
.
excavator_strength
[
excavator_index
]
=
load_ability
.
mining_abililty
if
load_ability
.
mining_abililty
<
200
:
#
if load_ability.mining_abililty < 200:
raise
Exception
(
"挖机装载能力异常"
)
#
raise Exception("挖机装载能力异常")
else
:
else
:
self
.
excavator_strength
=
np
.
full
(
self
.
dynamic_excavator_num
,
5000
)
self
.
excavator_strength
=
np
.
full
(
self
.
dynamic_excavator_num
,
5000
)
...
...
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