From 5dcfc0c7b50f911643c2c97dd0c71b4fb565b269 Mon Sep 17 00:00:00 2001 From: "bbl\\baobl" Date: Mon, 25 Mar 2024 11:52:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=B7=A5=E5=85=A5=E5=BA=93=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E9=80=89=E4=B8=AD=E6=8E=A8=E8=8D=90=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=EF=BC=8C=E6=B8=85=E9=99=A4=E4=B8=80=E4=B8=AA=E5=BA=93=E4=BD=8D?= =?UTF-8?q?=E7=9A=84=E5=8D=A0=E7=94=A8=E7=8A=B6=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/TaskServiceImpl.java | 27 +++++++++++++++++-- 1 file changed, 25 insertions(+), 2 deletions(-) diff --git a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java index 15a86b5..75bc1e1 100644 --- a/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java +++ b/youchain-system/src/main/java/com/youchain/businessdata/service/impl/TaskServiceImpl.java @@ -420,9 +420,32 @@ public class TaskServiceImpl implements TaskService { // 生成库存 List> taskMapList=taskRepository.findByAgvTask(null,billTypeCode,0l); Inventory inventory = inventoryService.asnAddInventory(taskMapList); - // 更新当前点位 存储容器状态 + // 更新当前点位 存储容器状态 ### point.setStorageType(inventory.getItemKey().getItem().getGoodType()); - point.setStatus(BaseStatus.FREE); + if (point.getStatus().equals(BaseStatus.USED)){ + point.setStatus(BaseStatus.FREE); + }else { + // 人工入库没有选中推荐库位，清除一个库位的占用状态 + List pointList=pointRepository.findByAreaCodeCp(inventory.getItemKey().getItem().getGoodType(),BaseStatus.USED); + for (int i = 0; i < pointList.size(); i++) { + Point pointUsed =pointList.get(0); + if (point.getHeat()==null||point.getHeat()==1){ + //浅位 直接取消 + pointUsed.setStatus(BaseStatus.FREE); + }else { + // 深位，查询浅位是否空闲 + List pointListQ=pointRepository.findByBeatCode(point.getBeatCode(),point.getHeat()); + if (pointListQ.size()>0){ + // 浅位空闲 + continue; + }else { + pointUsed.setStatus(BaseStatus.FREE); + } + } + pointRepository.save(pointUsed); + break; + } + } pointRepository.save(point); return ApiResult.result(200, "操作成功", ""); }