huojin
/
Byd_Dg_Java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

main
HUOJIN\92525 2025-03-24 14:29:31 +08:00
parent 88319e1221
commit 5ac9257990
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
youchain-system/src/main/java/com/youchain/basicdata/service/impl/StockServiceImpl.java
View File

@ -264,7 +264,6 @@ public class StockServiceImpl implements StockService {
if (BaseStatus.USED.equals(stock.getStatus()) || stock.getPoint() != null) { if (BaseStatus.USED.equals(stock.getStatus()) || stock.getPoint() != null) {
throw new BadRequestException(stock.getCode() + "容器已占用,请更换容器!"); throw new BadRequestException(stock.getCode() + "容器已占用,请更换容器!");
} }
} }
/** /**

13
youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java
View File

@ -341,13 +341,10 @@ public class MesServiceImpl implements MesService {
return "成品入库区和成品下线缓存区都没有空闲点位,请稍后再试!"; return "成品入库区和成品下线缓存区都没有空闲点位,请稍后再试!";
} }
} }
//验证容器是否有任务
if(!agvTaskService.isStockAvailable(stock.getCode(),BizStatus.Cp_Off_Line,"RACK_MOVE")){
return transTask.getPointCode() + "点位有任务，请稍后再试!";
}
// 验证终点是否有任务 // 验证终点是否有任务
if (!agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.Cp_Off_Line, "RACK_MOVE")) { if (!agvTaskService.isSrcPointAvailable(srcPoint.getCode(), BizStatus.Cp_Off_Line, "RACK_MOVE")) {
return transTask.getPointCode() + "点位有任务，请稍后再试!"; return srcPoint.getCode() + "点位有任务，请稍后再试!";
} }
// 创建Agv任务 // 创建Agv任务
@ -448,8 +445,8 @@ public class MesServiceImpl implements MesService {
Point endPoint = endPointList.get(0); Point endPoint = endPointList.get(0);
if (!agvTaskService.isEndPointAvailable(endPoint.getCode(), BizStatus.JL_Back, "RACK_MOVE")) { if (!agvTaskService.isSrcPointAvailable(srcPoint.getCode(), BizStatus.JL_Back, "RACK_MOVE")) {
return endPoint.getCode() + "点位有任务，请稍后再试!"; return srcPoint.getCode() + "点位有任务，请稍后再试!";
} }
// 生成任务 // 生成任务