From 9b83326174f7877d96ab4b1ec8ac09dca7840bc6 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sat, 28 Dec 2024 19:47:56 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=A8=E7=AE=B1=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=E7=94=9F=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/InVehicleManageServiceImpl.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java index 1a157f0b5..723df8887 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InVehicleManageServiceImpl.java @@ -16,6 +16,7 @@ import org.nl.modules.wql.core.bean.WQLObject; import org.nl.modules.wql.util.SpringContextHolder; import org.nl.system.service.param.impl.SysParamServiceImpl; import org.nl.wms.pda.mps.eum.RegionTypeEnum; +import org.nl.wms.sch.manage.TaskStatusEnum; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -69,7 +70,14 @@ public class InVehicleManageServiceImpl implements InVehicleManageService { if (ObjectUtil.isEmpty(jsonPoint)) { throw new BadRequestException("起始点位不存在或未启用!"); } - + int count = ischBaseTaskService.count(new QueryWrapper() + .eq("start_device_code", whereJson.getString("device_code")) + .eq("vehicle_code", whereJson.getString("vehicle_code")) + .eq("task_type", "010705") + .lt("", TaskStatusEnum.FINISHED.getCode())); + if (count>0){ + throw new BadRequestException(whereJson.getString("vehicle_code")+"当前任务正在执行中"); + } // 找一个托盘区的空仓位 JSONObject jsonParam = new JSONObject(); jsonParam.put("stor_id", IOSEnum.STOR_ID.code("二期")); @@ -83,7 +91,6 @@ public class InVehicleManageServiceImpl implements InVehicleManageService { notInBlockList.clear(); throw new BadRequestException("仓位不足!"); } - // 生成任务 JSONObject jsonTaskParam = new JSONObject(); jsonTaskParam.put("task_type", "010705");