update

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

@@ -812,7 +812,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             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();
@@ -999,8 +998,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     String ccmNoForGroup = group.isEmpty() ? null : group.get(0).getCcmNo();
                     return new DestinationStatisticsDetails(size, totalNums, finalBlankOutput, ccmNoForGroup);
                 }).collect(Collectors.toList());
-
-        log.info("{}{}", "钢坯热装单班统计查询结果：", JSON.toJSON(mergedList));
         onDutyStatistics.setCounts(totalNumsAll);
         onDutyStatistics.setBlankOutputs(totalBlankOutputsAll);
         onDutyStatistics.setStatisticsDetailsList(mergedList);
@@ -1381,11 +1378,9 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
     @Override
     public OnDutyInfo queryOnDutyInfoHandle(String ccmNo, String changeShiftId) {
-        log.info("{}{}", "查询当班信息开始！", ccmNo + "开始时间："+new Date());
 
         OnDutyInfo onDutyInfo = new OnDutyInfo();
 
-
         String shiftGroup = "";
         String shift = "";
         BilletHotsendChangeShift billetHotsendChangeShift;
@@ -1402,7 +1397,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .last("limit 1");
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询当班信息失败，交班记录为空！", ccmNo+"失败时间："+new Date());
                 return onDutyInfo;
             }
         }else {
@@ -1411,7 +1405,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询历史当班信息失败，交班记录为空！", ccmNo+"失败时间："+new Date());
                 return onDutyInfo;
             }
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
@@ -1467,7 +1460,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .last("limit 1");
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询当班行车吊运信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
                 return onDutyLiftingBillInfo;
             }
         }else {
@@ -1476,7 +1468,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询当班历史行车吊运信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
                 return onDutyLiftingBillInfo;
             }
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
@@ -1536,7 +1527,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 .eq(BilletLiftingBill::getLiftingType, liftingType);
         if ("2".equals(liftingType)){
             // 堆垛只统计起垛的数据，下垛的数据不统计
-            log.info("{}{}", "堆垛只统计起垛的数据，下垛的数据不统计！", new Date());
             queryWrapper.eq(BilletLiftingBill::getBelongType, "2");
         }
         if(oConvertUtils.isEmpty(changeShiftId)){
@@ -1590,7 +1580,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .last("limit 1");
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询当班正在装运信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
                 return onDutyStorageBill;
             }
         }else {
@@ -1599,7 +1588,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询历史当班装运单信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
                 return onDutyStorageBill;
             }
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
@@ -1707,7 +1695,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .last("limit 1");
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询当班装运单信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
                 return onDutyStorageBillStatistics;
             }
         }else {
@@ -1716,7 +1703,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询历史当班装运单信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
                 return onDutyStorageBillStatistics;
             }
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
@@ -1881,7 +1867,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .last("limit 1");
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("查询当班明细信息失败，交班记录为空！{} 失败时间：{}", ccmNo, new Date());
                 return onDutyDetailStatistics;
             }
         }else {
@@ -1890,7 +1875,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("查询历史当班明细信息失败，交班记录为空！{} 失败时间：{}", ccmNo, new Date());
                 return onDutyDetailStatistics;
             }
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
@@ -2206,7 +2190,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                     .last("limit 1");
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询当班定尺明细，明细记录为空！", ccmNo + "失败时间：" + new Date());
                 return list;
             }
         }else {
@@ -2215,7 +2198,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询历史班次定尺明细，明细记录为空！", ccmNo + "失败时间：" + new Date());
                 return list;
             }
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
@@ -2546,7 +2528,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                 queryWrapper3.eq(RollClubThreeDetails::getCcmNo, ccmNo).eq(RollClubThreeDetails::getStorageBillId, storageBill.getId());
                 List<RollClubThreeDetails> rollClubThreeDetailsList = rollClubThreeDetailsService.list(queryWrapper3);
                 if (oConvertUtils.listIsNotEmpty(rollClubThreeDetailsList)) {
-                    log.info("{}{}", "装运单对应的棒三明细总数:", rollClubThreeDetailsList.size());
                     rollClubThreeDetailsListAll.addAll(rollClubThreeDetailsList);
                 }
             }
@@ -2697,7 +2678,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper.eq(BilletHotsendChangeShift::getId, changeShiftId).eq(BilletHotsendChangeShift::getCcmNo, ccmNo);
             billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
             if (billetHotsendChangeShift == null){
-                log.info("{}{}", "查询历史班次定尺明细，明细记录为空！", ccmNo + "失败时间：" + new Date());
                 return list;
             }
             shiftGroup = billetHotsendChangeShift.getShiftGroup();
@@ -6866,7 +6846,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
         List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
         if (oConvertUtils.listIsEmpty(storageBillList)){
-            log.info("{}{}", "查询当班装运单信息为空！", ccmNo);
             return onDutyHotChargeVo;
         }
         List<RollClubTwoDetails> rollClubTwoList = new ArrayList<>();
@@ -6977,7 +6956,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
 
         List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
         if (oConvertUtils.listIsEmpty(storageBillList)){
-            log.info("{}{}", "查询当班装运单信息为空！", ccmNo);
             return onDutyColdChargeVo;
         }
         List<RollClubTwoDetails> rollClubTwoList = new ArrayList<>();
@@ -6992,9 +6970,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
                         .isNotNull(RollClubTwoDetails::getStackAddr) // stackAddr 不能为 NULL
                         .ne(RollClubTwoDetails::getStackAddr, ""); // stackAddr 不能是空字符串
                 List<RollClubTwoDetails> rollClubTwoDetailsList = rollClubTwoDetailsService.list(queryWrapper3);
-
                 rollClubTwoList.addAll(rollClubTwoDetailsList);
-
             }
 
             if ("棒三".equals(storageBill.getDestination())) {
@@ -7102,9 +7078,6 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
             queryWrapper2.between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), billetHotsendChangeShift.getChangeShiftTime());
         }
         List<StorageBill> storageBillList = baseMapper.selectList(queryWrapper2);
-        if (oConvertUtils.listIsEmpty(storageBillList)){
-            log.info("{}{}", "查询当班装运单信息为空！", ccmNo);
-        }
 
         List<SizeSummary> rollClubOneList = new ArrayList<>();
         List<SizeSummary> rollClubTwoList = new ArrayList<>();