diff --git a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java index 4c07f3c..036dbd7 100644 --- a/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java +++ b/backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java @@ -1224,9 +1224,9 @@ public class MQpxxManagerImpl extends BaseManagerImpl implement if (ObjectUtil.isEmpty(qpczDTO.getClId())) { throw new RuntimeException("请传入车辆信息"); } - WClxx wClxx = wClxxDao.selectById(qpczDTO.getCzId()); + WClxx wClxx = wClxxDao.selectById(qpczDTO.getClId()); if (wClxx == null) { - throw new RuntimeException("厂站信息不存在"); + throw new RuntimeException("车辆信息不存在"); } if (ObjectUtil.isNotEmpty(mpckList) && ObjectUtil.isNotEmpty(kpckList)) { List qptm_mp = mpckList.stream().map(a -> a.getFQptm()).collect(Collectors.toList()); diff --git a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java index 96afa87..fb79cd4 100644 --- a/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java +++ b/backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java @@ -531,7 +531,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl implement //本厂站气瓶还在本厂站的气瓶 List typeone_collect = v.stream().filter(a -> k.equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList()); //本厂站气瓶不在本厂站的气瓶(在会员手中或者在其他厂站中) - List typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList()); + List typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList());//不包含在员工手中正在配送的气瓶 // typetwoHandler(typetwo_collect); //其他厂站在本厂站的气瓶 List typethree_collect = getTypethreeCollect(k); @@ -874,9 +874,9 @@ public class WQpxxManagerImpl extends BaseManagerImpl implement if (ObjectUtil.isEmpty(qpczDTO.getClId())) { throw new RuntimeException("请传入车辆信息"); } - WClxx wClxx = wClxxDao.selectById(qpczDTO.getCzId()); + WClxx wClxx = wClxxDao.selectById(qpczDTO.getClId()); if (wClxx == null) { - throw new RuntimeException("厂站信息不存在"); + throw new RuntimeException("车辆信息不存在"); } if (ObjectUtil.isNotEmpty(mpckList) && ObjectUtil.isNotEmpty(kpckList)) { List qptm_mp = mpckList.stream().map(a -> a.getFQptm()).collect(Collectors.toList()); -- libgit2 0.21.2