|
|
|
|
@ -395,6 +395,10 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
|
|
|
|
|
if(ObjectUtils.isNull(o)){ |
|
|
|
|
return R.fail("参数不完整！"); |
|
|
|
|
} |
|
|
|
|
BasicdataWarehouseEntity myCurrentWarehouse = basicdataWarehouseClient.getMyCurrentWarehouse(); |
|
|
|
|
if(ObjectUtils.isNull(myCurrentWarehouse)){ |
|
|
|
|
throw new ServiceException("请选择仓库！"); |
|
|
|
|
} |
|
|
|
|
QueryWrapper<DistributionParcelListEntity> queryWrapper = new QueryWrapper<>(); |
|
|
|
|
String s = String.valueOf(o); |
|
|
|
|
if(s.contains(",")){ |
|
|
|
|
@ -403,55 +407,79 @@ public class DistributionParcelListServiceImpl extends BaseServiceImpl<Distribut
|
|
|
|
|
}else{ |
|
|
|
|
queryWrapper.eq("id",o); |
|
|
|
|
} |
|
|
|
|
queryWrapper.eq("conditions",1); |
|
|
|
|
List<DistributionParcelListEntity> list1 = baseMapper.selectList(queryWrapper); |
|
|
|
|
// if (!list1.isEmpty()) {
|
|
|
|
|
// list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId))
|
|
|
|
|
// .forEach((k ,v) ->{
|
|
|
|
|
// int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum();
|
|
|
|
|
// v.stream().forEach( i -> {
|
|
|
|
|
// //查询有没有打托数据
|
|
|
|
|
//
|
|
|
|
|
// //查询包件有没有物料
|
|
|
|
|
// List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda()
|
|
|
|
|
// .eq(DistributionParcelDetailsEntity::getParcelListId, i.getId())
|
|
|
|
|
// );
|
|
|
|
|
// if (!list.isEmpty()) {
|
|
|
|
|
// //有
|
|
|
|
|
// list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded))
|
|
|
|
|
// .forEach((kk,vv) ->{
|
|
|
|
|
// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
|
|
|
|
|
// BeanUtil.copyProperties(vv.get(0),parcelListEntity);
|
|
|
|
|
// parcelListEntity.setQuantity(sum);
|
|
|
|
|
// parcelListEntity.setMaterialName(vv.get(0).getName());
|
|
|
|
|
// parcelListEntity.setMaterialCode(vv.get(0).getEncoded());
|
|
|
|
|
// parcelListEntity.setMaterialUnit(vv.get(0).getUnit());
|
|
|
|
|
// // 添加库存品信息
|
|
|
|
|
// addStockList(parcelListEntity, 1);
|
|
|
|
|
// });
|
|
|
|
|
// }
|
|
|
|
|
// DistributionParcelListEntity parcelList = new DistributionParcelListEntity();
|
|
|
|
|
// parcelList.setId(i.getId());
|
|
|
|
|
// parcelList.setConditions(2);
|
|
|
|
|
// baseMapper.updateById(parcelList);
|
|
|
|
|
//
|
|
|
|
|
// });
|
|
|
|
|
// DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity();
|
|
|
|
|
// BeanUtil.copyProperties(v.get(0),parcelListEntity);
|
|
|
|
|
// parcelListEntity.setQuantity(sum);
|
|
|
|
|
// // 添加库存品信息
|
|
|
|
|
// addStockList(parcelListEntity, 1);
|
|
|
|
|
// });
|
|
|
|
|
//
|
|
|
|
|
//// for (int i = 0; i < split.length; i++) {
|
|
|
|
|
//// //修改订单状态
|
|
|
|
|
//// DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity();
|
|
|
|
|
//// stockArticleEntity.setId(Long.parseLong(split[i]));
|
|
|
|
|
//// stockArticleEntity.setGenre(2);
|
|
|
|
|
//// baseMapper.updateById(stockArticleEntity);
|
|
|
|
|
//// }
|
|
|
|
|
// return R.success("操作成功！");
|
|
|
|
|
// }
|
|
|
|
|
return null; |
|
|
|
|
if (!list1.isEmpty()) { |
|
|
|
|
Set<Long> listString = new HashSet<>(); |
|
|
|
|
list1.stream().collect(Collectors.groupingBy(DistributionParcelListEntity::getMaterialId)) |
|
|
|
|
.forEach((k ,v) ->{ |
|
|
|
|
int sum = v.stream().mapToInt(DistributionParcelListEntity::getQuantity).sum(); |
|
|
|
|
v.stream().forEach( i -> { |
|
|
|
|
//查询有没有打托数据
|
|
|
|
|
|
|
|
|
|
//查询包件有没有物料
|
|
|
|
|
List<DistributionParcelDetailsEntity> list = distributionParcelDetailsService.list(Wrappers.<DistributionParcelDetailsEntity>query().lambda() |
|
|
|
|
.eq(DistributionParcelDetailsEntity::getParcelListId, i.getId()) |
|
|
|
|
); |
|
|
|
|
if (!list.isEmpty()) { |
|
|
|
|
//有
|
|
|
|
|
list.stream().collect(Collectors.groupingBy(DistributionParcelDetailsEntity::getEncoded)) |
|
|
|
|
.forEach((kk,vv) ->{ |
|
|
|
|
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); |
|
|
|
|
BeanUtil.copyProperties(vv.get(0),parcelListEntity); |
|
|
|
|
parcelListEntity.setQuantity(sum); |
|
|
|
|
parcelListEntity.setMaterialName(vv.get(0).getName()); |
|
|
|
|
parcelListEntity.setMaterialCode(vv.get(0).getEncoded()); |
|
|
|
|
parcelListEntity.setMaterialUnit(vv.get(0).getUnit()); |
|
|
|
|
// 添加库存品信息
|
|
|
|
|
addStockList(parcelListEntity, 1); |
|
|
|
|
}); |
|
|
|
|
} |
|
|
|
|
//修改状态
|
|
|
|
|
DistributionParcelListEntity parcelList = new DistributionParcelListEntity(); |
|
|
|
|
parcelList.setId(i.getId()); |
|
|
|
|
parcelList.setConditions(2); |
|
|
|
|
baseMapper.updateById(parcelList); |
|
|
|
|
listString.add(i.getStockArticleId()); |
|
|
|
|
|
|
|
|
|
}); |
|
|
|
|
DistributionParcelListEntity parcelListEntity = new DistributionParcelListEntity(); |
|
|
|
|
BeanUtil.copyProperties(v.get(0),parcelListEntity); |
|
|
|
|
parcelListEntity.setQuantity(sum); |
|
|
|
|
// 添加库存品信息
|
|
|
|
|
addStockList(parcelListEntity, 1); |
|
|
|
|
}); |
|
|
|
|
listString.forEach( oo -> { |
|
|
|
|
DistributionStockArticleEntity stockArticleEntity1 = distributionStockArticleMapper.selectById(oo); |
|
|
|
|
if(ObjectUtils.isNull(stockArticleEntity1)){ |
|
|
|
|
throw new ServiceException("订单不存在！"); |
|
|
|
|
} |
|
|
|
|
if(stockArticleEntity1.getTotalNumber().equals(list1.size())){ |
|
|
|
|
//修改订单状态
|
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); |
|
|
|
|
//修改
|
|
|
|
|
stockArticleEntity.setId(oo); |
|
|
|
|
stockArticleEntity.setGenre(2); |
|
|
|
|
distributionStockArticleMapper.updateById(stockArticleEntity); |
|
|
|
|
} |
|
|
|
|
//查询库存品的订单
|
|
|
|
|
List<DistributionParcelListEntity> distributionParcelListEntities = baseMapper.selectList(Wrappers.<DistributionParcelListEntity>query().lambda() |
|
|
|
|
.eq(DistributionParcelListEntity::getStockArticleId, oo) |
|
|
|
|
.eq(DistributionParcelListEntity::getWarehouseId, myCurrentWarehouse.getId()) |
|
|
|
|
.eq(DistributionParcelListEntity::getConditions, 2) |
|
|
|
|
); |
|
|
|
|
if(!distributionParcelListEntities.isEmpty() && stockArticleEntity1.getTotalNumber().equals(distributionParcelListEntities.size())){ |
|
|
|
|
//修改订单状态
|
|
|
|
|
DistributionStockArticleEntity stockArticleEntity = new DistributionStockArticleEntity(); |
|
|
|
|
//修改
|
|
|
|
|
stockArticleEntity.setId(oo); |
|
|
|
|
stockArticleEntity.setGenre(2); |
|
|
|
|
distributionStockArticleMapper.updateById(stockArticleEntity); |
|
|
|
|
} |
|
|
|
|
}); |
|
|
|
|
return R.success("操作成功！"); |
|
|
|
|
} |
|
|
|
|
return R.fail("没有可用数据！"); |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
zhenghaoyu
1 year ago