From 68a9b6f4e0a6166e403d3e1a192d74f6836cac92 Mon Sep 17 00:00:00 2001
From: gengby <858962040@qq.com>
Date: Tue, 20 Feb 2024 14:26:01 +0800
Subject: [PATCH] =?UTF-8?q?rev:=E6=BB=A1=E6=89=98=E5=87=BA=E5=BA=93?=
 =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/org/nl/wms/pda/service/impl/PdaServiceImpl.java     | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
index ea40f46..7235d41 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/pda/service/impl/PdaServiceImpl.java
@@ -266,6 +266,10 @@ public class PdaServiceImpl implements PdaService {
         Assert.notNull(requestParam, "参数不能为空!");
         String point_code = requestParam.getPoint_code();
         Assert.notBlank(point_code, "点位编码不能为空!");
+        SchBasePoint point = pointService.getById(point_code);
+        if (StrUtil.isNotEmpty(point.getIng_task_code())) {
+            throw new BadRequestException("满托出库确认失败,存在未完成的任务!");
+        }
         String vehicle_code = requestParam.getVehicle_code();
         Assert.notBlank(vehicle_code, "载具号不能为空!");
         String residue_num = requestParam.getResidue_num();
@@ -288,7 +292,6 @@ public class PdaServiceImpl implements PdaService {
             groupOne.setGroup_bind_material_status(GroupBindMaterialStatusEnum.UNBOUND.getValue());
             vehiclematerialgroupService.update(groupOne);
 
-            SchBasePoint point = pointService.getById(point_code);
             point.setPoint_status(PointStatusEnum.EMPTY_VEHICLE.getCode());
             pointService.update(point);
         } else {