From 5a06c9a6923fde7889ac33d84de74f5e64b67bb8 Mon Sep 17 00:00:00 2001 From: skyouc Date: 星期四, 27 二月 2025 19:21:46 +0800 Subject: [PATCH] #修改 集货区绑定可流动问题修复 --- zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java | 10 ++++++---- 1 files changed, 6 insertions(+), 4 deletions(-) diff --git a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java index 5f2a4cf..23e4614 100644 --- a/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java +++ b/zy-asrs-wms/src/main/java/com/zy/asrs/wms/asrs/service/impl/PickSheetServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.mysql.cj.util.StringUtils; import com.zy.asrs.wms.asrs.entity.PickSheet; import com.zy.asrs.wms.asrs.entity.PickSheetDetl; import com.zy.asrs.wms.asrs.entity.param.PageRequest; @@ -14,6 +15,7 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; +import java.util.Map; import java.util.Objects; @Service @@ -31,10 +33,10 @@ public IPage<PickSheet> getOutFlatSheet(PageRequest params) { LambdaQueryWrapper<PickSheet> lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(PickSheet::getDeleted, 0).eq(PickSheet::getStatus, 1); - if (!Objects.isNull(params.getParams())) { - lambdaQueryWrapper.eq(!Objects.isNull(params.getParams().get("pickNo")),PickSheet::getPickNo, params.getParams().get("pickNo")) - .eq(!Objects.isNull(params.getParams().get("id")), PickSheet::getId, params.getParams().get("id")) - .eq(!Objects.isNull(params.getParams().get("waveNo")), PickSheet::getWaveNo, params.getParams().get("waveNo")); + Map<String, Object> param = params.getParams(); + if (!Objects.isNull(param)) { + lambdaQueryWrapper.eq(!StringUtils.isNullOrEmpty(param.get("pickNo").toString()),PickSheet::getPickNo, param.get("pickNo")) + .eq(!StringUtils.isNullOrEmpty(param.get("waveNo").toString()), PickSheet::getWaveNo, param.get("waveNo")); } return this.baseMapper.selectMapsPage(params.getPage(), lambdaQueryWrapper); } -- Gitblit v1.9.1