From b25c5ba11422feef45d86f16e2b832d9ce3d95ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B8=B8=E7=86=9F=E5=90=B4=E5=BD=A6=E7=A5=96?= Date: Thu, 15 Jan 2026 16:23:52 +0800 Subject: [PATCH] =?UTF-8?q?feat(automatedWarehouse):=20=E5=AE=9E=E7=8E=B0?= =?UTF-8?q?=E6=89=98=E7=9B=98=E5=90=88=E5=B9=B6=E6=9F=A5=E8=AF=A2=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=88=86=E9=A1=B5=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在PalletMergeQueryData实体类中新增maxPositionCount字段，支持前端传入最大已用数量筛选条件 - 更新controller层searchPalletMergeList方法，返回分页数据格式，接收page和limit参数 - 新增mapper接口searchPalletMergeListPage方法，使用MyBatis-Plus分页插件实现数据库分页查询 - 完善service层实现，支持前端传入maxPositionCount或后端自动计算最大已用位置数 - 添加分页参数校验，默认页码为1，每页限制20条记录 - 更新XML映射文件，实现分页查询SQL逻辑，支持maxPositionCount条件筛选 --- .../automatedWarehouse/service/impl/WcsTaskServiceImpl.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java index 5b086a6..0e9a5bd 100644 --- a/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java +++ b/src/main/java/com/gaotao/modules/automatedWarehouse/service/impl/WcsTaskServiceImpl.java @@ -107,7 +107,13 @@ public class WcsTaskServiceImpl implements WcsTaskService { // 3. 根据不同的TransTypeDesc执行不同的处理逻辑 - rqrq String result = ""; if ("入库".equals(callbackTask.getTransTypeDesc()) || "出库".equals(callbackTask.getTransTypeDesc())) { + WareHouseTransferRequest request = buildWareHouseTransferRequest(callbackTask); + //立库碟盘机传的虚拟盘号忽略逻辑直接处理。 + if(request.getPalletId() != null && !request.getPalletId().isEmpty() && request.getPalletId().charAt(0) >= '1' && request.getPalletId().charAt(0) <= '9'){ + wcsIntegrationMapper.updateWcsCallbackTaskStatus(callbackTask.getId(), "已完成", null, new Date(), null); + return; + } // 更新托盘状态 - rqrq if ("入库".equals(callbackTask.getTransTypeDesc())) { // 入库和出库需要执行移库操作 - rqrq