|
@@ -338,8 +338,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
rollClubTwoDetails.setUpdateTime(new Date());
|
|
|
rollClubTwoDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollClubTwoDetails.setBlankOutput(billetWeightTotal);//出坯量
|
|
|
- String distinctAssemblyNumber = rollClubCommonList.stream()
|
|
|
- .map(RollClubCommon::getAssemblyNumber)
|
|
|
+ String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
+ .map(BilletBasicInfo::getAssemblyNumber)
|
|
|
.filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber))
|
|
|
.distinct()
|
|
|
.collect(Collectors.joining(","));
|
|
@@ -395,8 +395,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
rollClubThreeDetails.setUpdateTime(new Date());
|
|
|
rollClubThreeDetails.setId(String.valueOf(IdWorker.getId()));
|
|
|
rollClubThreeDetails.setBlankOutput(billetWeightTotal);//出坯量
|
|
|
- String distinctAssemblyNumber = rollClubCommonList.stream()
|
|
|
- .map(RollClubCommon::getAssemblyNumber)
|
|
|
+ String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
+ .map(BilletBasicInfo::getAssemblyNumber)
|
|
|
.filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber))
|
|
|
.distinct()
|
|
|
.collect(Collectors.joining(","));
|
|
@@ -452,8 +452,8 @@ public class StackingAndLoadingVehiclesServiceImpl extends ServiceImpl<StackingA
|
|
|
rollOutShippDetails.setUpdateTime(new Date());
|
|
|
rollOutShippDetails.setBlankOutput(billetWeightTotal);//出坯量
|
|
|
|
|
|
- String distinctAssemblyNumber = rollClubCommonList.stream()
|
|
|
- .map(RollClubCommon::getAssemblyNumber)
|
|
|
+ String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
+ .map(BilletBasicInfo::getAssemblyNumber)
|
|
|
.filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber))
|
|
|
.distinct()
|
|
|
.collect(Collectors.joining(","));
|