|
@@ -54,6 +54,7 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import org.springframework.transaction.interceptor.TransactionAspectSupport;
|
|
|
|
|
|
import java.util.*;
|
|
|
+import java.util.concurrent.atomic.AtomicLong;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -495,7 +496,7 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
.eq(BilletHotsend::getShift, billetHotsend.getShift())
|
|
|
.eq(BilletHotsend::getShiftGroup, billetHotsend.getShiftGroup());
|
|
|
baseMapper.update(billetHotsend, updateWrapper);
|
|
|
-
|
|
|
+ AtomicLong timeOffset = new AtomicLong(); // 初始时间偏移量,单位毫秒,可以根据实际需求调整每次的偏移量大小
|
|
|
// 保存 钢坯热送单炉支数传递单明细
|
|
|
if ("roll_club_one".equals(billetHotsendDetailsVo.getBelongTable())){
|
|
|
// 保存棒一信息
|
|
@@ -534,9 +535,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubOneDetails.setLicensePlate("辊道");
|
|
|
rollClubOneDetails.setSize(String.valueOf(x.getLength()));
|
|
|
rollClubOneDetails.setSteel(x.getGrade());
|
|
|
- rollClubOneDetails.setCreateTime(new Date());
|
|
|
+ rollClubOneDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
|
|
|
rollClubOneDetails.setBlankOutput(x.getBilletWeight());//出坯量
|
|
|
rollClubOneDetailsList.add(rollClubOneDetails);
|
|
|
+ timeOffset.addAndGet(1000); // 这里假设每次增加1秒(1000毫秒)的时间偏移量
|
|
|
});
|
|
|
rollClubOneDetailsService.saveBatch(rollClubOneDetailsList);
|
|
|
// 更新交班表中的热送总支数
|
|
@@ -582,9 +584,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubTwoDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
rollClubTwoDetails.setSize(String.valueOf(x.getLength()));
|
|
|
rollClubTwoDetails.setSteel(x.getGrade());
|
|
|
- rollClubTwoDetails.setCreateTime(new Date());
|
|
|
+ rollClubTwoDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
|
|
|
rollClubTwoDetails.setBlankOutput(x.getBilletWeight());//出坯量
|
|
|
rollClubTwoDetailsList.add(rollClubTwoDetails);
|
|
|
+ timeOffset.addAndGet(1000); // 这里假设每次增加1秒(1000毫秒)的时间偏移量
|
|
|
});
|
|
|
rollClubTwoDetailsService.saveBatch(rollClubTwoDetailsList);
|
|
|
// 更新交班表中的热装总支数
|
|
@@ -630,9 +633,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollClubThreeDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
rollClubThreeDetails.setSize(String.valueOf(x.getLength()));
|
|
|
rollClubThreeDetails.setSteel(x.getGrade());
|
|
|
- rollClubThreeDetails.setCreateTime(new Date());
|
|
|
+ rollClubThreeDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
|
|
|
rollClubThreeDetails.setBlankOutput(x.getBilletWeight());//出坯量
|
|
|
rollClubThreeDetailsList.add(rollClubThreeDetails);
|
|
|
+ timeOffset.addAndGet(1000); // 这里假设每次增加1秒(1000毫秒)的时间偏移量
|
|
|
});
|
|
|
rollClubThreeDetailsService.saveBatch(rollClubThreeDetailsList);
|
|
|
// 更新交班表中的热装总支数
|
|
@@ -678,9 +682,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollHeightDetails.setLicensePlate("辊道");
|
|
|
rollHeightDetails.setSize(String.valueOf(x.getLength()));
|
|
|
rollHeightDetails.setSteel(x.getGrade());
|
|
|
- rollHeightDetails.setCreateTime(new Date());
|
|
|
+ rollHeightDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
|
|
|
rollHeightDetails.setBlankOutput(x.getBilletWeight());//出坯量
|
|
|
rollHeightDetailsList.add(rollHeightDetails);
|
|
|
+ timeOffset.addAndGet(1000); // 这里假设每次增加1秒(1000毫秒)的时间偏移量
|
|
|
});
|
|
|
rollHeightDetailsService.saveBatch(rollHeightDetailsList);
|
|
|
// 更新交班表中的热送总支数
|
|
@@ -729,9 +734,10 @@ public class BilletHotsendBaseServiceImpl extends ServiceImpl<BilletHotsendBaseM
|
|
|
rollOutShippDetails.setLicensePlate(storageBill.getLicensePlate());
|
|
|
rollOutShippDetails.setSize(String.valueOf(x.getLength()));
|
|
|
rollOutShippDetails.setSteel(x.getGrade());
|
|
|
- rollOutShippDetails.setCreateTime(new Date());
|
|
|
+ rollOutShippDetails.setCreateTime(new Date(System.currentTimeMillis() + timeOffset.get()));
|
|
|
rollOutShippDetails.setBlankOutput(x.getBilletWeight());//出坯量
|
|
|
rollOutShippDetailsList.add(rollOutShippDetails);
|
|
|
+ timeOffset.addAndGet(1000); // 这里假设每次增加1秒(1000毫秒)的时间偏移量
|
|
|
});
|
|
|
rollOutShippDetailsService.saveBatch(rollOutShippDetailsList);
|
|
|
// 更新交班表中的热装总支数
|