|
@@ -698,22 +698,39 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public OnDutyStatistics queryHotChargingStatistics(String ccmNo) {
|
|
|
+ public OnDutyStatistics queryHotChargingStatistics(String ccmNo,String changeShiftId) {
|
|
|
OnDutyStatistics onDutyStatistics = new OnDutyStatistics();
|
|
|
|
|
|
- // 获取当前班组班次信息
|
|
|
- String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
- String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
- String shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
- String shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
- if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
|
|
|
- log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
- return onDutyStatistics;
|
|
|
+ String shiftGroup = "";
|
|
|
+ String shift = "";
|
|
|
+ BilletHotsendChangeShift billetHotsendChangeShift;
|
|
|
+
|
|
|
+ if(oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 获取当前班组班次信息
|
|
|
+ String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
+ String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
+ shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
+ shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
+ if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)) {
|
|
|
+ log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ // 根据铸机号、班组班别查询对应的热送单信息
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
+ .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
+ .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
+ }else {
|
|
|
+ // 根据铸机号、交班记录ID,获取交班记录中的班别、班次、创建时间
|
|
|
+ LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
|
+ if (billetHotsendChangeShift == null){
|
|
|
+ log.info("{}{}", "查询历史当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ shiftGroup = billetHotsendChangeShift.getShiftGroup();
|
|
|
+ shift = billetHotsendChangeShift.getShift();
|
|
|
}
|
|
|
- // 根据铸机号、班组班别查询对应的热送单信息
|
|
|
- BilletHotsendChangeShift billetHotsendChangeShiftList = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
- .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
- .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
// 查询热装信息(棒二明细、棒三明细、上若明细)统计热装总支数、热装总重量<出坯量>
|
|
|
List<DestinationStatisticsDetails> statisticsDetailsList1 = new ArrayList<>();
|
|
|
List<DestinationStatisticsDetails> statisticsDetailsList2 = new ArrayList<>();
|
|
@@ -726,9 +743,17 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper.eq(RollClubTwoDetails::getShiftGroup, shiftGroup);
|
|
|
queryWrapper.eq(RollClubTwoDetails::getShift, shift);
|
|
|
// 添加大于 billetHotsendChangeShiftList 的 createTime 条件
|
|
|
- if (billetHotsendChangeShiftList != null && billetHotsendChangeShiftList.getCreateTime() != null) {
|
|
|
- queryWrapper.gt(RollClubTwoDetails::getCreateTime, billetHotsendChangeShiftList.getCreateTime());
|
|
|
+ if (billetHotsendChangeShift != null && billetHotsendChangeShift.getCreateTime() != null) {
|
|
|
+ if (oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 当 changeShiftId 为空时,时间范围从 createTime 到当前时间
|
|
|
+ queryWrapper.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
+ } else {
|
|
|
+ // 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
+ queryWrapper.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)){
|
|
|
statisticsDetailsList1 = rollClubTwoDetailsList.stream()
|
|
@@ -762,9 +787,16 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper1.eq(RollClubThreeDetails::getShiftGroup, shiftGroup);
|
|
|
queryWrapper1.eq(RollClubThreeDetails::getShift, shift);
|
|
|
// 添加大于 billetHotsendChangeShiftList 的 createTime 条件
|
|
|
- if (billetHotsendChangeShiftList != null && billetHotsendChangeShiftList.getCreateTime() != null) {
|
|
|
- queryWrapper1.gt(RollClubThreeDetails::getCreateTime, billetHotsendChangeShiftList.getCreateTime());
|
|
|
+ if (billetHotsendChangeShift != null && billetHotsendChangeShift.getCreateTime() != null) {
|
|
|
+ if (oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 当 changeShiftId 为空时,时间范围从 createTime 到当前时间
|
|
|
+ queryWrapper1.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
+ } else {
|
|
|
+ // 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
+ queryWrapper1.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper1);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)){
|
|
|
statisticsDetailsList2 = rollClubThreeDetailsList.stream()
|
|
@@ -799,8 +831,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.eq(RollOutShippDetails::getShiftGroup, shiftGroup);
|
|
|
queryWrapper2.eq(RollOutShippDetails::getShift, shift);
|
|
|
// 添加大于 billetHotsendChangeShiftList 的 createTime 条件
|
|
|
- if (billetHotsendChangeShiftList != null && billetHotsendChangeShiftList.getCreateTime() != null) {
|
|
|
- queryWrapper2.gt(RollOutShippDetails::getCreateTime, billetHotsendChangeShiftList.getCreateTime());
|
|
|
+ if (billetHotsendChangeShift != null && billetHotsendChangeShift.getCreateTime() != null) {
|
|
|
+ if (oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 当 changeShiftId 为空时,时间范围从 createTime 到当前时间
|
|
|
+ queryWrapper2.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
+ } else {
|
|
|
+ // 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
+ queryWrapper2.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
+ }
|
|
|
}
|
|
|
List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper2);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)){
|
|
@@ -1577,7 +1615,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.eq(StorageBill::getCcmNo, ccmNo)
|
|
|
.eq(StorageBill::getShift, shift)
|
|
|
.eq(StorageBill::getShiftGroup, shiftGroup)
|
|
|
- .notIn(StorageBill::getLicensePlate, Arrays.asList("辊道", "堆垛辊道"))
|
|
|
.gt(StorageBill::getAmountTotal, 0);
|
|
|
// 检查 billetHotsendChangeShift 是否为空
|
|
|
if (oConvertUtils.isEmpty(changeShiftId)) {
|
|
@@ -1601,7 +1638,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
for (StorageBill storageBill : storageBillList) {
|
|
|
if ("棒二".equals(storageBill.getDestination())) {
|
|
|
LambdaQueryWrapper<RollClubTwoDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper3.eq(RollClubTwoDetails::getCcmNo, ccmNo).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
|
|
|
+ queryWrapper3.eq(RollClubTwoDetails::getCcmNo, ccmNo).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId()).eq(RollClubTwoDetails::getShift,shift).eq(RollClubTwoDetails::getShiftGroup,shiftGroup);
|
|
|
List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper3);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)) {
|
|
|
List<DestinationStatisticsDetails> currentList1 = rollClubTwoDetailsList.stream()
|
|
@@ -1627,7 +1664,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
|
|
|
if ("棒三".equals(storageBill.getDestination())) {
|
|
|
LambdaQueryWrapper<RollClubThreeDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
|
|
|
+ queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId()).eq(RollClubThreeDetails::getShift,shift).eq(RollClubThreeDetails::getShiftGroup,shiftGroup);
|
|
|
List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)) {
|
|
|
List<DestinationStatisticsDetails> currentList2 = rollClubThreeDetailsList.stream()
|
|
@@ -1653,7 +1690,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
|
|
|
if ("上若".equals(storageBill.getDestination())) {
|
|
|
LambdaQueryWrapper<RollOutShippDetails> queryWrapper3 = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper3.eq(RollOutShippDetails::getCcmNo, ccmNo).eq(RollOutShippDetails::getStorageBillId, storageBill.getId());
|
|
|
+ queryWrapper3.eq(RollOutShippDetails::getCcmNo, ccmNo).eq(RollOutShippDetails::getStorageBillId, storageBill.getId()).eq(RollOutShippDetails::getShift,shift).eq(RollOutShippDetails::getShiftGroup,shiftGroup);
|
|
|
List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper3);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)) {
|
|
|
List<DestinationStatisticsDetails> currentList3 = rollOutShippDetailsList.stream()
|
|
@@ -2595,22 +2632,38 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public OnDutyStatistics queryHotChargingTwoStatistics(String ccmNo) {
|
|
|
+ public OnDutyStatistics queryHotChargingTwoStatistics(String ccmNo,String changeShiftId) {
|
|
|
OnDutyStatistics onDutyStatistics = new OnDutyStatistics();
|
|
|
|
|
|
- // 获取当前班组班次信息
|
|
|
- String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
- String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
- String shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
- String shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
- if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
|
|
|
- log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
- return onDutyStatistics;
|
|
|
+ String shiftGroup = "";
|
|
|
+ String shift = "";
|
|
|
+ BilletHotsendChangeShift billetHotsendChangeShift;
|
|
|
+ if(oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 获取当前班组班次信息
|
|
|
+ String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
+ String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
+ shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
+ shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
+ if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)) {
|
|
|
+ log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ // 根据铸机号、班组班别查询对应的热装单信息
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
+ .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
+ .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
+ }else {
|
|
|
+ // 根据铸机号、交班记录ID,获取交班记录中的班别、班次、创建时间
|
|
|
+ LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
|
+ if (billetHotsendChangeShift == null){
|
|
|
+ log.info("{}{}", "查询历史当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ shiftGroup = billetHotsendChangeShift.getShiftGroup();
|
|
|
+ shift = billetHotsendChangeShift.getShift();
|
|
|
}
|
|
|
- // 根据铸机号、班组班别查询对应的热装单信息
|
|
|
- BilletHotsendChangeShift billetHotsendChangeShiftList = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
- .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
- .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
// 查询热装信息(棒二明细)统计热装总支数、热装总重量<出坯量>
|
|
|
List<DestinationStatisticsDetails> statisticsDetailsList1 = new ArrayList<>();
|
|
|
|
|
@@ -2622,8 +2675,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper.eq(RollClubTwoDetails::getShiftGroup, shiftGroup);
|
|
|
queryWrapper.eq(RollClubTwoDetails::getShift, shift);
|
|
|
// 添加大于 billetHotsendChangeShiftList 的 createTime 条件
|
|
|
- if (billetHotsendChangeShiftList != null && billetHotsendChangeShiftList.getCreateTime() != null) {
|
|
|
- queryWrapper.gt(RollClubTwoDetails::getCreateTime, billetHotsendChangeShiftList.getCreateTime());
|
|
|
+ if (billetHotsendChangeShift != null && billetHotsendChangeShift.getCreateTime() != null) {
|
|
|
+ if (oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 当 changeShiftId 为空时,时间范围从 createTime 到当前时间
|
|
|
+ queryWrapper.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
+ } else {
|
|
|
+ // 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
+ queryWrapper.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
+ }
|
|
|
}
|
|
|
List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)){
|
|
@@ -2679,22 +2738,40 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public OnDutyStatistics queryHotChargingThreeStatistics(String ccmNo) {
|
|
|
+ public OnDutyStatistics queryHotChargingThreeStatistics(String ccmNo,String changeShiftId) {
|
|
|
OnDutyStatistics onDutyStatistics = new OnDutyStatistics();
|
|
|
|
|
|
- // 获取当前班组班次信息
|
|
|
- String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
- String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
- String shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
- String shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
- if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
|
|
|
- log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
- return onDutyStatistics;
|
|
|
+
|
|
|
+ String shiftGroup = "";
|
|
|
+ String shift = "";
|
|
|
+ BilletHotsendChangeShift billetHotsendChangeShift;
|
|
|
+
|
|
|
+ if(oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 获取当前班组班次信息
|
|
|
+ String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
+ String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
+ shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
+ shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
+ if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)) {
|
|
|
+ log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ // 根据铸机号、班组班别查询对应的热装单信息
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
+ .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
+ .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
+ }else {
|
|
|
+ // 根据铸机号、交班记录ID,获取交班记录中的班别、班次、创建时间
|
|
|
+ LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
|
+ if (billetHotsendChangeShift == null){
|
|
|
+ log.info("{}{}", "查询历史当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ shiftGroup = billetHotsendChangeShift.getShiftGroup();
|
|
|
+ shift = billetHotsendChangeShift.getShift();
|
|
|
}
|
|
|
- // 根据铸机号、班组班别查询对应的热装单信息
|
|
|
- BilletHotsendChangeShift billetHotsendChangeShiftList = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
- .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
- .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
// 查询热装信息(棒三明细)统计热装总支数、热装总重量<出坯量>
|
|
|
List<DestinationStatisticsDetails> statisticsDetailsList2 = new ArrayList<>();
|
|
|
|
|
@@ -2707,8 +2784,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper1.eq(RollClubThreeDetails::getShiftGroup, shiftGroup);
|
|
|
queryWrapper1.eq(RollClubThreeDetails::getShift, shift);
|
|
|
// 添加大于 billetHotsendChangeShiftList 的 createTime 条件
|
|
|
- if (billetHotsendChangeShiftList != null && billetHotsendChangeShiftList.getCreateTime() != null) {
|
|
|
- queryWrapper1.gt(RollClubThreeDetails::getCreateTime, billetHotsendChangeShiftList.getCreateTime());
|
|
|
+ if (billetHotsendChangeShift != null && billetHotsendChangeShift.getCreateTime() != null) {
|
|
|
+ if (oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 当 changeShiftId 为空时,时间范围从 createTime 到当前时间
|
|
|
+ queryWrapper1.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
+ } else {
|
|
|
+ // 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
+ queryWrapper1.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
+ }
|
|
|
}
|
|
|
List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper1);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)){
|
|
@@ -2765,23 +2848,41 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
return onDutyStatistics;
|
|
|
}
|
|
|
|
|
|
+
|
|
|
+
|
|
|
@Override
|
|
|
- public OnDutyStatistics queryHotChargingOutStatistics(String ccmNo) {
|
|
|
+ public OnDutyStatistics queryHotChargingOutStatistics(String ccmNo,String changeShiftId) {
|
|
|
OnDutyStatistics onDutyStatistics = new OnDutyStatistics();
|
|
|
|
|
|
- // 获取当前班组班次信息
|
|
|
- String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
- String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
- String shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
- String shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
- if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)){
|
|
|
- log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
- return onDutyStatistics;
|
|
|
+ String shiftGroup = "";
|
|
|
+ String shift = "";
|
|
|
+ BilletHotsendChangeShift billetHotsendChangeShift;
|
|
|
+ if(oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 获取当前班组班次信息
|
|
|
+ String keyShiftGroup = String.format("class:shift:group:%s", ccmNo);
|
|
|
+ String keyShift = String.format("class:shift:%s", ccmNo);
|
|
|
+ shiftGroup = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShiftGroup));
|
|
|
+ shift = oConvertUtils.getString(redisTemplate.opsForValue().get(keyShift));
|
|
|
+ if (oConvertUtils.isEmpty(shiftGroup) || oConvertUtils.isEmpty(shift)) {
|
|
|
+ log.info("{}{}", "B端热装单统计当班热装查询失败!", "未查询到当班信息!");
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ // 根据铸机号、班组班别查询对应的热装单信息
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
+ .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
+ .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
+ }else {
|
|
|
+ // 根据铸机号、交班记录ID,获取交班记录中的班别、班次、创建时间
|
|
|
+ LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
|
|
|
+ billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
|
|
|
+ if (billetHotsendChangeShift == null){
|
|
|
+ log.info("{}{}", "查询历史当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
|
|
|
+ return onDutyStatistics;
|
|
|
+ }
|
|
|
+ shiftGroup = billetHotsendChangeShift.getShiftGroup();
|
|
|
+ shift = billetHotsendChangeShift.getShift();
|
|
|
}
|
|
|
- // 根据铸机号、班组班别查询对应的热装单信息
|
|
|
- BilletHotsendChangeShift billetHotsendChangeShiftList = billetHotsendChangeShiftService.getOne(new LambdaQueryWrapper<BilletHotsendChangeShift>()
|
|
|
- .eq(BilletHotsendChangeShift::getCcmNo, ccmNo).eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup).eq(BilletHotsendChangeShift::getShift, shift)
|
|
|
- .orderByDesc(BilletHotsendChangeShift::getCreateTime).last("limit 1"));
|
|
|
// 查询热装信息(上若明细)统计热装总支数、热装总重量<出坯量>
|
|
|
List<DestinationStatisticsDetails> statisticsDetailsList3 = new ArrayList<>();
|
|
|
// 统计总数
|
|
@@ -2793,8 +2894,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
|
|
|
queryWrapper2.eq(RollOutShippDetails::getShiftGroup, shiftGroup);
|
|
|
queryWrapper2.eq(RollOutShippDetails::getShift, shift);
|
|
|
// 添加大于 billetHotsendChangeShiftList 的 createTime 条件
|
|
|
- if (billetHotsendChangeShiftList != null && billetHotsendChangeShiftList.getCreateTime() != null) {
|
|
|
- queryWrapper2.gt(RollOutShippDetails::getCreateTime, billetHotsendChangeShiftList.getCreateTime());
|
|
|
+ if (billetHotsendChangeShift != null && billetHotsendChangeShift.getCreateTime() != null) {
|
|
|
+ if (oConvertUtils.isEmpty(changeShiftId)) {
|
|
|
+ // 当 changeShiftId 为空时,时间范围从 createTime 到当前时间
|
|
|
+ queryWrapper2.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
|
|
|
+ } else {
|
|
|
+ // 当 changeShiftId 不为空时,时间范围从 createTime 到 updateTime
|
|
|
+ queryWrapper2.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
|
|
|
+ }
|
|
|
}
|
|
|
List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper2);
|
|
|
if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)){
|