|
@@ -171,11 +171,13 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
x.setUpdateTime(new Date());
|
|
|
});
|
|
|
billetBasicInfoService.saveOrUpdateBatch(billetBasicInfoList);
|
|
|
+ List<Integer> sizeList = rollClubCommonList.stream().map(RollClubCommon::getLength).distinct().collect(Collectors.toList());
|
|
|
+ List<String> sizeLists = sizeList.stream().map(String::valueOf).collect(Collectors.toList());
|
|
|
+ String sizeString = String.join(",", sizeLists);
|
|
|
if (oConvertUtils.isEmpty(billetHotsendDetailsVo.getStorageBill()) || billetHotsendDetailsVo.getStorageBill() == null){
|
|
|
if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable()) || "roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
|
|
|
List<String> heatNoList = rollClubCommonList.stream().map(RollClubCommon::getHeatNo).distinct().collect(Collectors.toList());
|
|
|
- List<Integer> sizeList = rollClubCommonList.stream().map(RollClubCommon::getLength).distinct().collect(Collectors.toList());
|
|
|
- List<String> sizeLists = sizeList.stream().map(String::valueOf).collect(Collectors.toList());
|
|
|
+
|
|
|
// 生成钢坯装运单记录
|
|
|
StorageBill storageBillInfo = createStorageBill(billetHotsendDetailsVo, rollClubCommonList, sizeLists);
|
|
|
String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
@@ -212,7 +214,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
|
|
|
storageBill.setHeatNo(rollClubCommon.getHeatNo());// 炉号
|
|
|
- storageBill.setSize(String.valueOf(rollClubCommon.getLength()));// 定尺
|
|
|
+ storageBill.setSize(sizeString);// 定尺
|
|
|
String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
.map(BilletBasicInfo::getAssemblyNumber)
|
|
|
.filter(assemblyNumber -> assemblyNumber!= null)
|
|
@@ -343,7 +345,6 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
storageBill.setSteel(rollClubCommon.getGrade());//钢种
|
|
|
storageBill.setSpec(rollClubCommon.getSpec());//规格
|
|
|
storageBill.setHeatNo(rollClubCommon.getHeatNo());//炉号
|
|
|
- storageBill.setSize(String.valueOf(rollClubCommon.getLength()));//定尺
|
|
|
storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
|
|
|
storageBill.setSize(String.join(",", sizeList));
|