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

1、0x05再反馈任务完成

Browse Source 
2、空架满了不报错保证不重复发送
3、满架下料二次分配再锁
This commit is contained in:
psh
2024-01-08 13:57:56 +08:00
parent 35edc07e4f
commit 5b0e2c1d55
4 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
acs/nladmin-system/nlsso-server/src/main/java/org/nl/acs/device_driver/basedriver/agv/ndcone/AgvNdcOneDeviceDriver.java
View File

@@ -178,7 +178,6 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
if(device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if(standardInspectSiteDeviceDriver.getAction()==1){
standardInspectSiteDeviceDriver.writing(2);
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
}else{
log.info("当前涂板线未允许取货");
@@ -227,6 +226,15 @@ public class AgvNdcOneDeviceDriver extends AbstractDeviceDriver implements Devic
logServer.deviceExecuteLog(this.device_code, "", "", "未找到关联编号对应的指令" + ikey);
return;
}
StandardInspectSiteDeviceDriver standardInspectSiteDeviceDriver;
if(device.getDeviceDriver() instanceof StandardInspectSiteDeviceDriver){
standardInspectSiteDeviceDriver = (StandardInspectSiteDeviceDriver) device.getDeviceDriver();
if(standardInspectSiteDeviceDriver.getAction()==1){
standardInspectSiteDeviceDriver.writing(2);
}
}
data = NDCAgvService.sendAgvOneModeInst(phase, index, 0, 0, 0, 0, 0);
//到达放货等待点
//(需要WCS反馈)

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/service/impl/AcsToWmsServiceImpl.java
View File

@@ -100,9 +100,7 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
// 执行创建任务
task.apply(param);
} catch (Exception e) {
String message = ObjectUtil.isEmpty(e.getMessage())
? ((InvocationTargetException) e).getTargetException().getMessage()
: e.getMessage();
String message = e.getMessage();
log.error("ACS请求LMS出现错误: {}", message);
result.setCode(HttpStatus.HTTP_BAD_REQUEST);
result.setMessage(message);

4
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/KGHJRKTask.java
View File

@@ -128,7 +128,7 @@ public class KGHJRKTask extends AbstractTask {
if (schBasePoint != null) {
log.info("空固化架放货找到当前点位有货：{}，取上一个空位：{}", temp.getPoint_code(), schBasePoint.getPoint_code());
} else {
throw new BadRequestException("当前区域："+regionCode+"所有点位均已放满，暂时跳过");
log.info("当前区域："+regionCode+"所有点位均已放满，暂时跳过");
}
break;
}
@@ -143,7 +143,7 @@ public class KGHJRKTask extends AbstractTask {
}
}
if (schBasePoint==null){
throw new BadRequestException("当前区域："+regionCode+"所有点位均已放满，暂时跳过");
log.info("当前区域："+regionCode+"所有点位均已放满，暂时跳过");
}
}
return schBasePoint;

7
lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/sch/task_manage/task/tasks/MJXLTask.java
View File

@@ -98,7 +98,7 @@ public class MJXLTask extends AbstractTask {
taskService.update(task);
//发起任务时先把点位占用，防止发起重复任务
point.setIng_task_code(task.getTask_code());
// point.setIng_task_code(task.getTask_code());
point.setVehicle_type(materialType);
pointService.update(point);
@@ -288,8 +288,11 @@ public class MJXLTask extends AbstractTask {
.eq(SchBasePoint::getPoint_code, schBaseTask.getPoint_code1()));
SchBasePoint point = findNextPoint(startPoint, extGroupData);
schBaseTask.setPoint_code2(point.getPoint_code()+"0"+(point.getVehicle_qty()+1));
if(point.getIng_task_code()!=null){
if(ObjectUtil.isNotEmpty(point.getIng_task_code())&&!schBaseTask.getTask_code().equals(point.getIng_task_code())){
throw new BadRequestException("当前固化室点位有任务，暂不反馈！");
}
//重算点位时把点位占用
point.setIng_task_code(schBaseTask.getTask_code());
pointService.update(point);
}
}