From 17d03d6d3552b58a2ffcf00e529a771b469cf117 Mon Sep 17 00:00:00 2001 From: gongbaoxiong <751575283@qq.com> Date: Mon, 20 Jan 2025 17:29:07 +0800 Subject: [PATCH] =?UTF-8?q?add:=E5=A2=9E=E5=8A=A0=E7=BB=84=E7=9B=98?= =?UTF-8?q?=E6=89=AB=E6=8F=8F=E5=85=A5=E5=BA=93=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../devicemanage/DeviceManageController.java | 23 ++++++++++++++----- .../iostorage/IOStorageController.java | 2 +- .../views/wms/md_manage/group_dick/index.vue | 3 ++- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java index 6bccbe8d..b7ae15c7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/devicemanage/DeviceManageController.java @@ -8,16 +8,14 @@ import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.StringUtils; import org.nl.common.TableDataInfo; import org.nl.common.anno.Log; import org.nl.common.domain.exception.BadRequestException; import org.nl.common.domain.exception.handler.ApiError; import org.nl.common.enums.StatusEnum; -import org.nl.common.utils.CodeUtil; -import org.nl.common.utils.IdUtil; -import org.nl.common.utils.MapOf; -import org.nl.common.utils.SecurityUtils; +import org.nl.common.utils.*; import org.nl.wms.base_manage.vehicle.service.IBmVehicleInfoService; import org.nl.wms.base_manage.vehicle.service.dao.BmVehicleInfo; import org.nl.wms.dispatch_manage.point.service.ISchBasePointService; @@ -33,6 +31,8 @@ import org.nl.wms.md_manage.vehicleMater.service.dto.MdPbVehicleMaterVo; import org.nl.wms.pda_manage.devicemanage.dto.ComTp; import org.nl.wms.pda_manage.palletio.service.PalletIostorinvService; import org.nl.wms.pda_manage.palletio.service.dto.LabelValueVo; +import org.nl.wms.stor_manage.struct.service.IStIvtStructattrService; +import org.nl.wms.stor_manage.struct.service.dao.StIvtStructattr; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; @@ -67,7 +67,8 @@ public class DeviceManageController { private IMdPbVehicleMaterService iMdPbVehicleMaterService; @Autowired private TranforTask tranforTask; - + @Autowired + private IStIvtStructattrService iStIvtStructattrService; /** * 切换出入库模式 * @param form @@ -132,7 +133,17 @@ public class DeviceManageController { throw new BadRequestException(String.format(vehicleCode+"组盘异常,确认是否出库后组盘")); } } - + //校验料箱是否还存在库存 + RedissonUtils.lock(() -> { + QueryWrapper query = new QueryWrapper() + .eq("is_used", true) + .eq("lock_type", StatusEnum.LOCK.code("无锁")) + .eq("vehicle_code", vehicleCode); + List list = iStIvtStructattrService.list(query); + if (ObjectUtils.isNotEmpty(list)) { + throw new BadRequestException(String.format("扫码失败：当前载具号在立库的库位中未出库:%s中，请核查库存记录!", list.get(0).getStruct_code())); + } + }, StatusEnum.STRATEGY_TYPE.code("入库") + vehicleCode, 5); wmsToAcsService.toCommand(device_code,"1",vehicleInfo.getH()); return new ResponseEntity<>(TableDataInfo.build(),HttpStatus.OK); } diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java index 511fe116..733f80f7 100644 --- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java +++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/pda_manage/iostorage/IOStorageController.java @@ -73,7 +73,7 @@ public class IOStorageController { .eq("vehicle_code", vehicle_code); List list = iStIvtStructattrService.list(query); if (ObjectUtils.isNotEmpty(list)) { - throw new BadRequestException(String.format("出库确认失败：当前载具号在立库的库位:%s中，请检查!", list.get(0).getStruct_code())); + throw new BadRequestException(String.format("出库确认失败：当前载具号在立库的库位中未出库:%s中，请核查库存记录!", list.get(0).getStruct_code())); } }, StatusEnum.STRATEGY_TYPE.code("出库") + vehicle_code, 5); //流程校验 diff --git a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue index ab8776ee..5b3b2dc2 100644 --- a/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue +++ b/wms_pro/qd/src/views/wms/md_manage/group_dick/index.vue @@ -13,7 +13,8 @@ >