确认出坯量接口增加确认状态

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/controller/BilletOriginalProductRecordController.java

@@ -1485,6 +1485,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		UpdateWrapper<BilletOriginalProductRecord> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.eq("id", one.getId());
 		updateWrapper.set("blank_output", editDTO.getBlankOutput());
+		updateWrapper.set("blank_output_confirmed", 1); // 设置已确认
 
 		billetOriginalProductRecordService.update(updateWrapper);
 

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/billetOriginalProductRecord/entity/BilletOriginalProductRecord.java

@@ -251,4 +251,8 @@ public class BilletOriginalProductRecord implements Serializable {
     @Excel(name = "冷坯本炉终止根", width = 15)
     @ApiModelProperty(value = "冷坯本炉终止根")
     private Integer endPosition;
+
+    @Excel(name = "出坯量是否确认", width = 15)
+    @ApiModelProperty(value = "出坯量是否确认（0-未确认，1-已确认）")
+    private Integer blankOutputConfirmed;
 }

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/rollHeight/service/impl/RollHeightServiceImpl.java

@@ -259,6 +259,7 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
     public List<RollHeightVO> rollHeightList(RollHeightQueryDTO queryDTO) {
         // 2. 遍历所有炉号，构建最终返回列表
         List<RollHeightVO> resultList = new ArrayList<>();
+        List<RollHeightVO> resultList3 = new ArrayList<>();
         LambdaQueryWrapper<BilletOriginalProductRecord> oneQueryWrapper = new LambdaQueryWrapper<>();
         oneQueryWrapper.eq(BilletOriginalProductRecord::getCcmNo, queryDTO.getCcmNo());
         Boolean search = true; // 定义未传任何条件
@@ -331,19 +332,21 @@ public class RollHeightServiceImpl extends ServiceImpl<RollHeightMapper, RollHei
         } else if (oConvertUtils.isNotEmpty(queryDTO.getHotCold()) && queryDTO.getHotCold().equals("cold")) { // 冷
             // 冷
             coldRollHeightMap = buildColdRollHeightHeatNoMap(list); // 根据步进冷床，高线明细构建
+            resultList3 = handleAppointColdBillet(list);   // 根据冷坯单构建
         } else{
             // 热
             rollHeightMap = buildRollHeightHeatNoMap(list); // 根据高线明细构建
             // 冷
             coldRollHeightMap = buildColdRollHeightHeatNoMap(list); // 根据步进冷床，高线明细构建
+
+            resultList3 = handleAppointColdBillet(list);    // 根据冷坯单构建
         }
 
         List<RollHeightVO> resultList1 = handleRollHeightMap(rollHeightMap);
 
         List<RollHeightVO> resultList2 = handleRollHeightMap(coldRollHeightMap);
 
-        List<RollHeightVO> resultList3 = handleAppointColdBillet(list);
-        // 使用 Stream.concat() 合并两个列表
+        // 使用 Stream.concat() 合并三个列表
         resultList = Stream.concat(
                 Stream.concat(resultList1.stream(), resultList2.stream()),
                 resultList3.stream()