From ade4d84ec92e2fa723cd0b474e977d17f3d648cc Mon Sep 17 00:00:00 2001
From: liangzhou <594755172@qq.com>
Date: Sun, 2 Mar 2025 17:29:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=AF=BC=E5=85=A5=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E9=9C=80=E6=B1=82=E6=95=B0=E9=87=8F=E4=B8=BA0?=
 =?UTF-8?q?=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/wms/controller/TaskController.java     | 9 +++++++++
 .../serviceImplements/WorkServiceImplements.java         | 6 ++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/wms/controller/TaskController.java b/src/main/java/com/wms/controller/TaskController.java
index 54cefc7..3ea4d72 100644
--- a/src/main/java/com/wms/controller/TaskController.java
+++ b/src/main/java/com/wms/controller/TaskController.java
@@ -973,6 +973,15 @@ public class TaskController {
                 response.setMessage("获取不到正确的站台号");
                 return convertJsonString(response);
             }
+            // 判断当前站台是否还有亮灯数据
+            if (etagLocationService.exists(new LambdaQueryWrapper<ETagLocation>()
+                    .eq(ETagLocation::getWorkStation, standId)
+                    .eq(ETagLocation::getPickStatus, 1))) {
+                logger.error("站台灯光未全部拍灭，请检查。");
+                response.setCode(ResponseCode.ERROR.getCode());
+                response.setMessage("站台灯光未全部拍灭，请检查。");
+                return convertJsonString(response);
+            }
             // 根据站台号查找对应的载具号
             PickTask pickTask = pickTaskService.getOne(new LambdaQueryWrapper<PickTask>()
                     .eq(PickTask::getStandId, standId)
diff --git a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
index b94ab02..d884f98 100644
--- a/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
+++ b/src/main/java/com/wms/service/business/serviceImplements/WorkServiceImplements.java
@@ -65,11 +65,10 @@ public class WorkServiceImplements implements IWorkService {
      * 新版创建工作
      *
      * @param workStation 工作站台
-     * @throws Exception 异常
      */
     @Override
     @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED)
-    public void createWork(String workStation) throws Exception {
+    public void createWork(String workStation) {
         if (workCreatingStations.contains(workStation)) {
             // 当前站台正在创建任务
             return;
@@ -230,11 +229,10 @@ public class WorkServiceImplements implements IWorkService {
      * 新版开始工作
      *
      * @param workStation 工作站台
-     * @throws Exception 异常
      */
     @Override
     @Transactional(isolation = Isolation.REPEATABLE_READ, propagation = Propagation.REQUIRED)
-    public void doWork(String workStation) throws Exception {
+    public void doWork(String workStation) {
         if (workDoingStations.contains(workStation)) {
             // 当前站台正在创建任务
             return;