From e14819bbc897d526e99c4f2e6a84fa18a140fe45 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <jin982011>
Date: Fri, 14 Mar 2025 16:22:29 +0800
Subject: [PATCH] no message

---
 .../service/impl/MesServiceImpl.java             |  3 +++
 .../service/impl/TaskServiceImpl.java            | 16 +++++++++++++---
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java
index 48aa358..0443b0d 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/MesServiceImpl.java
@@ -303,6 +303,9 @@ public class MesServiceImpl implements MesService {
         }
         //容器
         Stock stock = stockService.findByPointCode(srcPoint.getCode());
+        if(stock==null){
+            return transTask.getPointCode() + "点位没有关联容器!";
+        }
 
         Point endPoint = null;
         //判断起点是CPXX003则任务搬运到成品下线异常缓存区，否则搬运到成品上线区
diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java
index 206c5b5..e3b89ff 100644
--- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java
+++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java
@@ -70,7 +70,7 @@ public class TaskServiceImpl implements TaskService {
     // 存储日志添加顺序
     private final ConcurrentLinkedQueue<String> logOrderQueue = new ConcurrentLinkedQueue<>();
     // 集合最大容量
-    private static final int MAX_LOG_CAPACITY = 135;
+    private static final int MAX_LOG_CAPACITY = 200;
 
     @Override
     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());
         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())) {
-            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(",")));