|
@@ -170,32 +170,12 @@ 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){
|
|
|
- // 5号机棒一和6号机高线不产生,装运单和储运记录
|
|
|
-// if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable()) || "roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
|
|
|
-// List<String> heatNoList = rollClubCommonList.stream().map(RollClubCommon::getHeatNo).distinct().collect(Collectors.toList());
|
|
|
-//
|
|
|
-// // 生成钢坯装运单记录
|
|
|
-// StorageBill storageBillInfo = createStorageBill(billetHotsendDetailsVo, rollClubCommonList, sizeLists);
|
|
|
-// String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
-// .map(BilletBasicInfo::getAssemblyNumber)
|
|
|
-// .filter(assemblyNumber -> assemblyNumber!= null)
|
|
|
-// .distinct()
|
|
|
-// .collect(Collectors.joining(","));
|
|
|
-// storageBillInfo.setAssemblyNumber(distinctAssemblyNumber);
|
|
|
-// storageBillInfo.setId(rollClubOneOrHeightStorageBillId);
|
|
|
-// if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable())){
|
|
|
-// storageBillInfo.setBtype("0");
|
|
|
-// }
|
|
|
-// storageBillService.save(storageBillInfo);
|
|
|
-// // 生成钢坯储运单记录
|
|
|
-// StorageCarLog storageCarLog = createStorageCarLog(storageBillInfo, rollClubCommonList, heatNoList, sizeLists);
|
|
|
-// storageCarLogService.save(storageCarLog);
|
|
|
-// result.put("success", "6".equals(billetHotsendDetailsVo.getBilletHotsend().getCcmNo()) ? "保存高线成功!" : "保存棒一成功!");
|
|
|
-// }
|
|
|
+
|
|
|
+ if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
|
|
|
+ result.put("success", "直轧棒一保存成功!");
|
|
|
+ return result;
|
|
|
+ }else if ("roll_height".equals(billetHotsendDetailsVo.getBelongTable())){
|
|
|
+ result.put("success", "热送高线保存成功!");
|
|
|
return result;
|
|
|
}
|
|
|
// 更新装运单 车次总序号、本车车次
|
|
@@ -203,33 +183,34 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
queryWrapperSB.eq(StorageBill::getId, billetHotsendDetailsVo.getStorageBill().getId());
|
|
|
StorageBill storageBillInfo = storageBillService.getOne(queryWrapperSB);
|
|
|
if (oConvertUtils.isEmpty(storageBillInfo)){
|
|
|
- storageBill.setAmountTotal(rollClubCommonList.size());
|
|
|
- }else {
|
|
|
- storageBill.setAmountTotal(storageBillInfo.getAmountTotal() + rollClubCommonList.size());
|
|
|
+ result.put("fail", "钢坯装运单不存在,棒线保存操作失败!");
|
|
|
+ return result;
|
|
|
}
|
|
|
+ storageBillInfo.setAmountTotal(storageBillInfo.getAmountTotal() + rollClubCommonList.size());
|
|
|
// 取最新的第一条钢坯信息
|
|
|
RollClubCommon rollClubCommon = rollClubCommonList.stream().findFirst().orElse(null);
|
|
|
- storageBill.setSteel(rollClubCommon.getGrade());//钢种
|
|
|
- storageBill.setSpec(rollClubCommon.getSpec());//规格
|
|
|
- storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
- storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
|
|
|
- storageBill.setHeatNo(rollClubCommon.getHeatNo());// 炉号
|
|
|
- storageBill.setSize(sizeString);// 定尺
|
|
|
- String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
- .map(BilletBasicInfo::getAssemblyNumber)
|
|
|
- .filter(assemblyNumber -> assemblyNumber!= null)
|
|
|
- .distinct()
|
|
|
- .collect(Collectors.joining(","));
|
|
|
- if (oConvertUtils.isNotEmpty(storageBill)){
|
|
|
- String existingAssemblyNumber = storageBill.getAssemblyNumber();
|
|
|
- String finalAssemblyNumber = Optional.ofNullable(existingAssemblyNumber)
|
|
|
+ if (rollClubCommon != null) {
|
|
|
+ storageBillInfo.setSteel(rollClubCommon.getGrade());//钢种
|
|
|
+ storageBillInfo.setSpec(rollClubCommon.getSpec());//规格
|
|
|
+ storageBillInfo.setHeatNo(rollClubCommon.getHeatNo());// 炉号
|
|
|
+ }
|
|
|
+ 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);
|
|
|
+ storageBillInfo.setSize(sizeString);// 定尺
|
|
|
+ List<String> stringList = billetBasicInfoList.stream().map(BilletBasicInfo::getAssemblyNumber).filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber)).collect(Collectors.toList());
|
|
|
+ if(oConvertUtils.listIsNotEmpty(stringList)) {
|
|
|
+ String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
+ .map(BilletBasicInfo::getAssemblyNumber)
|
|
|
+ .filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber))
|
|
|
+ .distinct().collect(Collectors.joining(","));
|
|
|
+ String finalAssemblyNumber = Optional.ofNullable(storageBillInfo.getAssemblyNumber())
|
|
|
+ .filter(oConvertUtils::isNotEmpty)
|
|
|
.map(s -> s + "," + distinctAssemblyNumber)
|
|
|
.orElse(distinctAssemblyNumber);
|
|
|
- storageBill.setAssemblyNumber(finalAssemblyNumber);
|
|
|
- }else {
|
|
|
- storageBill.setAssemblyNumber(distinctAssemblyNumber);
|
|
|
+ storageBillInfo.setAssemblyNumber(finalAssemblyNumber);
|
|
|
}
|
|
|
- storageBillService.updateById(storageBill);
|
|
|
+ storageBillService.updateById(storageBillInfo);
|
|
|
result.put("success", "棒线保存成功!");
|
|
|
return result;
|
|
|
}
|
|
@@ -337,39 +318,40 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
queryWrapperSB.eq(StorageBill::getId, billetHotsendDetailsVo.getStorageBill().getId());
|
|
|
StorageBill storageBillInfo = storageBillService.getOne(queryWrapperSB);
|
|
|
if (oConvertUtils.isEmpty(storageBillInfo)){
|
|
|
- storageBill.setAmountTotal(rollClubCommonList.size());
|
|
|
- }else {
|
|
|
- storageBill.setAmountTotal(storageBillInfo.getAmountTotal() + rollClubCommonList.size());
|
|
|
+ TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
|
|
|
+ result.put("fail", "钢坯装运单不存在,棒线发车操作失败!");
|
|
|
+ return result;
|
|
|
}
|
|
|
+ storageBillInfo.setAmountTotal(storageBillInfo.getAmountTotal() + rollClubCommonList.size());
|
|
|
// 取最新的第一条钢坯信息
|
|
|
RollClubCommon rollClubCommon = rollClubCommonList.stream().findFirst().orElse(null);
|
|
|
- storageBill.setSteel(rollClubCommon.getGrade());//钢种
|
|
|
- storageBill.setSpec(rollClubCommon.getSpec());//规格
|
|
|
- storageBill.setHeatNo(rollClubCommon.getHeatNo());//炉号
|
|
|
- storageBill.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
- storageBill.setDestination(billetHotsendDetailsVo.getBelongTypeName());// 目的地
|
|
|
- storageBill.setSize(String.join(",", sizeList));
|
|
|
- storageBill.setOutTime(new Date());
|
|
|
- List<String> stringList = billetBasicInfoList.stream().map(BilletBasicInfo::getAssemblyNumber).filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber)).collect(Collectors.toList());
|
|
|
- if(oConvertUtils.listIsNotEmpty(stringList)) {
|
|
|
+ storageBillInfo.setSteel(rollClubCommon.getGrade());//钢种
|
|
|
+ storageBillInfo.setSpec(rollClubCommon.getSpec());//规格
|
|
|
+ storageBillInfo.setHeatNo(rollClubCommon.getHeatNo());// 炉号
|
|
|
+ String sizeString = String.join(",", sizeList.stream().map(String::valueOf).collect(Collectors.toList()));
|
|
|
+ storageBillInfo.setSize(sizeString);// 定尺
|
|
|
+ List<String> assemblyNumberList = billetBasicInfoList.stream().map(BilletBasicInfo::getAssemblyNumber).filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber)).collect(Collectors.toList());
|
|
|
+ if(oConvertUtils.listIsNotEmpty(assemblyNumberList)) {
|
|
|
String distinctAssemblyNumber = billetBasicInfoList.stream()
|
|
|
.map(BilletBasicInfo::getAssemblyNumber)
|
|
|
.filter(assemblyNumber -> oConvertUtils.isNotEmpty(assemblyNumber))
|
|
|
.distinct().collect(Collectors.joining(","));
|
|
|
- String finalAssemblyNumber = Optional.ofNullable(storageBill.getAssemblyNumber())
|
|
|
+ String finalAssemblyNumber = Optional.ofNullable(storageBillInfo.getAssemblyNumber())
|
|
|
.filter(oConvertUtils::isNotEmpty)
|
|
|
.map(s -> s + "," + distinctAssemblyNumber)
|
|
|
.orElse(distinctAssemblyNumber);
|
|
|
- storageBill.setAssemblyNumber(finalAssemblyNumber);
|
|
|
+ storageBillInfo.setAssemblyNumber(finalAssemblyNumber);
|
|
|
}
|
|
|
- storageBillService.updateById(storageBill);
|
|
|
+ storageBillInfo.setOutTime(new Date());
|
|
|
+ storageBillService.updateById(storageBillInfo);
|
|
|
+
|
|
|
// 生成储运单
|
|
|
StorageCarLog storageCarLog = new StorageCarLog();
|
|
|
- BeanUtils.copyProperties(storageBill, storageCarLog);
|
|
|
- storageCarLog.setDestination(billetHotsendTypeConfig.getTypeName());// 目的地
|
|
|
- storageCarLog.setCarNm(storageBill.getLicensePlate());// 车牌号
|
|
|
+ BeanUtils.copyProperties(storageBillInfo, storageCarLog);
|
|
|
+ storageCarLog.setDestination(storageBillInfo.getDestination());// 目的地
|
|
|
+ storageCarLog.setCarNm(storageBillInfo.getLicensePlate());// 车牌号
|
|
|
// storageCarLog.setFixedWeight();// 定重
|
|
|
- storageCarLog.setTypeConfigId(billetHotsendDetailsVo.getBilletHotsendTypeConfigId()); // 钢坯配置类型ID
|
|
|
+ storageCarLog.setTypeConfigId(storageBillInfo.getTypeConfigId()); // 钢坯配置类型ID
|
|
|
storageCarLog.setHeatNo(String.join(",", heatNoList));
|
|
|
storageCarLog.setSize(String.join(",", sizeList));// 定尺
|
|
|
storageCarLog.setAmount(Integer.valueOf((int) count));// 支数
|