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的值