From efabc6ba991acfd01d38bb0bf4e8cfd772416617 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 05 一月 2026 13:07:39 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
index a6cdb5d..3899d3f 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/JamServiceImpl.java
@@ -77,9 +77,8 @@
     }
 
     @Override
-    public List<Jam> getUnfinishedAvoSegByAvo(String avoAgvNo, Segment currSeg) {
-        Long agvId = agvService.getAgvId(avoAgvNo);
-        return this.baseMapper.selectUnfinishedAvoSegByAvo(agvId, null);
+    public List<Jam> getUnfinishedAvoSegByAvo(Long avoAgvId, Segment currSeg) {
+        return this.baseMapper.selectUnfinishedAvoSegByAvo(avoAgvId, null);
     }
 
     @Override
@@ -101,6 +100,9 @@
         }
         Date now = new Date();
         Code code = codeService.getCacheByData(currCodeData);
+        if (null == code) {
+            return null;
+        }
         List<Jam> jams = this.list(new LambdaQueryWrapper<Jam>()
                 .eq(Jam::getAvoAgv, avoAgv)
                 .eq(Jam::getAvoCode, code.getId())

--
Gitblit v1.9.1