当班所有装运详细信息增加过滤条件

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

@@ -3646,6 +3646,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         .eq(RollClubTwoDetails::getShift,shift)
                         .eq(RollClubTwoDetails::getShiftGroup,shiftGroup);
 
+                queryWrapper3.between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
                 if (storageBill != null && storageBill.getId() != null) {
                     queryWrapper3.eq(RollClubTwoDetails::getStorageBillId, storageBill.getId());
                 }
@@ -3678,6 +3680,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         .eq(RollClubThreeDetails::getShift,shift)
                         .eq(RollClubThreeDetails::getShiftGroup,shiftGroup);
 
+                queryWrapper3.between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
                 if (storageBill != null && storageBill.getId() != null) {
                     queryWrapper3.eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
                 }
@@ -3710,6 +3714,8 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         .eq(RollOutShippDetails::getShift,shift)
                         .eq(RollOutShippDetails::getShiftGroup,shiftGroup);
 
+                queryWrapper3.between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
                 if (storageBill != null && storageBill.getId() != null) {
                     queryWrapper3.eq(RollOutShippDetails::getStorageBillId, storageBill.getId());
                 }
@@ -3834,11 +3840,14 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper2.eq(RollClubTwoDetails::getCcmNo, ccmNo)
                          .eq(RollClubTwoDetails::getShift, shift)
                          .eq(RollClubTwoDetails::getShiftGroup, shiftGroup)
-                          .in(RollClubTwoDetails::getStorageBillId, idList);
+                          .in(RollClubTwoDetails::getStorageBillId, idList)
+                          .between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
         } else {
             queryWrapper2.eq(RollClubTwoDetails::getCcmNo, ccmNo)
                          .eq(RollClubTwoDetails::getShift, shift)
-                         .eq(RollClubTwoDetails::getShiftGroup, shiftGroup);
+                         .eq(RollClubTwoDetails::getShiftGroup, shiftGroup)
+                         .between(RollClubTwoDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         }
 
         List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper2);
@@ -3863,11 +3872,13 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo)
                     .eq(RollClubThreeDetails::getShift, shift)
                     .eq(RollClubThreeDetails::getShiftGroup, shiftGroup)
-                    .in(RollClubThreeDetails::getStorageBillId, idList);
+                    .in(RollClubThreeDetails::getStorageBillId, idList)
+                    .between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo)
                     .eq(RollClubThreeDetails::getShift, shift)
-                    .eq(RollClubThreeDetails::getShiftGroup, shiftGroup);
+                    .eq(RollClubThreeDetails::getShiftGroup, shiftGroup)
+                    .between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         }
 
         List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
@@ -3918,11 +3929,13 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper5.eq(RollOutShippDetails::getCcmNo, ccmNo)
                     .eq(RollOutShippDetails::getShift, shift)
                     .eq(RollOutShippDetails::getShiftGroup, shiftGroup)
-                    .in(RollOutShippDetails::getStorageBillId, idList);
+                    .in(RollOutShippDetails::getStorageBillId, idList)
+                    .between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         } else {
             queryWrapper5.eq(RollOutShippDetails::getCcmNo, ccmNo)
                     .eq(RollOutShippDetails::getShift, shift)
-                    .eq(RollOutShippDetails::getShiftGroup, shiftGroup);
+                    .eq(RollOutShippDetails::getShiftGroup, shiftGroup)
+                    .between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
         }
 
         List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(queryWrapper5);