From f3d5e1f0bfb75198abb9a74e9c752530a6af10ab Mon Sep 17 00:00:00 2001 From: Joshi <3040996759@qq.com> Date: Sat, 28 Mar 2026 15:27:35 +0800 Subject: [PATCH] =?UTF-8?q?feat(transfer):=20=E6=B7=BB=E5=8A=A0=E8=B0=83?= =?UTF-8?q?=E6=8B=A8=E8=AE=A2=E5=8D=95=E9=A1=B9=E7=A1=AE=E8=AE=A4=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=E4=B8=AD=E7=9A=84=E8=AE=A2=E5=8D=95=E9=A1=B9ID?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在confirmTransfer方法中添加orderItemId参数获取 - 更新查询条件以支持根据订单项ID进行筛选 - 添加对orderItemId和transferId为null的安全检查 - 优化查询包装器的条件判断逻辑 --- .../klp/service/impl/WmsTransferOrderItemServiceImpl.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java index fed05833..bb0fe9da 100644 --- a/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java +++ b/klp-wms/src/main/java/com/klp/service/impl/WmsTransferOrderItemServiceImpl.java @@ -403,6 +403,7 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer @Transactional(rollbackFor = Exception.class) public Boolean confirmTransfer(WmsTransferOrderItemBo bo) { Long transferId = bo.getTransferId(); + Long orderItemId = bo.getOrderItemId(); Long coilId = bo.getCoilId(); Long itemId = bo.getItemIdAfter(); String itemType = bo.getMaterialTypeAfter() != null ? (bo.getMaterialTypeAfter() == 1 ? "raw_material" : "product") : null; @@ -430,8 +431,9 @@ public class WmsTransferOrderItemServiceImpl implements IWmsTransferOrderItemSer coilMapper.updateById(coil); LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); - wrapper.eq(WmsTransferOrderItem::getCoilId, coilId); - wrapper.eq(WmsTransferOrderItem::getTransferId, transferId); + wrapper.eq(true, WmsTransferOrderItem::getCoilId, coilId); + wrapper.eq(orderItemId != null, WmsTransferOrderItem::getOrderItemId, orderItemId); + wrapper.eq(transferId != null, WmsTransferOrderItem::getTransferId, transferId); WmsTransferOrderItem item = baseMapper.selectOne(wrapper); if (item != null) { // 如果没传itemIdAfter则用itemIdBefore的值