棒线工作台根据日期显示总接收明细信息统一根据装运单id去查询

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/service/impl/RollClubThreeDetailsServiceImpl.java

@@ -141,8 +141,14 @@ public class RollClubThreeDetailsServiceImpl extends ServiceImpl<RollClubThreeDe
     @Override
     public RollChargeDetailsVO queryWorkbenchesDetail(RollDetailQueryDTO queryDTO) {
 
-        LambdaQueryWrapper<RollClubThreeDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
-        historyQueryWrapper.eq(RollClubThreeDetails::getCcmNo, queryDTO.getCcmNo());
+        RollChargeDetailsVO rollChargeDetailsVO = new RollChargeDetailsVO();
+
+        LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+
+        billQueryWrapper.eq(StorageBill::getCcmNo, queryDTO.getCcmNo())
+                .eq(StorageBill::getDestination, "棒三")
+                .gt(StorageBill::getAmountTotal, 0);
+
 
         Date beginDate = queryDTO.getBeginCreateDate();
         Date endDate = queryDTO.getEndCreateDate();
@@ -155,15 +161,32 @@ public class RollClubThreeDetailsServiceImpl extends ServiceImpl<RollClubThreeDe
 
         // 处理 beginCreateDate
         if (beginDate != null) {
-            historyQueryWrapper.ge(RollClubThreeDetails::getCreateTime, DateUtils.getStartOfDayByDate(beginDate));
+            billQueryWrapper.ge(StorageBill::getCreateTime, DateUtils.getStartOfDayByDate(beginDate));
         }
 
         // 处理 endCreateDate
         if (endDate != null) {
-            historyQueryWrapper.le(RollClubThreeDetails::getCreateTime, DateUtils.getEndOfDayByDate(endDate));
+            billQueryWrapper.le(StorageBill::getCreateTime, DateUtils.getEndOfDayByDate(endDate));
+        }
+
+
+        List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
+
+        if (oConvertUtils.listIsEmpty(storageBillList)) {
+            return  rollChargeDetailsVO;
+        }
+
+        List<String> billIds = storageBillList.stream().map(StorageBill::getId).collect(Collectors.toList());
+        List<RollClubThreeDetails> rollClubHistoryDetailsList = Collections.emptyList();
+        LambdaQueryWrapper<RollClubThreeDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
+
+
+        if (!billIds.isEmpty()) {
+            historyQueryWrapper.eq(RollClubThreeDetails::getCcmNo, queryDTO.getCcmNo())
+                    .in(RollClubThreeDetails::getStorageBillId, billIds);
+            rollClubHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
         }
 
-        List<RollClubThreeDetails> rollClubHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
 
         // 计算总支数
         int totalCount = rollClubHistoryDetailsList.stream()
@@ -176,8 +199,6 @@ public class RollClubThreeDetailsServiceImpl extends ServiceImpl<RollClubThreeDe
                 .reduce(BigDecimal.ZERO, BigDecimal::add)
                 .setScale(4, BigDecimal.ROUND_HALF_UP);
 
-        // 创建 VO 并赋值
-        RollChargeDetailsVO rollChargeDetailsVO = new RollChargeDetailsVO();
         rollChargeDetailsVO.setAmountTotal(totalCount);
         rollChargeDetailsVO.setTotalWeight(totalWeight);
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubTwo/service/impl/RollClubTwoDetailsServiceImpl.java

@@ -138,8 +138,14 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
     @Override
     public RollChargeDetailsVO queryWorkbenchesDetail(RollDetailQueryDTO queryDTO) {
 
-        LambdaQueryWrapper<RollClubTwoDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
-        historyQueryWrapper.eq(RollClubTwoDetails::getCcmNo, queryDTO.getCcmNo());
+        RollChargeDetailsVO rollChargeDetailsVO = new RollChargeDetailsVO();
+
+        LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+
+        billQueryWrapper.eq(StorageBill::getCcmNo, queryDTO.getCcmNo())
+                .eq(StorageBill::getDestination, "棒二")
+                .gt(StorageBill::getAmountTotal, 0);
+
 
         Date beginDate = queryDTO.getBeginCreateDate();
         Date endDate = queryDTO.getEndCreateDate();
@@ -152,15 +158,33 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
 
         // 处理 beginCreateDate
         if (beginDate != null) {
-            historyQueryWrapper.ge(RollClubTwoDetails::getCreateTime, DateUtils.getStartOfDayByDate(beginDate));
+            billQueryWrapper.ge(StorageBill::getCreateTime, DateUtils.getStartOfDayByDate(beginDate));
         }
 
         // 处理 endCreateDate
         if (endDate != null) {
-            historyQueryWrapper.le(RollClubTwoDetails::getCreateTime, DateUtils.getEndOfDayByDate(endDate));
+            billQueryWrapper.le(StorageBill::getCreateTime, DateUtils.getEndOfDayByDate(endDate));
         }
 
-        List<RollClubTwoDetails> rollClubHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
+
+        List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
+
+        if (oConvertUtils.listIsEmpty(storageBillList)) {
+           return  rollChargeDetailsVO;
+        }
+
+        // 4. 查询棒二明细数据
+        List<String> billIds = storageBillList.stream().map(StorageBill::getId).collect(Collectors.toList());
+
+        LambdaQueryWrapper<RollClubTwoDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
+
+        List<RollClubTwoDetails> rollClubHistoryDetailsList = Collections.emptyList();
+
+        if (!billIds.isEmpty()) {
+            historyQueryWrapper.eq(RollClubTwoDetails::getCcmNo, queryDTO.getCcmNo())
+                    .in(RollClubTwoDetails::getStorageBillId, billIds);
+            rollClubHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
+        }
 
         // 计算总支数
         int totalCount = rollClubHistoryDetailsList.stream()
@@ -173,8 +197,7 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
                 .reduce(BigDecimal.ZERO, BigDecimal::add)
                 .setScale(4, BigDecimal.ROUND_HALF_UP);
 
-        // 创建 VO 并赋值
-        RollChargeDetailsVO rollChargeDetailsVO = new RollChargeDetailsVO();
+
         rollChargeDetailsVO.setAmountTotal(totalCount);
         rollChargeDetailsVO.setTotalWeight(totalWeight);
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/service/impl/RollOutShippDetailsServiceImpl.java

@@ -139,8 +139,14 @@ public class RollOutShippDetailsServiceImpl extends ServiceImpl<RollOutShippDeta
     @Override
     public RollChargeDetailsVO queryWorkbenchesDetail(RollDetailQueryDTO queryDTO) {
 
-        LambdaQueryWrapper<RollOutShippDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
-        historyQueryWrapper.eq(RollOutShippDetails::getCcmNo, queryDTO.getCcmNo());
+        RollChargeDetailsVO rollChargeDetailsVO = new RollChargeDetailsVO();
+
+        LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+
+        billQueryWrapper.eq(StorageBill::getCcmNo, queryDTO.getCcmNo())
+                .eq(StorageBill::getDestination, "上若")
+                .gt(StorageBill::getAmountTotal, 0);
+
 
         Date beginDate = queryDTO.getBeginCreateDate();
         Date endDate = queryDTO.getEndCreateDate();
@@ -153,15 +159,29 @@ public class RollOutShippDetailsServiceImpl extends ServiceImpl<RollOutShippDeta
 
         // 处理 beginCreateDate
         if (beginDate != null) {
-            historyQueryWrapper.ge(RollOutShippDetails::getCreateTime, DateUtils.getStartOfDayByDate(beginDate));
+            billQueryWrapper.ge(StorageBill::getCreateTime, DateUtils.getStartOfDayByDate(beginDate));
         }
 
         // 处理 endCreateDate
         if (endDate != null) {
-            historyQueryWrapper.le(RollOutShippDetails::getCreateTime, DateUtils.getEndOfDayByDate(endDate));
+            billQueryWrapper.le(StorageBill::getCreateTime, DateUtils.getEndOfDayByDate(endDate));
+        }
+
+        List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
+
+        if (oConvertUtils.listIsEmpty(storageBillList)) {
+            return  rollChargeDetailsVO;
         }
 
-        List<RollOutShippDetails> rollClubHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
+        List<String> billIds = storageBillList.stream().map(StorageBill::getId).collect(Collectors.toList());
+        LambdaQueryWrapper<RollOutShippDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
+        List<RollOutShippDetails> rollClubHistoryDetailsList = Collections.emptyList();
+
+        if (!billIds.isEmpty()) {
+            historyQueryWrapper.eq(RollOutShippDetails::getCcmNo, queryDTO.getCcmNo())
+                    .in(RollOutShippDetails::getStorageBillId, billIds);
+            rollClubHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
+        }
 
         // 计算总支数
         int totalCount = rollClubHistoryDetailsList.stream()
@@ -174,8 +194,6 @@ public class RollOutShippDetailsServiceImpl extends ServiceImpl<RollOutShippDeta
                 .reduce(BigDecimal.ZERO, BigDecimal::add)
                 .setScale(4, BigDecimal.ROUND_HALF_UP);
 
-        // 创建 VO 并赋值
-        RollChargeDetailsVO rollChargeDetailsVO = new RollChargeDetailsVO();
         rollChargeDetailsVO.setAmountTotal(totalCount);
         rollChargeDetailsVO.setTotalWeight(totalWeight);