dianliang/lanan-system
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://122.51.230.86:3000/dianliang/lanan-system into dev

Browse Source
This commit is contained in:
xiaofajia 2024-10-26 17:52:48 +08:00
commit e8b1e7a655
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dl-module-repair/src/main/java/cn/iocoder/yudao/module/booking/service/impl/DlRepairBookingServiceImpl.java
View File

@ -233,6 +233,7 @@ public class DlRepairBookingServiceImpl extends ServiceImpl<DlRepairBookingMappe
* @date 15:52 2024/10/26 * @date 15:52 2024/10/26
**/ **/
@Override @Override
@TenantIgnore
public List<UserDTO> getAllServicer(Long tenantId) { public List<UserDTO> getAllServicer(Long tenantId) {
return roleApi.selectUserListByRoleCode(tenantId, RepairRoleEnum.ADVISOR.getCode()); return roleApi.selectUserListByRoleCode(tenantId, RepairRoleEnum.ADVISOR.getCode());
} }

4
dl-module-repair/src/main/java/cn/iocoder/yudao/module/stockOperate/service/impl/DlRepairSoServiceImpl.java
View File

@ -558,8 +558,8 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
// 更新采购单的状态，如果是全部入库完了，就是03已入库，反之不变 // 更新采购单的状态，如果是全部入库完了，就是03已入库，反之不变
// 查该采购单的所有采购配件 // 查该采购单的所有采购配件
List<DlRepairSoi> sois = repairSoiService.list(new LambdaQueryWrapper<DlRepairSoi>().eq(DlRepairSoi::getSoId, reqVO.getId())); List<DlRepairSoi> sois = repairSoiService.list(new LambdaQueryWrapper<DlRepairSoi>().eq(DlRepairSoi::getSoId, reqVO.getId()));
// 过滤出入库数量等于采购数量的数据 // 过滤出入库数量大于等于采购数量的数据 （入库数量可以大于采购的数量）
List<DlRepairSoi> allInSois = sois.stream().filter(item -> item.getInCount().equals(item.getGoodsCount())).collect(Collectors.toList()); List<DlRepairSoi> allInSois = sois.stream().filter(item -> item.getInCount() >= item.getGoodsCount()).collect(Collectors.toList());
// 如果allInSois的size就是sois的size，那就是全部都入库了 // 如果allInSois的size就是sois的size，那就是全部都入库了
if (CollectionUtil.isNotEmpty(allInSois) && allInSois.size() == sois.size()) { if (CollectionUtil.isNotEmpty(allInSois) && allInSois.size() == sois.size()) {
// 更新采购单的状态为已入库 // 更新采购单的状态为已入库