钢坯热装明细信息-分页列表查询去除堆垛的数据

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

@@ -251,11 +251,29 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         BilletHotsendDetails result = new BilletHotsendDetails();
 
         result.setRollClubOneDetailsList(Collections.emptyList());
-        List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(new LambdaQueryWrapper<RollClubTwoDetails>().eq(RollClubTwoDetails::getHeatNo, storageBill.getHeatNo()));
+        List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(
+                new LambdaQueryWrapper<RollClubTwoDetails>()
+                        .eq(RollClubTwoDetails::getHeatNo, storageBill.getHeatNo())
+                        .and(wrapper -> wrapper.isNull(RollClubTwoDetails::getStackAddr)
+                                .or().eq(RollClubTwoDetails::getStackAddr, ""))
+        );
+
         result.setRollClubTwoDetailsList(rollClubTwoDetailsList);
-        List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(new LambdaQueryWrapper<RollClubThreeDetails>().eq(RollClubThreeDetails::getHeatNo, storageBill.getHeatNo()));
+
+        List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(
+                new LambdaQueryWrapper<RollClubThreeDetails>()
+                        .eq(RollClubThreeDetails::getHeatNo, storageBill.getHeatNo())
+                        .and(wrapper -> wrapper.isNull(RollClubThreeDetails::getStackAddr)
+                                .or().eq(RollClubThreeDetails::getStackAddr, ""))
+        );
         result.setRollClubThreeDetailsList(rollClubThreeDetailsList);
-        List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(new LambdaQueryWrapper<RollOutShippDetails>().eq(RollOutShippDetails::getHeatNo, storageBill.getHeatNo()));
+
+        List<RollOutShippDetails> rollOutShippDetailsList = rollOutShippDetailsService.list(
+                new LambdaQueryWrapper<RollOutShippDetails>()
+                        .eq(RollOutShippDetails::getHeatNo, storageBill.getHeatNo())
+                        .and(wrapper -> wrapper.isNull(RollOutShippDetails::getStackAddr)
+                                .or().eq(RollOutShippDetails::getStackAddr, "")));
+
         result.setRollOutShippDetailsList(rollOutShippDetailsList);
         result.setRollHeightDetails(Collections.emptyList());