棒一称重数据返回去除炉号参数验证

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/service/impl/BilletSendRecordServiceImpl.java

@@ -64,8 +64,8 @@ public class BilletSendRecordServiceImpl extends ServiceImpl<BilletSendRecordMap
     @Override
     public BilletQueryVO getBilletQueryVO(BilletQueryDTO queryDTO) {
         // 参数校验
-        if (oConvertUtils.isEmpty(queryDTO.getHeatNo()) || oConvertUtils.isEmpty(queryDTO.getStrandNo())) {
-            throw new IllegalArgumentException("参数异常：炉号和流号不能为空！");
+        if (oConvertUtils.isEmpty(queryDTO.getStrandNo())) {
+            throw new IllegalArgumentException("参数异常：流号不能为空！");
         }
 
         // 默认表名处理
@@ -75,8 +75,7 @@ public class BilletSendRecordServiceImpl extends ServiceImpl<BilletSendRecordMap
 
         // 构建查询条件
         LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BilletBasicInfo::getHeatNo, queryDTO.getHeatNo())
-                .eq(BilletBasicInfo::getStrandNo, queryDTO.getStrandNo())
+        queryWrapper.eq(BilletBasicInfo::getStrandNo, queryDTO.getStrandNo())
                 .eq(BilletBasicInfo::getBelongTable, belongTable)
                 .orderByDesc(BilletBasicInfo::getCreateTime)
                 .last("LIMIT 1");
@@ -85,7 +84,7 @@ public class BilletSendRecordServiceImpl extends ServiceImpl<BilletSendRecordMap
         BilletBasicInfo billetBasicInfo = billetBasicInfoMapper.selectOne(queryWrapper);
 
         if (billetBasicInfo == null) {
-            throw new IllegalStateException("未查询到对应钢坯信息，请确认炉号、流号是否正确！");
+            throw new IllegalStateException("未查询到对应钢坯信息，请确认流号是否正确！");
         }
 
         // 钢种牌号处理
@@ -96,6 +95,7 @@ public class BilletSendRecordServiceImpl extends ServiceImpl<BilletSendRecordMap
         // 构建返回对象
         BilletQueryVO billetQueryVO = new BilletQueryVO();
         billetQueryVO.setBilletNo(billetBasicInfo.getBilletNo());
+        billetQueryVO.setHeatNo(billetBasicInfo.getHeatNo());
         billetQueryVO.setSteelGrade(brandNum);
         billetQueryVO.setLength(billetBasicInfo.getLength());
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/vo/BilletQueryVO.java

@@ -7,6 +7,11 @@ import java.math.BigDecimal;
 @Data
 public class BilletQueryVO {
 
+    /**
+     * 炉号
+     */
+    private String heatNo;
+
     /**
      * 铸坯号
      */

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/carUnit/service/impl/CarUnitServiceImpl.java

@@ -2033,14 +2033,6 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
                         .map(BigDecimal::valueOf)
                         .reduce(BigDecimal.ZERO, BigDecimal::add);
 
-                // 累加总支数与重量
-                rollThreeHeatNo.setTotalAmount(
-                        Optional.ofNullable(rollThreeHeatNo.getTotalAmount()).orElse(0) + heatNoList.size()
-                );
-                rollThreeHeatNo.setTotalWeight(
-                        Optional.ofNullable(rollThreeHeatNo.getTotalWeight()).orElse(BigDecimal.ZERO).add(heatWeight)
-                );
-
                 // 获取 billetNo 列表（不去重）
                 List<String> billetNoList = heatNoList.stream()
                         .map(RollClubThreeDetails::getBilletNo)
@@ -2052,6 +2044,14 @@ public class CarUnitServiceImpl extends ServiceImpl<CarUnitMapper, CarUnit> impl
 
                 if (billetNoList.isEmpty()) continue;
 
+                // 累加总支数与重量
+                rollThreeHeatNo.setTotalAmount(
+                        Optional.ofNullable(rollThreeHeatNo.getTotalAmount()).orElse(0) + billetNoList.size()
+                );
+                rollThreeHeatNo.setTotalWeight(
+                        Optional.ofNullable(rollThreeHeatNo.getTotalWeight()).orElse(BigDecimal.ZERO).add(heatWeight)
+                );
+
                 // 统计 billetNo 出现次数
                 Map<String, Long> billetNoCountMap = billetNoList.stream()
                         .collect(Collectors.groupingBy(Function.identity(), Collectors.counting()));