Przeglądaj źródła

增加棒三、上若工作台数据展示

lingpeng.li 2 miesięcy temu
rodzic
commit
61a27a601c

+ 10 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/controller/RollClubThreeDetailsController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeDetailsService;
+import org.jeecg.modules.billet.storageBill.vo.RollOnDutyDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -159,4 +160,13 @@ public class RollClubThreeDetailsController extends JeecgController<RollClubThre
         return super.importExcel(request, response, RollClubThreeDetails.class);
     }
 
+
+	 @ApiOperation(value = "轧钢棒三工作台信息", notes = "轧钢棒三工作台信息")
+	 @GetMapping(value = "/rollClubThreeWorkbenches")
+	 public Result<RollOnDutyDataVo> rollClubThreeWorkbenches(@RequestParam(name = "ccmNo") String ccmNo) {
+
+		 RollOnDutyDataVo rollOnDutyVo = rollClubThreeDetailsService.queryOnDutyRecord(ccmNo);
+		 return Result.OK(rollOnDutyVo);
+	 }
+
 }

+ 3 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollClubThree/service/IRollClubThreeDetailsService.java

@@ -3,6 +3,7 @@ package org.jeecg.modules.billet.rollClubThree.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
+import org.jeecg.modules.billet.storageBill.vo.RollOnDutyDataVo;
 
 /**
  * @Description: 棒三明细信息
@@ -12,4 +13,6 @@ import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
  */
 public interface IRollClubThreeDetailsService extends IService<RollClubThreeDetails> {
 
+    RollOnDutyDataVo queryOnDutyRecord(String ccmNo);
+
 }

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

@@ -1,19 +1,174 @@
 package org.jeecg.modules.billet.rollClubThree.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
+import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
 import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.rollClubThree.mapper.RollClubThreeDetailsMapper;
 import org.jeecg.modules.billet.rollClubThree.service.IRollClubThreeDetailsService;
+import org.jeecg.modules.billet.storageBill.entity.StorageBill;
+import org.jeecg.modules.billet.storageBill.mapper.StorageBillMapper;
+import org.jeecg.modules.billet.storageBill.vo.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @Description: 棒三明细信息
  * @Author: jeecg-boot
  * @Date:   2024-11-20
  * @Version: V1.0
  */
