|
@@ -180,12 +180,12 @@ public class KxsMachineRecycleServiceImpl extends ServiceImpl<KxsMachineRecycleM
|
|
|
|
|
|
|
|
//待确认机具数量
|
|
//待确认机具数量
|
|
|
Long recycleCount = baseMapper.selectCount(Wrappers.<KxsMachineRecycle>lambdaQuery()
|
|
Long recycleCount = baseMapper.selectCount(Wrappers.<KxsMachineRecycle>lambdaQuery()
|
|
|
- .eq(KxsMachineRecycle::getUserId, userId)
|
|
|
|
|
|
|
+ .eq(KxsMachineRecycle::getWarehouseUserId, userId)
|
|
|
.eq(KxsMachineRecycle::getStatus, CommonConstants.FAIL));
|
|
.eq(KxsMachineRecycle::getStatus, CommonConstants.FAIL));
|
|
|
storeRecycleDataVO.setRecycleCount(recycleCount);
|
|
storeRecycleDataVO.setRecycleCount(recycleCount);
|
|
|
//已完成
|
|
//已完成
|
|
|
Long recyclableCount = baseMapper.selectCount(Wrappers.<KxsMachineRecycle>lambdaQuery()
|
|
Long recyclableCount = baseMapper.selectCount(Wrappers.<KxsMachineRecycle>lambdaQuery()
|
|
|
- .eq(KxsMachineRecycle::getUserId, userId)
|
|
|
|
|
|
|
+ .eq(KxsMachineRecycle::getWarehouseUserId, userId)
|
|
|
.eq(KxsMachineRecycle::getStatus, CommonConstants.SUCCESS));
|
|
.eq(KxsMachineRecycle::getStatus, CommonConstants.SUCCESS));
|
|
|
storeRecycleDataVO.setRecyclableCount(recyclableCount);
|
|
storeRecycleDataVO.setRecyclableCount(recyclableCount);
|
|
|
|
|
|