进口出口查询库存账修改

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -74,8 +74,16 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 	 */
 	@Override
 	public StockGoodsVO selectStock(Long corpId,Long storageId,Long goodId,String itemType,String lotNo) {
-		StockGoods stockGoods = baseMapper.selectOne(new QueryWrapper<StockGoods>().eq("corp_id", corpId).eq("storage_id", storageId).eq("goods_id", goodId)
-			.eq("item_type", itemType).eq("lot_no", lotNo).eq("tenant_id", SecureUtil.getTenantId()));
+		LambdaQueryWrapper<StockGoods> lambdaQueryWrapper = new LambdaQueryWrapper();
+		lambdaQueryWrapper.eq(Func.isNotEmpty(corpId),StockGoods::getCorpId,corpId);
+		lambdaQueryWrapper.eq(Func.isNotEmpty(storageId),StockGoods::getStorageId,storageId);
+		lambdaQueryWrapper.eq(Func.isNotEmpty(goodId),StockGoods::getGoodsId,goodId);
+		lambdaQueryWrapper.eq(Func.isNotEmpty(itemType),StockGoods::getItemType,itemType);
+		lambdaQueryWrapper.eq(Func.isEmpty(itemType),StockGoods::getItemType,null);
+		lambdaQueryWrapper.eq(Func.isNotEmpty(lotNo),StockGoods::getLotNo,lotNo);
+		lambdaQueryWrapper.eq(Func.isEmpty(lotNo),StockGoods::getLotNo,null);
+		lambdaQueryWrapper.eq(StockGoods::getTenantId,SecureUtil.getTenantId());
+		StockGoods stockGoods = baseMapper.selectOne(lambdaQueryWrapper);
 		return BeanUtil.copy(stockGoods, StockGoodsVO.class);
 	}