+
+@Slf4j
 @Service
 public class RollClubThreeDetailsServiceImpl extends ServiceImpl<RollClubThreeDetailsMapper, RollClubThreeDetails> implements IRollClubThreeDetailsService {
 
+
+    @Autowired
+    private IBilletHotsendChangeShiftService billetHotsendChangeShiftService;
+
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    @Autowired
+    private StorageBillMapper storageBillMapper;
+
+    @Override
+    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo) {
+        RollOnDutyDataVo rollOnDutyVo = new RollOnDutyDataVo();
+
+        // 1. 从 Redis 获取班次信息
+        String shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
+        String shift = getShiftInfo(ccmNo, "class:shift:%s");
+
+        // 2. 获取交班记录
+        LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
+                .eq(BilletHotsendChangeShift::getShift, shift)
+                .eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
+                .isNull(BilletHotsendChangeShift::getChangeShiftTime)
+                .orderByDesc(BilletHotsendChangeShift::getCreateTime)
+                .last("limit 1");
+
+        BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
+        if (billetHotsendChangeShift == null) {
+            log.info("{}{}", "查询当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
+            return rollOnDutyVo;
+        }
+
+        // 3. 查询当班装运单信息
+        LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+        billQueryWrapper.eq(StorageBill::getCcmNo, ccmNo)
+                .eq(StorageBill::getDestination,"棒三")
+                .gt(StorageBill::getAmountTotal, 0)
+                .between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
+        List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
+        if (oConvertUtils.listIsEmpty(storageBillList)) {
+            log.info("{}{}", "查询当班装运单信息为空!", ccmNo);
+            return rollOnDutyVo;
+        }
+
+        // 4. 查询棒三明细数据
+        List<String> billIds = storageBillList.stream().map(StorageBill::getId).collect(Collectors.toList());
+        List<RollClubThreeDetails> rollClubThreeDetailsList = Collections.emptyList();
+
+        if (!billIds.isEmpty()) {
+            LambdaQueryWrapper<RollClubThreeDetails> rollClubQuery = new LambdaQueryWrapper<>();
+            rollClubQuery.eq(RollClubThreeDetails::getCcmNo, ccmNo)
+                    .in(RollClubThreeDetails::getStorageBillId, billIds);
+            rollClubThreeDetailsList = baseMapper.selectList(rollClubQuery);
+        }
+
+        // 5. 组装 RecordVoList 和 DetailVoList
+        List<RollOnDutyRecordVo> recordVoList = storageBillList.stream()
+                .map(storageBill -> {
+                    RollOnDutyRecordVo vo = new RollOnDutyRecordVo();
+                    BeanUtils.copyProperties(storageBill, vo);
+                    vo.setStorageBillId(storageBill.getId());
+                    return vo;
+                }).collect(Collectors.toList());
+
+        List<RollOnDutyDetailVo> detailVoList = rollClubThreeDetailsList.stream()
+                .map(details -> {
+                    RollOnDutyDetailVo detailVo = new RollOnDutyDetailVo();
+                    BeanUtils.copyProperties(details, detailVo);
+                    return detailVo;
+                }).collect(Collectors.toList());
+
+        // 6. 查询 Info 数据
+        LambdaQueryWrapper<RollClubThreeDetails> infoQueryWrapper = new LambdaQueryWrapper<>();
+        infoQueryWrapper.eq(RollClubThreeDetails::getCcmNo, ccmNo)
+                .eq(RollClubThreeDetails::getShift, shift)
+                .eq(RollClubThreeDetails::getShiftGroup, shiftGroup)
+                .between(RollClubThreeDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
+        List<RollOnDutyInfoVo> infoVoList = baseMapper.selectList(infoQueryWrapper).stream()
+                .map(details -> {
+                    RollOnDutyInfoVo infoVo = new RollOnDutyInfoVo();
+                    BeanUtils.copyProperties(details, infoVo);
+                    return infoVo;
+                }).collect(Collectors.toList());
+
+        // 7. 计算历史数据统计
+        LambdaQueryWrapper<RollClubThreeDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
+        historyQueryWrapper.eq(RollClubThreeDetails::getCcmNo, ccmNo);
+
+        List<RollClubThreeDetails> rollClubThreeHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
+        List<RollHistoryDetailVo> historyDetailList = rollClubThreeHistoryDetailsList.stream()
+                .collect(Collectors.groupingBy(RollClubThreeDetails::getSize))
+                .entrySet().stream()
+                .map(entry -> {
+                    String size = entry.getKey();
+                    List<RollClubThreeDetails> detailsList = entry.getValue();
+
+                    int totalCount = detailsList.stream()
+                            .mapToInt(detail -> (detail.getStackAddr() == null || detail.getStackAddr().isEmpty()) ? 1 : 4)
+                            .sum();
+
+                    BigDecimal totalBlankOutput = detailsList.stream()
+                            .map(detail -> BigDecimal.valueOf(detail.getBlankOutput()))
+                            .reduce(BigDecimal.ZERO, BigDecimal::add)
+                            .setScale(4, BigDecimal.ROUND_HALF_UP);
+
+                    RollHistoryDetailVo rollHistoryDetailVo = new RollHistoryDetailVo();
+                    rollHistoryDetailVo.setSize(size);
+                    rollHistoryDetailVo.setAmountTotal(totalCount);
+                    rollHistoryDetailVo.setBlankOutput(totalBlankOutput);
+                    return rollHistoryDetailVo;
+                }).collect(Collectors.toList());
+
+        // 8. 组装最终对象
+        rollOnDutyVo.setRollOnDutyRecordList(recordVoList);
+        rollOnDutyVo.setRollOnDutyDetailList(detailVoList);
+        rollOnDutyVo.setRollOnDutyInfoList(infoVoList);
+        rollOnDutyVo.setRollHistoryDetailList(historyDetailList);
+
+        return rollOnDutyVo;
+    }
+
+
+    /**
+     * 从Redis中获取班组班别
+     *
+     * @param ccmNo
+     * @param keyFormat
+     * @return
+     */
+    private String getShiftInfo(String ccmNo, String keyFormat) {
+        String key = String.format(keyFormat, ccmNo);
+        return oConvertUtils.getString(redisTemplate.opsForValue().get(key));
+    }
 }

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

@@ -12,7 +12,6 @@ import org.jeecg.modules.billet.rollClubTwo.mapper.RollClubTwoDetailsMapper;
 import org.jeecg.modules.billet.rollClubTwo.service.IRollClubTwoDetailsService;
 import org.jeecg.modules.billet.storageBill.entity.StorageBill;
 import org.jeecg.modules.billet.storageBill.mapper.StorageBillMapper;
-import org.jeecg.modules.billet.storageBill.service.IStorageBillService;
 import org.jeecg.modules.billet.storageBill.vo.*;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,7 +19,9 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.util.*;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
 import java.util.stream.Collectors;
 
 /**
@@ -69,6 +70,7 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
         // 3. 查询当班装运单信息
         LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
         billQueryWrapper.eq(StorageBill::getCcmNo, ccmNo)
+                .eq(StorageBill::getDestination,"棒二")
                 .gt(StorageBill::getAmountTotal, 0)
                 .between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
 
@@ -157,7 +159,6 @@ public class RollClubTwoDetailsServiceImpl extends ServiceImpl<RollClubTwoDetail
     }
 
 
-
     /**
      * 从Redis中获取班组班别
      *

+ 8 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/controller/RollOutShippDetailsController.java

@@ -13,6 +13,7 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
 import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
+import org.jeecg.modules.billet.storageBill.vo.RollOnDutyDataVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
@@ -159,4 +160,11 @@ public class RollOutShippDetailsController extends JeecgController<RollOutShippD
         return super.importExcel(request, response, RollOutShippDetails.class);
     }
 
+	 @ApiOperation(value = "轧钢外运工作台信息", notes = "轧钢外运工作台信息")
+	 @GetMapping(value = "/rollOutShippWorkbenches")
+	 public Result<RollOnDutyDataVo> rollOutShippWorkbenches(@RequestParam(name = "ccmNo") String ccmNo) {
+
+		 RollOnDutyDataVo rollOnDutyVo = rollOutShippDetailsService.queryOnDutyRecord(ccmNo);
+		 return Result.OK(rollOnDutyVo);
+	 }
 }

+ 3 - 0
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollOutShipp/service/IRollOutShippDetailsService.java

@@ -2,6 +2,7 @@ package org.jeecg.modules.billet.rollOutShipp.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
+import org.jeecg.modules.billet.storageBill.vo.RollOnDutyDataVo;
 
 /**
  * @Description: 上若明细信息
@@ -11,4 +12,6 @@ import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
  */
 public interface IRollOutShippDetailsService extends IService<RollOutShippDetails> {
 
+    RollOnDutyDataVo queryOnDutyRecord(String ccmNo);
+
 }

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

@@ -1,18 +1,173 @@
 package org.jeecg.modules.billet.rollOutShipp.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import lombok.extern.slf4j.Slf4j;
+import org.jeecg.common.util.oConvertUtils;
+import org.jeecg.modules.billet.billetHotsendChangeShift.entity.BilletHotsendChangeShift;
+import org.jeecg.modules.billet.billetHotsendChangeShift.service.IBilletHotsendChangeShiftService;
+import org.jeecg.modules.billet.rollClubThree.entity.RollClubThreeDetails;
 import org.jeecg.modules.billet.rollOutShipp.entity.RollOutShippDetails;
 import org.jeecg.modules.billet.rollOutShipp.mapper.RollOutShippDetailsMapper;
 import org.jeecg.modules.billet.rollOutShipp.service.IRollOutShippDetailsService;
+import org.jeecg.modules.billet.storageBill.entity.StorageBill;
+import org.jeecg.modules.billet.storageBill.mapper.StorageBillMapper;
+import org.jeecg.modules.billet.storageBill.vo.*;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.stereotype.Service;
 
+import java.math.BigDecimal;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.stream.Collectors;
+
 /**
  * @Description: 上若明细信息
  * @Author: jeecg-boot
  * @Date:   2024-11-20
  * @Version: V1.0
  */
+
+@Slf4j
 @Service
 public class RollOutShippDetailsServiceImpl extends ServiceImpl<RollOutShippDetailsMapper, RollOutShippDetails> implements IRollOutShippDetailsService {
 
+    @Autowired
+    private IBilletHotsendChangeShiftService billetHotsendChangeShiftService;
+
+    @Autowired
+    public RedisTemplate redisTemplate;
+
+    @Autowired
+    private StorageBillMapper storageBillMapper;
+
+    @Override
+    public RollOnDutyDataVo queryOnDutyRecord(String ccmNo) {
+        RollOnDutyDataVo rollOnDutyVo = new RollOnDutyDataVo();
+
+        // 1. 从 Redis 获取班次信息
+        String shiftGroup = getShiftInfo(ccmNo, "class:shift:group:%s");
+        String shift = getShiftInfo(ccmNo, "class:shift:%s");
+
+        // 2. 获取交班记录
+        LambdaQueryWrapper<BilletHotsendChangeShift> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BilletHotsendChangeShift::getCcmNo, ccmNo)
+                .eq(BilletHotsendChangeShift::getShift, shift)
+                .eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
+                .isNull(BilletHotsendChangeShift::getChangeShiftTime)
+                .orderByDesc(BilletHotsendChangeShift::getCreateTime)
+                .last("limit 1");
+
+        BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
+        if (billetHotsendChangeShift == null) {
+            log.info("{}{}", "查询当班装运单信息失败,交班记录为空!", ccmNo + "失败时间:" + new Date());
+            return rollOnDutyVo;
+        }
+
+        // 3. 查询当班装运单信息
+        LambdaQueryWrapper<StorageBill> billQueryWrapper = new LambdaQueryWrapper<>();
+        billQueryWrapper.eq(StorageBill::getCcmNo, ccmNo)
+                .eq(StorageBill::getDestination,"上若")
+                .gt(StorageBill::getAmountTotal, 0)
+                .between(StorageBill::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
+        List<StorageBill> storageBillList = storageBillMapper.selectList(billQueryWrapper);
+        if (oConvertUtils.listIsEmpty(storageBillList)) {
+            log.info("{}{}", "查询当班装运单信息为空!", ccmNo);
+            return rollOnDutyVo;
+        }
+
+        // 4. 查询上若明细数据
+        List<String> billIds = storageBillList.stream().map(StorageBill::getId).collect(Collectors.toList());
+        List<RollOutShippDetails> rollOutShippDetailsList = Collections.emptyList();
+
+        if (!billIds.isEmpty()) {
+            LambdaQueryWrapper<RollOutShippDetails> rollClubQuery = new LambdaQueryWrapper<>();
+            rollClubQuery.eq(RollOutShippDetails::getCcmNo, ccmNo)
+                    .in(RollOutShippDetails::getStorageBillId, billIds);
+            rollOutShippDetailsList = baseMapper.selectList(rollClubQuery);
+        }
+
+        // 5. 组装 RecordVoList 和 DetailVoList
+        List<RollOnDutyRecordVo> recordVoList = storageBillList.stream()
+                .map(storageBill -> {
+                    RollOnDutyRecordVo vo = new RollOnDutyRecordVo();
+                    BeanUtils.copyProperties(storageBill, vo);
+                    vo.setStorageBillId(storageBill.getId());
+                    return vo;
+                }).collect(Collectors.toList());
+
+        List<RollOnDutyDetailVo> detailVoList = rollOutShippDetailsList.stream()
+                .map(details -> {
+                    RollOnDutyDetailVo detailVo = new RollOnDutyDetailVo();
+                    BeanUtils.copyProperties(details, detailVo);
+                    return detailVo;
+                }).collect(Collectors.toList());
+
+        // 6. 查询 Info 数据
+        LambdaQueryWrapper<RollOutShippDetails> infoQueryWrapper = new LambdaQueryWrapper<>();
+        infoQueryWrapper.eq(RollOutShippDetails::getCcmNo, ccmNo)
+                .eq(RollOutShippDetails::getShift, shift)
+                .eq(RollOutShippDetails::getShiftGroup, shiftGroup)
+                .between(RollOutShippDetails::getCreateTime, billetHotsendChangeShift.getCreateTime(), new Date());
+
+        List<RollOnDutyInfoVo> infoVoList = baseMapper.selectList(infoQueryWrapper).stream()
+                .map(details -> {
+                    RollOnDutyInfoVo infoVo = new RollOnDutyInfoVo();
+                    BeanUtils.copyProperties(details, infoVo);
+                    return infoVo;
+                }).collect(Collectors.toList());
+
+        // 7. 计算历史数据统计
+        LambdaQueryWrapper<RollOutShippDetails> historyQueryWrapper = new LambdaQueryWrapper<>();
+        historyQueryWrapper.eq(RollOutShippDetails::getCcmNo, ccmNo);
+
+        List<RollOutShippDetails> rollOutShippHistoryDetailsList = baseMapper.selectList(historyQueryWrapper);
+        List<RollHistoryDetailVo> historyDetailList = rollOutShippHistoryDetailsList.stream()
+                .collect(Collectors.groupingBy(RollOutShippDetails::getSize))
+                .entrySet().stream()
+                .map(entry -> {
+                    String size = entry.getKey();
+                    List<RollOutShippDetails> detailsList = entry.getValue();
+
+                    int totalCount = detailsList.stream()
+                            .mapToInt(detail -> (detail.getStackAddr() == null || detail.getStackAddr().isEmpty()) ? 1 : 4)
+                            .sum();
+
+                    BigDecimal totalBlankOutput = detailsList.stream()
+                            .map(detail -> BigDecimal.valueOf(detail.getBlankOutput()))
+                            .reduce(BigDecimal.ZERO, BigDecimal::add)
+                            .setScale(4, BigDecimal.ROUND_HALF_UP);
+
+                    RollHistoryDetailVo rollHistoryDetailVo = new RollHistoryDetailVo();
+                    rollHistoryDetailVo.setSize(size);
+                    rollHistoryDetailVo.setAmountTotal(totalCount);
+                    rollHistoryDetailVo.setBlankOutput(totalBlankOutput);
+                    return rollHistoryDetailVo;
+                }).collect(Collectors.toList());
+
+        // 8. 组装最终对象
+        rollOnDutyVo.setRollOnDutyRecordList(recordVoList);
+        rollOnDutyVo.setRollOnDutyDetailList(detailVoList);
+        rollOnDutyVo.setRollOnDutyInfoList(infoVoList);
+        rollOnDutyVo.setRollHistoryDetailList(historyDetailList);
+
+        return rollOnDutyVo;
+    }
+
+
+    /**
+     * 从Redis中获取班组班别
+     *
+     * @param ccmNo
+     * @param keyFormat
+     * @return
+     */
+    private String getShiftInfo(String ccmNo, String keyFormat) {
+        String key = String.format(keyFormat, ccmNo);
+        return oConvertUtils.getString(redisTemplate.opsForValue().get(key));
+    }
 }

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

@@ -1902,7 +1902,7 @@ public class StorageBillServiceImpl extends ServiceImpl<StorageBillMapper, Stora
         int stackingSum = 0;
         double stackingTotalWeight = 0d;
 
-        // 根据铸机号、班组、班别、时间范围。查询棒二明细表
+        // 根据铸机号、班组、班别、时间范围。查询堆垛明细表
         LambdaQueryWrapper<StackingUpLog> stackingUpLogQueryWrapper = new LambdaQueryWrapper<>();
         stackingUpLogQueryWrapper.eq(StackingUpLog::getCcmNo, ccmNo);
         // 检查 billetHotsendChangeShift 是否为空