From 710134a860143c60f6d62964d9ad471e71ee4771 Mon Sep 17 00:00:00 2001 From: zhangzq Date: Sun, 29 Dec 2024 14:59:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9C=A8=E7=AE=B1=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=80=BC=E6=94=B9=E6=88=90return?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../util/impl/InBoxManageServiceImpl.java | 15 +++++++++------ .../util/impl/InVehicleManageServiceImpl.java | 4 ++-- .../org/nl/wms/sch/manage/AbstractAcsTask.java | 6 +++++- 3 files changed, 16 insertions(+), 9 deletions(-) diff --git a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java index 7972ca39d..f2df03e03 100644 --- a/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java +++ b/lms/nladmin-system/src/main/java/org/nl/b_lms/storage_manage/ios/service/iostorInv/util/impl/InBoxManageServiceImpl.java @@ -32,6 +32,7 @@ import org.nl.wms.ext.acs.service.WmsToAcsService; import org.nl.wms.ext.mes.service.LmsToMesService; import org.nl.wms.pda.mps.eum.RegionTypeEnum; import org.nl.wms.pdm.bi.service.SubpackagerelationService; +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; @@ -100,17 +101,19 @@ public class InBoxManageServiceImpl implements InBoxManageService { // 仓位表 WQLObject attrTab = WQLObject.getWQLObject("st_ivt_structattr"); String box_arr = whereJson.getString("box_no"); - - + int count = ischBaseTaskService.count(new QueryWrapper() + .eq("start_device_code", whereJson.getString("device_code")) + .eq("vehicle_code", whereJson.getString("box_no")) + .eq("task_type", "010702") + .lt("task_status", TaskStatusEnum.FINISHED.getCode())); + if (count>0){ + return; + } // 查询木箱信息 BstIvtBoxinfo boxDao = iBstIvtBoxinfoService.getOne( new QueryWrapper().lambda() .eq(BstIvtBoxinfo::getBox_no, whereJson.getString("box_no")) ); - - - - /* * 找一个木箱区的一个仓位,生成任务并下发 */ 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 723df8887..83c47cd60 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 @@ -74,9 +74,9 @@ public class InVehicleManageServiceImpl implements InVehicleManageService { .eq("start_device_code", whereJson.getString("device_code")) .eq("vehicle_code", whereJson.getString("vehicle_code")) .eq("task_type", "010705") - .lt("", TaskStatusEnum.FINISHED.getCode())); + .lt("task_status", TaskStatusEnum.EXECUTING.getCode())); if (count>0){ - throw new BadRequestException(whereJson.getString("vehicle_code")+"当前任务正在执行中"); + return; } // 找一个托盘区的空仓位 JSONObject jsonParam = new JSONObject(); diff --git a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java index a633f69b1..4ca915c56 100644 --- a/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java +++ b/lms/nladmin-system/src/main/java/org/nl/wms/sch/manage/AbstractAcsTask.java @@ -114,7 +114,11 @@ public abstract class AbstractAcsTask { List taskList = this.schedule(); if (ObjectUtil.isNotEmpty(taskList)) { JSONArray arr = JSONArray.parseArray(JSON.toJSONString(taskList)); - return acsUtil.notifyAcs3("api/wms/task", arr); + if (acsUtil == null){ + return AcsUtil.notifyAcs("api/wms/task", arr); + }else { + return acsUtil.notifyAcs3("api/wms/task", arr); + } } return null;