高线逻辑添加、查询所有堆垛支数问题修复

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

@@ -825,9 +825,9 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 heatsActualsInfo.setEightLength(JSON.toJSONString(groupByLength(strandEightData)));
 			 heatsActualsInfo.setEightSum(strandEightData.size());
 
-			 // 直轧过滤并计算
+			 // 5#直轧棒一、6#热送高线 过滤并计算
 			 List<BilletBasicInfo> filterDirectRollingList = billetBasicInfoList.stream()
-					 .filter(info -> "roll_club_one".equals(info.getBelongTable()))
+					 .filter(info -> "roll_club_one".equals(info.getBelongTable()) || "roll_height".equals(info.getBelongTable()))
 					 .collect(Collectors.toList());
 			 if (oConvertUtils.listIsNotEmpty(filterDirectRollingList)){
 				 // 计算总重（保留4位小数）
@@ -952,6 +952,11 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 												 .filter(billet -> "roll_club_three".equals(billet.getBelongTable()))
 												 .count();
 										 groupResult.put("rollClubThreeCount", (int) rollClubThreeCount);
+										 // 高线统计
+										 long rollHeightCount = list.stream()
+												 .filter(billet -> "roll_height".equals(billet.getBelongTable()))
+												 .count();
+										 groupResult.put("rollHeightCount", (int) rollHeightCount);
 										 // 堆垛统计
 										 long stackingAndLoadingVehiclesCount = list.stream()
 												 .filter(billet -> "stacking_and_loading_vehicles".equals(billet.getBelongTable()))
@@ -1143,7 +1148,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 
 				 // 添加明细项
 				 JSONObject detail = new JSONObject();
-				 detail.put("stackingCount", sizeCount);
+				 detail.put("stackingCount", sizeCount * 4);
 				 detail.put("stackingLength", size);
 				 detail.put("stackingWeight", sizeTotalWeight.toString());
 				 detailsArray.add(detail);
@@ -1152,7 +1157,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 // 构建结果项
 			 Map<String, Object> resultItem = new LinkedHashMap<>();
 			 resultItem.put("heatNo", heatNo);
-			 resultItem.put("totalCount", totalCount);
+			 resultItem.put("totalCount", totalCount * 4);
 			 resultItem.put("totalWeight", totalWeight.setScale(4, RoundingMode.HALF_UP).toString());
 			 resultItem.put("details", detailsArray);
 
@@ -1272,7 +1277,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 return finalResult;
 	 }
 
-	 @ApiOperation(value="钢坯棒一棒二棒三上若统计明细查询", notes="钢坯棒一棒二棒三上若统计明细查询")
+	 @ApiOperation(value="钢坯棒一棒二棒三上若高线统计明细查询", notes="钢坯棒一棒二棒三上若统计明细查询")
 	 @GetMapping(value = "/queryBilletStatisticsDetailByCcmNo")
 	 public Result<List<BilletDetailsInfo>> queryBilletStatisticsDetailByCcmNo(@RequestParam(name="ccmNo") String ccmNo,
 																	 		   @RequestParam(name="changeShiftId", required = false, defaultValue = "") String changeShiftId,
@@ -1286,8 +1291,8 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 																			   @RequestParam(name = "brandNum", required = false, defaultValue = "") String brandNum,
 																			   @RequestParam(name="licensePlate", required = false, defaultValue = "") String licensePlate) {
 		 List<BilletDetailsInfo> billetDetailsInfoList = new ArrayList<>();
-		 if (queryType.equals("1")){
-			 // 查询棒一，指定日期的统计明细
+		 if (queryType.equals("1") || queryType.equals("5")){
+			 // 查询5号机棒一、6号机高线，指定日期的统计明细
 			 billetDetailsInfoList = queryRollClubOneStatistics(ccmNo,  changeShiftId, queryDate, heatNo, startTime, endTime);
 		 }else if(queryType.equals("2")){ // 查询棒二，指定班次的统计明细
 			 billetDetailsInfoList = querSstorageBillPrintStatistics(ccmNo, "棒二", queryDate, changeShiftId, heatNo, licensePlate, startTime, endTime, size, btype, brandNum);
@@ -1339,7 +1344,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 return Result.OK(billetOriginalInfo);
 		 }
 		 String directRollingJson = calculateDirectRollingStatistics(billetOriginalProductRecordList);
-		 // 统计直轧棒一
+		 // 统计5#直轧棒一、6#热送高线
 		 billetOriginalInfo.setDirectRolling(directRollingJson);
 
 		 // 根据铸机号、开始时间、结束时间查询查询装运单打印表
@@ -1380,7 +1385,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 			 // 处理堆垛所有定尺字段
 			 processStackLength(y.getStackLength(), lengthCountMap);
 
-			 // 处理棒一所有定尺字段
+			 // 处理5#棒一、6#热送高线 所有定尺字段
 			 processRollClubOneDetails(y.getRollClubOneDetails(), lengthCountMap);
 
 			 y.setLengthDetails(JSON.toJSONString(lengthCountMap));
@@ -1393,7 +1398,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 		 return Result.OK(billetOriginalInfo);
 	 }
 	 /**
-	  * 计算直轧棒一的统计信息
+	  * 计算5#直轧棒一、6#高线的统计信息
 	  */
 	 private String calculateDirectRollingStatistics(List<BilletOriginalProductRecord> records) {
 		 // 用于存储统计结果的Map，键为定尺，值为数量和重量
@@ -1418,7 +1423,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 						 }
 					 }
 				 } catch (Exception e) {
-					 log.error("解析rollClubOneDetails失败: {}", rollClubOneDetails, e);
+					 log.error("解析rollClubOneDetails、rollHeightDetails失败: {}", rollClubOneDetails, e);
 					 // 忽略解析失败的记录，继续处理其他记录
 				 }
 			 }
@@ -1705,7 +1710,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 	 }
 
 	 /**
-	  * 棒一统计明细查询
+	  * 5#棒一、6#高线统计明细查询
 	  * @param ccmNo
 	  * @param changeShiftId
 	  * @return
@@ -1793,7 +1798,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 						 }
 					 }
 				 } catch (Exception e) {
-					 log.error("解析rollClubOneDetails失败: {}", rollClubOneDetails, e);
+					 log.error("解析rollClubOneDetails、rollHeightDetails失败: {}", rollClubOneDetails, e);
 				 }
 			 }
 		 }
@@ -1894,7 +1899,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 
 		 List<StorageBillPrint> storageBillPrintList = storageBillPrintService.list(queryWrapper);
 		 if (oConvertUtils.listIsEmpty(storageBillPrintList)) {
-			 log.info("{}{}", "查询数据为空！");
+			 log.info("{}", "工作台统计明细查询数据为空！");
 			 return billetDetailsInfoList;
 		 }
 		 // 创建并初始化BilletDetailsInfo对象