Commit 2bc639d884311734d0cfdaef69e805b9ed6d8046
1 parent
67780301
Exists in
dev
气瓶出库修改
Showing
2 changed files
with
5 additions
and
5 deletions
Show diff stats
backend/lpg-manage/src/main/java/com/hotent/lpg/manage/manager/impl/MQpxxManagerImpl.java
| @@ -1224,9 +1224,9 @@ public class MQpxxManagerImpl extends BaseManagerImpl<MQpxxDao, WQpxx> implement | @@ -1224,9 +1224,9 @@ public class MQpxxManagerImpl extends BaseManagerImpl<MQpxxDao, WQpxx> implement | ||
| 1224 | if (ObjectUtil.isEmpty(qpczDTO.getClId())) { | 1224 | if (ObjectUtil.isEmpty(qpczDTO.getClId())) { |
| 1225 | throw new RuntimeException("请传入车辆信息"); | 1225 | throw new RuntimeException("请传入车辆信息"); |
| 1226 | } | 1226 | } |
| 1227 | - WClxx wClxx = wClxxDao.selectById(qpczDTO.getCzId()); | 1227 | + WClxx wClxx = wClxxDao.selectById(qpczDTO.getClId()); |
| 1228 | if (wClxx == null) { | 1228 | if (wClxx == null) { |
| 1229 | - throw new RuntimeException("厂站信息不存在"); | 1229 | + throw new RuntimeException("车辆信息不存在"); |
| 1230 | } | 1230 | } |
| 1231 | if (ObjectUtil.isNotEmpty(mpckList) && ObjectUtil.isNotEmpty(kpckList)) { | 1231 | if (ObjectUtil.isNotEmpty(mpckList) && ObjectUtil.isNotEmpty(kpckList)) { |
| 1232 | List<String> qptm_mp = mpckList.stream().map(a -> a.getFQptm()).collect(Collectors.toList()); | 1232 | List<String> qptm_mp = mpckList.stream().map(a -> a.getFQptm()).collect(Collectors.toList()); |
backend/lpg/src/main/java/com/hotent/lpg/manager/impl/WQpxxManagerImpl.java
| @@ -531,7 +531,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement | @@ -531,7 +531,7 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement | ||
| 531 | //本厂站气瓶还在本厂站的气瓶 | 531 | //本厂站气瓶还在本厂站的气瓶 |
| 532 | List<QpdtVo> typeone_collect = v.stream().filter(a -> k.equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList()); | 532 | List<QpdtVo> typeone_collect = v.stream().filter(a -> k.equals(a.getFCyczID()) && "厂站".equals(a.getFCyzlx())).collect(Collectors.toList()); |
| 533 | //本厂站气瓶不在本厂站的气瓶（在会员手中或者在其他厂站中） | 533 | //本厂站气瓶不在本厂站的气瓶（在会员手中或者在其他厂站中） |
| 534 | - List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList()); | 534 | + List<QpdtVo> typetwo_collect = v.stream().filter(a -> "会员".equals(a.getFCyzlx()) || !k.equals(a.getFCyczID())).collect(Collectors.toList());//不包含在员工手中正在配送的气瓶 |
| 535 | // typetwoHandler(typetwo_collect); | 535 | // typetwoHandler(typetwo_collect); |
| 536 | //其他厂站在本厂站的气瓶 | 536 | //其他厂站在本厂站的气瓶 |
| 537 | List<QpdtVo> typethree_collect = getTypethreeCollect(k); | 537 | List<QpdtVo> typethree_collect = getTypethreeCollect(k); |
| @@ -874,9 +874,9 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement | @@ -874,9 +874,9 @@ public class WQpxxManagerImpl extends BaseManagerImpl<WQpxxDao, WQpxx> implement | ||
| 874 | if (ObjectUtil.isEmpty(qpczDTO.getClId())) { | 874 | if (ObjectUtil.isEmpty(qpczDTO.getClId())) { |
| 875 | throw new RuntimeException("请传入车辆信息"); | 875 | throw new RuntimeException("请传入车辆信息"); |
| 876 | } | 876 | } |
| 877 | - WClxx wClxx = wClxxDao.selectById(qpczDTO.getCzId()); | 877 | + WClxx wClxx = wClxxDao.selectById(qpczDTO.getClId()); |
| 878 | if (wClxx == null) { | 878 | if (wClxx == null) { |
| 879 | - throw new RuntimeException("厂站信息不存在"); | 879 | + throw new RuntimeException("车辆信息不存在"); |
| 880 | } | 880 | } |
| 881 | if (ObjectUtil.isNotEmpty(mpckList) && ObjectUtil.isNotEmpty(kpckList)) { | 881 | if (ObjectUtil.isNotEmpty(mpckList) && ObjectUtil.isNotEmpty(kpckList)) { |
| 882 | List<String> qptm_mp = mpckList.stream().map(a -> a.getFQptm()).collect(Collectors.toList()); | 882 | List<String> qptm_mp = mpckList.stream().map(a -> a.getFQptm()).collect(Collectors.toList()); |