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

no message

main
HUOJIN\92525 2025-03-14 16:22:29 +08:00
parent 905d028b0e
commit e14819bbc8
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,6 +303,9 @@ public class MesServiceImpl implements MesService {
} }
//容器 //容器
Stock stock = stockService.findByPointCode(srcPoint.getCode()); Stock stock = stockService.findByPointCode(srcPoint.getCode());
if(stock==null){
return transTask.getPointCode() + "点位没有关联容器!";
}
Point endPoint = null; Point endPoint = null;
//判断起点是CPXX003则任务搬运到成品下线异常缓存区，否则搬运到成品上线区 //判断起点是CPXX003则任务搬运到成品下线异常缓存区，否则搬运到成品上线区

16
youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java
View File

@ -70,7 +70,7 @@ public class TaskServiceImpl implements TaskService {
// 存储日志添加顺序 // 存储日志添加顺序
private final ConcurrentLinkedQueue<String> logOrderQueue = new ConcurrentLinkedQueue<>(); private final ConcurrentLinkedQueue<String> logOrderQueue = new ConcurrentLinkedQueue<>();
// 集合最大容量 // 集合最大容量
private static final int MAX_LOG_CAPACITY = 135; private static final int MAX_LOG_CAPACITY = 200;
@Override @Override
public Map<String, Object> queryAll(TaskQueryCriteria criteria, Pageable pageable) { public Map<String, Object> queryAll(TaskQueryCriteria criteria, Pageable pageable) {
@ -229,11 +229,21 @@ public class TaskServiceImpl implements TaskService {
//绑定任务 //绑定任务
List<Task> taskList = this.findByPickAllTask(pick.getId()); List<Task> taskList = this.findByPickAllTask(pick.getId());
if (taskList.isEmpty()) { if (taskList.isEmpty()) {
throw new BadRequestException(pick.getGdCode() + "工单没有进行翻包!"); String logMessage = pick.getGdCode() + "工单没有进行翻包!";
if (!lastPollLogMessages.containsKey(logMessage)) {
logService.saveLogInfo(pick.getGdCode(), pick.getGdCode(), "/pick/callJlTask", logMessage, "生成叫料任务", 200, "info");
addLog(logMessage);
}
return;
} }
//工单是否叫料 //工单是否叫料
if (StringUtils.isEmpty(pick.getCallPoint())) { if (StringUtils.isEmpty(pick.getCallPoint())) {
throw new BadRequestException(pick.getGdCode() + "工单没有进行叫料!"); String logMessage = pick.getGdCode() + "工单没有进行叫料!";
if (!lastPollLogMessages.containsKey(logMessage)) {
logService.saveLogInfo(pick.getGdCode(), pick.getGdCode(), "/pick/callJlTask", logMessage, "生成叫料任务", 200, "info");
addLog(logMessage);
}
return;
} }
//终点 //终点
Set<String> endPointList = new HashSet<>(Arrays.asList(pick.getCallPoint().split(","))); Set<String> endPointList = new HashSet<>(Arrays.asList(pick.getCallPoint().split(",")));