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

Compare commits

base: dianliang:01f5aa9017870d4dd16f64cba3424b5d42a70cd0
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev
..
compare: dianliang:28ebcfc6dc77ceb0a7f8e3971f49d24516fbc206
Branches Tags
dianliang:master
dianliang:repair
dianliang:insp
dianliang:rescue
dianliang:driver
dianliang:dev

No commits in common. "01f5aa9017870d4dd16f64cba3424b5d42a70cd0" and "28ebcfc6dc77ceb0a7f8e3971f49d24516fbc206" have entirely different histories.
01f5aa9017 ... 28ebcfc6dc

1 changed files with 9 additions and 10 deletions
Show Stats Expand all files Collapse all files

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

@ -242,8 +242,7 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
sois.stream().filter(i -> i.getGoodsId().equals(item.getWaresId())).findFirst().ifPresent(repairSoiByTwItem -> { sois.stream().filter(i -> i.getGoodsId().equals(item.getWaresId())).findFirst().ifPresent(repairSoiByTwItem -> {
if (so.getSoType().equals("02")){ if (so.getSoType().equals("02")){
dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() - repairSoiByTwItem.getGoodsCount()); dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() - repairSoiByTwItem.getGoodsCount());
// 不操作配件申请表子表的状态 dlTwItem.setWaresStatus("02");
// dlTwItem.setWaresStatus("02");
}else { }else {
dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() + repairSoiByTwItem.getGoodsCount()); dlTwItem.setWaresAlreadyCount(item.getWaresAlreadyCount() + repairSoiByTwItem.getGoodsCount());
} }
@ -326,13 +325,13 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
// 查最新的子表信息 // 查最新的子表信息
DlRepairSo so = baseMapper.selectById(id); DlRepairSo so = baseMapper.selectById(id);
List<DlTwItem> list = twItemService.list(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, so.getTwId())); List<DlTwItem> list = twItemService.list(new LambdaQueryWrapper<DlTwItem>().eq(DlTwItem::getTwId, so.getTwId()));
// 判断是部分完成还是全部完成----不需要判断了 // 判断是部分完成还是全部完成
// DlTicketWares dlTicketWares = new DlTicketWares(); DlTicketWares dlTicketWares = new DlTicketWares();
// dlTicketWares.setId(so.getTwId()); dlTicketWares.setId(so.getTwId());
// List<DlTwItem> flag = list.stream().filter(item -> !item.getWaresStatus().equals("01")).collect(Collectors.toList()); List<DlTwItem> flag = list.stream().filter(item -> !item.getWaresStatus().equals("01")).collect(Collectors.toList());
// dlTicketWares.setStatus(CollectionUtil.isEmpty(flag) ? "03" : "04"); dlTicketWares.setStatus(CollectionUtil.isEmpty(flag) ? "03" : "04");
// 更新主表的状态 // 更新主表的状态
// ticketWaresService.updateById(dlTicketWares); ticketWaresService.updateById(dlTicketWares);
// 通知仓库 // 通知仓库
repairWorkerService.sentMessage(Long.valueOf(so.getCreator()), so.getUserName() + "已确认领料单:" + so.getSoNo()); repairWorkerService.sentMessage(Long.valueOf(so.getCreator()), so.getUserName() + "已确认领料单:" + so.getSoNo());
@ -448,8 +447,8 @@ public class DlRepairSoServiceImpl extends ServiceImpl<DlRepairSoMapper, DlRepai
//入库数量 //入库数量
inWares.setInCount(filterSoi.getInCount()); inWares.setInCount(filterSoi.getInCount());
inWares.setId(null); inWares.setId(null);
//采购品中入库数量字段累加---这里item.getInCount 是null的时候，应该是filterSoi的inCount而不是0 //采购品中入库数量字段累加
item.setInCount(item.getInCount() == null ? filterSoi.getInCount() : item.getInCount() + filterSoi.getInCount()); item.setInCount(item.getInCount() == null ? 0 : item.getInCount() + filterSoi.getInCount());
inWaresList.add(inWares); inWaresList.add(inWares);
}); });
//更新采购品 //更新采购品