root/beiterui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1.取消任务fix

Browse Source 
2.包片机任务取QHQ点位
This commit is contained in:
psh
2024-01-12 18:11:17 +08:00
parent c232a96ab4
commit 9fa9f8fcb4
4 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/auto/run/OneNDCSocketConnectionAutoRun.java
View File

@@ -86,7 +86,6 @@ public class OneNDCSocketConnectionAutoRun extends AbstractAutoRunnable {
ip = paramService.findByCode(AcsConfig.AGVURL).getValue();
port = Integer.parseInt(paramService.findByCode(AcsConfig.AGVPORT).getValue());
try {
byte[] b = new byte[1024];
s = new Socket(ip, port);

12
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/task/service/impl/TaskServiceImpl.java
View File

@@ -999,12 +999,12 @@ public class TaskServiceImpl extends CommonServiceImpl<TaskMapper, Task> impleme
}
}
List<RouteLineDto> shortPathsList =
routeLineService.getShortPathLines(
entity.getStart_device_code(),
entity.getNext_device_code(),
entity.getRoute_plan_code());
String type = shortPathsList.get(0).getType();
// List<RouteLineDto> shortPathsList =
// routeLineService.getShortPathLines(
// entity.getStart_device_code(),
// entity.getNext_device_code(),
// entity.getRoute_plan_code());
// String type = shortPathsList.get(0).getType();
// != 0 为agv任务
// if (!StrUtil.equals(type, "0")) {
// if (StrUtil.equals(paramService.findByCode(AcsConfig.AGVTYPE).getValue(), "3")) {