From 4be352634ca3c8b55f811d35e2365b20b69e1831 Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" <925259474@qq.com> Date: Thu, 29 Jan 2026 19:57:03 +0800 Subject: [PATCH] no message --- .../inventory/service/IInventoryService.java | 4 +- .../service/impl/InventoryServiceImpl.java | 49 +++++++++++-------- .../service/impl/ITesAgvServiceImpl.java | 13 ++--- 3 files changed, 35 insertions(+), 31 deletions(-) diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/IInventoryService.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/IInventoryService.java index f2058be..7ff55ea 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/IInventoryService.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/IInventoryService.java @@ -65,7 +65,7 @@ public interface IInventoryService extends IService { /** * 移动库存 - * @param tasks 移位任务 + * 容器、起点、目标库位 */ - void moveInventory(List tasks); + void moveInventory(String stockCode,String startCode,String endCode); } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/impl/InventoryServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/impl/InventoryServiceImpl.java index 95c8805..991eda1 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/impl/InventoryServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/inventory/service/impl/InventoryServiceImpl.java @@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.commons.collections4.CollectionUtils; import org.cpte.modules.base.entity.Point; +import org.cpte.modules.base.entity.Stock; import org.cpte.modules.base.mapper.PointMapper; +import org.cpte.modules.base.mapper.StockMapper; import org.cpte.modules.constant.enums.CommonStatusEnum; import org.cpte.modules.constant.enums.InventoryStatusEnum; import org.cpte.modules.inventory.entity.Inventory; @@ -14,7 +16,6 @@ import org.cpte.modules.inventory.mapper.InventoryMapper; import org.cpte.modules.inventory.service.IInventoryService; import org.cpte.modules.receive.entity.Asn; import org.cpte.modules.receive.entity.ReceiveRecord; -import org.cpte.modules.shipping.entity.Task; import org.jeecg.common.util.oConvertUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -35,6 +36,9 @@ public class InventoryServiceImpl extends ServiceImpl selectInventoryWithItemKey(Page page, Inventory inventory) { QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -48,7 +52,7 @@ public class InventoryServiceImpl extends ServiceImpl tasks) { - List updateToInventoryList = new ArrayList<>(); - List updateToPointList = new ArrayList<>(); - for (Task task : tasks) { - Inventory inventory = this.baseMapper.selectById(task.getInventoryId()); - inventory.setPointId(task.getToPointId()); + public void moveInventory(String stockCode, String startCode, String endCode) { + Stock stock = stockMapper.queryByStockCode(stockCode); + if (stock == null) { + return; + } + Point startPoint = pointMapper.queryByPointCode(startCode); + if (startPoint == null) { + return; + } + Point endPoint = pointMapper.queryByPointCode(endCode); + if (endPoint == null) { + return; + } + + List inventories = this.baseMapper.queryInventoryByStockId(stock.getId()); + for (Inventory inventory : inventories) { + inventory.setPointId(endPoint.getId()); inventory.setStatus(InventoryStatusEnum.AVAILABLE.getValue()); - updateToInventoryList.add(inventory); } - List srcPointIds = tasks.stream().map(Task::getFromPointId).distinct().toList(); - List srcPoints = pointMapper.selectByIds(srcPointIds); - for (Point point : srcPoints) { - point.setStatus(CommonStatusEnum.FREE.getValue()); - updateToPointList.add(point); - } - if (CollectionUtils.isNotEmpty(updateToInventoryList)) { - this.baseMapper.updateById(updateToInventoryList); - } - if (CollectionUtils.isNotEmpty(updateToPointList)) { - pointMapper.updateById(updateToPointList); + if (CollectionUtils.isNotEmpty(inventories)) { + this.baseMapper.updateById(inventories); } + + startPoint.setStatus(CommonStatusEnum.FREE.getValue()); + pointMapper.updateById(startPoint); + } diff --git a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/tesAgv/service/impl/ITesAgvServiceImpl.java b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/tesAgv/service/impl/ITesAgvServiceImpl.java index 92b2a9d..51e6e63 100644 --- a/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/tesAgv/service/impl/ITesAgvServiceImpl.java +++ b/cpte-boot-module/cpte-module-wms/src/main/java/org/cpte/modules/tesAgv/service/impl/ITesAgvServiceImpl.java @@ -10,7 +10,6 @@ import org.cpte.modules.agvTask.mapper.AgvTaskMapper; import org.cpte.modules.agvTask.service.IAgvTaskService; import org.cpte.modules.base.entity.Point; import org.cpte.modules.base.mapper.PointMapper; -import org.cpte.modules.base.service.IPointService; import org.cpte.modules.constant.GeneralConstant; import org.cpte.modules.constant.enums.AgvStatusEnum; import org.cpte.modules.constant.enums.AgvVendorEnum; @@ -18,9 +17,7 @@ import org.cpte.modules.constant.enums.BusinessTypeEnum; import org.cpte.modules.constant.enums.CommonStatusEnum; import org.cpte.modules.inventory.service.IInventoryService; import org.cpte.modules.receive.entity.AsnDetail; -import org.cpte.modules.receive.entity.ReceiveRecord; import org.cpte.modules.receive.mapper.AsnDetailMapper; -import org.cpte.modules.receive.service.IAsnDetailService; import org.cpte.modules.receive.service.IAsnService; import org.cpte.modules.shipping.entity.Task; import org.cpte.modules.shipping.mapper.TaskMapper; @@ -37,7 +34,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import java.text.SimpleDateFormat; import java.util.*; @Service @@ -242,8 +238,7 @@ public class ITesAgvServiceImpl implements ITesAgvService { agvTaskService.createAgvTask(null, agvTask.getCarrierCode(), agvTask.getEndCode(), endCode, null, BusinessTypeEnum.OUTBOUND.getValue(), 0, AgvVendorEnum.HIK.getValue()); }*/ } else if (BusinessTypeEnum.MOVE.getValue().equals(agvTask.getType())) { - List tasks = taskMapper.queryByAgvTask(agvTask.getId()); - inventoryService.moveInventory(tasks); + inventoryService.moveInventory(agvTask.getCarrierCode(), agvTask.getStartCode(), agvTask.getEndCode()); } agvTask.setStatus(AgvStatusEnum.COMPLETED.getValue()); @@ -304,11 +299,11 @@ public class ITesAgvServiceImpl implements ITesAgvService { Point point = pointMapper.queryByPointCode(agvTask.getEndCode()); point.setStatus(CommonStatusEnum.USED.getValue()); pointMapper.updateById(point); - List asnDetails= asnDetailMapper.selectByMainId(agvTask.getBusinessDetailId()); - for (AsnDetail asnDetail : asnDetails){ + List asnDetails = asnDetailMapper.selectByMainId(agvTask.getBusinessDetailId()); + for (AsnDetail asnDetail : asnDetails) { asnDetail.setToPointId(point.getId()); } - if(CollectionUtils.isNotEmpty(asnDetails)){ + if (CollectionUtils.isNotEmpty(asnDetails)) { asnDetailMapper.updateById(asnDetails); }