From dd9d91e4b63fbf7c6a291649600b72c315e3fd1d 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: Fri, 16 Oct 2026 11:37:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8D=E9=9C=80=E8=A6=81=E4=BC=A0site?= =?UTF-8?q?=E6=9D=A5=E6=A0=A1=E9=AA=8Ccontrollerid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mapper/HaiAnPdaAutoWarehouseMapper.java | 4 ++-- .../service/impl/HaiAnPdaAutoWarehouseServiceImpl.java | 4 ++-- .../modules/other/service/impl/InventoryMoveServiceImpl.java | 2 +- .../autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml | 5 ++--- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/mapper/HaiAnPdaAutoWarehouseMapper.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/mapper/HaiAnPdaAutoWarehouseMapper.java index b1294905..4f12e3db 100644 --- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/mapper/HaiAnPdaAutoWarehouseMapper.java +++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/mapper/HaiAnPdaAutoWarehouseMapper.java @@ -546,10 +546,10 @@ public interface HaiAnPdaAutoWarehouseMapper { Integer countPalletDetailWithWcsFlagOne(@Param("site") String site, @Param("palletId") String palletId); /** - * 按海安工厂和被分拣源盘配对的工作位统计未提交分拣明细；已结束分拣且calling_flag=Y的工作盘置1仅用于下次回库，须排除；查询失败不得通知源盘回库。- rqrq + * 按海安工厂和配对分拣位统计calling_flag=N托盘的wcs_flag=1明细；空位返回0，Y盘即使有增量也不拦截；查询失败不得通知源盘回库。- rqrq * @param site 海安工厂，隔离托盘和明细 - rqrq * @param workStation 配对人工分拣工作位 - rqrq - * @return 当前工作位未结束分拣的有效托盘中wcs_flag=1的明细数 - rqrq + * @return 分拣位calling_flag=N托盘的增量明细数；无托盘或无增量返回0 - rqrq */ Integer countPendingSortingDetailsAtWorkStation(@Param("site") String site, @Param("workStation") String workStation); diff --git a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPdaAutoWarehouseServiceImpl.java b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPdaAutoWarehouseServiceImpl.java index 5fc33a9a..14712e8b 100644 --- a/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPdaAutoWarehouseServiceImpl.java +++ b/src/main/java/com/gaotao/modules/autoWareHourceHaian/service/impl/HaiAnPdaAutoWarehouseServiceImpl.java @@ -1958,7 +1958,7 @@ public class HaiAnPdaAutoWarehouseServiceImpl implements HaiAnPdaAutoWarehouseSe } /** - * 被分拣源盘通知回库前，核对WCS待拣标签是否仍在本盘，并检查配对工作位是否仍有未提交增量；已结束分拣并置1待回库的工作盘不算未提交。- rqrq + * 被分拣源盘通知回库前，核对WCS待拣标签是否仍在本盘；配对分拣位无托盘时允许继续，仅calling_flag=N且有增量的托盘拦截回库。- rqrq * 任一查询失败或校验不通过均中断当前事务，不生成WOT且不下发WCS。- rqrq * @param site 海安工厂，限定托盘与明细范围 - rqrq * @param palletId 当前被分拣源盘编码 - rqrq @@ -1992,7 +1992,7 @@ public class HaiAnPdaAutoWarehouseServiceImpl implements HaiAnPdaAutoWarehouseSe if (!StringUtils.hasText(workStation)) { throw new RuntimeException("被分拣托盘位置未配置对应分拣工作位：" + sourceStation); } - // 按工厂和配对工作位检查尚未结束的有效分拣盘；已结束盘置1供回库重传，不再按未提交增量拦截源盘。- rqrq + // 按site和配对工作位统计calling_flag=N托盘的增量；空位返回0放行，Y盘结束后重新置1也不拦截，查询失败则中断回库。- rqrq Integer pendingCount = haiAnPdaAutoWarehouseMapper.countPendingSortingDetailsAtWorkStation(site, workStation); if (pendingCount == null) { throw new RuntimeException("查询分拣托盘提交状态失败，无法通知回库"); diff --git a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java index 41974dad..1c8b0fea 100644 --- a/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java +++ b/src/main/java/com/gaotao/modules/other/service/impl/InventoryMoveServiceImpl.java @@ -291,7 +291,7 @@ public class InventoryMoveServiceImpl implements InventoryMoveService { dto.getHandlingUnitIds()); if (updatedRows != handlingUnits.size()) { throw new XJException("更新标签site/库位失败，期望更新" + handlingUnits.size() + "条，实际" + updatedRows - + "条，可能标签已被预定或出库，请刷新后重试"); + + "条，可能标签已被ifs预留或出库，请刷新后重试"); } syncHaiAnPalletDetailSubSite(dto, dto.getHandlingUnitIds()); diff --git a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml index 2e414aa3..a9e75eca 100644 --- a/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml +++ b/src/main/resources/mapper/autoWareHourceHaian/HaiAnPdaAutoWarehouseMapper.xml @@ -1006,7 +1006,7 @@ AND wcs_flag = 1 - +