Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
sungrowpowernew
Project
Project
Details
Activity
Releases
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
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
gavelinfo
sungrowpowernew
Commits
c4e2b425
Commit
c4e2b425
authored
Oct 26, 2022
by
zhoumaotao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
2
parent
4b9df0e9
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
McsRestServiceImpl.java
...n/java/com/gavel/mcs/service/impl/McsRestServiceImpl.java
+6
-3
No files found.
gavel/src/main/java/com/gavel/mcs/service/impl/McsRestServiceImpl.java
View file @
c4e2b425
...
@@ -514,12 +514,14 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
...
@@ -514,12 +514,14 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
agvtaskService
.
insert
(
agvtask
);
agvtaskService
.
insert
(
agvtask
);
messageService
.
msgPush
(
"SUPERUSER"
,
"task"
,
"工位【"
+
gw
.
getName
()
+
"】开始叫料"
);
//
messageService.msgPush("SUPERUSER", "task", "工位【" + gw.getName() + "】开始叫料");
if
(
allowedMap
(
gw
)){
if
(
allowedMap
(
gw
)){
voiceService
.
submit
(
new
VoiceTask
(
gw
.
getName
()
+
"正在叫料"
),
true
);
voiceService
.
submit
(
new
VoiceTask
(
gw
.
getName
()
+
"正在叫料"
),
true
);
}
}
logger
.
info
(
"MES任务单号:"
+
workingTask
.
getTaskCode
()+
"远程确认成功!"
);
}
finally
{
}
finally
{
LockUtils
.
releaseLock
(
lockKey
,
uniqueKey
);
LockUtils
.
releaseLock
(
lockKey
,
uniqueKey
);
}
}
...
@@ -572,7 +574,7 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
...
@@ -572,7 +574,7 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
agvtask
.
setTaskStatus
(
"6"
);
//继续执行
agvtask
.
setTaskStatus
(
"6"
);
//继续执行
agvtaskService
.
update
(
agvtask
);
agvtaskService
.
update
(
agvtask
);
logger
.
info
(
"MES任务单号:"
+
workingTask
.
getTaskCode
()+
"确认成功!"
);
logger
.
info
(
"MES任务单号:"
+
workingTask
.
getTaskCode
()+
"
远程
确认成功!"
);
}
}
...
@@ -613,7 +615,8 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
...
@@ -613,7 +615,8 @@ public class McsRestServiceImpl extends BaseEditServiceImpl implements McsRestSe
task
.
setCancelDate
(
Calendar
.
getInstance
().
getTime
());
task
.
setCancelDate
(
Calendar
.
getInstance
().
getTime
());
agvtaskService
.
update
(
task
);
agvtaskService
.
update
(
task
);
messageService
.
msgPush
(
"SUPERUSER"
,
"task"
,
"工位【"
+
gw
.
getName
()
+
"】取消叫料"
);
logger
.
info
(
"MES任务单号:"
+
workingTask
.
getTaskCode
()+
"远程确认成功!"
);
//messageService.msgPush("SUPERUSER", "task", "工位【" + gw.getName() + "】取消叫料");
}
}
@Override
@Override
...
...
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