修改当前装运不区分班次去查询总支数

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/service/impl/StorageBillServiceImpl.java

@@ -1623,6 +1623,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
                     .eq(BilletHotsendChangeShift::getShift, shift)
                     .eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
+                    .isNull(BilletHotsendChangeShift::getChangeShiftTime)
                     .orderByDesc(BilletHotsendChangeShift::getCreateTime)
                     .last("limit 1");
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
@@ -1647,8 +1648,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         // 根据铸机号、班组、班别，amountTotal不等于0 ，查询当班装运单信息
         LambdaQueryWrapper<StorageBill> queryWrapper2 = new LambdaQueryWrapper<>();
         queryWrapper2.eq(StorageBill::getCcmNo, ccmNo)
-                .eq(StorageBill::getShift, shift)
-                .eq(StorageBill::getShiftGroup, shiftGroup)
                 .gt(StorageBill::getAmountTotal, 0);
         // 检查 billetHotsendChangeShift 是否为空
         if (oConvertUtils.isEmpty(changeShiftId)) {
@@ -1671,7 +1670,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()).eq(RollClubTwoDetails::getShift,shift).eq(RollClubTwoDetails::getShiftGroup,shiftGroup);
+                queryWrapper3.eq(RollClubTwoDetails::getCcmNo, ccmNo).eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
                 List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper3);
                 if (oConvertUtils.listIsNotEmpty(rollClubTwoDetailsList)) {
                     List<DestinationStatisticsDetails> currentList1 = rollClubTwoDetailsList.stream()
@@ -1699,7 +1698,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()).eq(RollClubThreeDetails::getShift,shift).eq(RollClubThreeDetails::getShiftGroup,shiftGroup);
+                queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
                 List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
                 if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)) {
                     List<DestinationStatisticsDetails> currentList2 = rollClubThreeDetailsList.stream()
@@ -1727,7 +1726,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()).eq(RollOutShippDetails::getShift,shift).eq(RollOutShippDetails::getShiftGroup,shiftGroup);
+                queryWrapper3.eq(RollOutShippDetails::getCcmNo, ccmNo).eq(RollOutShippDetails::getStorageBillId, storageBill.getId());
                 List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper3);
                 if (oConvertUtils.listIsNotEmpty(rollOutShippDetailsList)) {
                     List<DestinationStatisticsDetails> currentList3 = rollOutShippDetailsList.stream()