冷热坯类型分组

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

@@ -500,6 +500,7 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				 billetOriginalProductRecord.setStackLength(x.getStacking());
 				 billetOriginalProductRecord.setLengthDetails(x.getLength());
 				 billetOriginalProductRecord.setCreateTime(DateUtils.str2Date(x.getCreateTime(), DateUtils.datetimeFormat.get()));
+				 billetOriginalProductRecord.setIsEditCharge("1");
 				 billetOriginalProductRecords.add(billetOriginalProductRecord);
 			 });
 			 log.info("钢坯原始生产记录信息: " + JSON.toJSON(billetOriginalProductRecords));
@@ -994,8 +995,9 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 					 continue; // 跳过当前记录
 				 }
 			 }
-
+			 String btype = print.getBtype();
 			 // 设置热装信息
+			 hotChargeMap.put("hotChargeBtype", btype);
 			 hotChargeMap.put("hotChargeLength", lengthValue);
 			 hotChargeMap.put("hotChargeTotalCount", currentCount);
 			 hotChargeMap.put("hotChargeTotalWeight", currentWeight.toPlainString());
@@ -1021,17 +1023,19 @@ public class BilletOriginalProductRecordController extends JeecgController<Bille
 				 // 使用 getOrDefault 避免空指针
 				 String length = (String) item.getOrDefault("hotChargeLength", "未知");
 				 String destination = (String) item.getOrDefault("hotChargeDestination", "未知");
+				 String btype = (String) item.getOrDefault("hotChargeBtype", "未知");
 				 Integer count = (Integer) item.getOrDefault("hotChargeTotalCount", 0);
 				 BigDecimal weight = new BigDecimal(item.getOrDefault("hotChargeTotalWeight", "0").toString());
 
-				 // 构建分组键
-				 String groupKey = length + "_" + destination;
+				 // **修改分组键：添加 btype**
+				 String groupKey = length + "_" + destination + "_" + btype;
 
 				 // 初始化或获取分组统计结果
 				 groupedResult.computeIfAbsent(groupKey, k -> {
 					 Map<String, Object> groupData = new HashMap<>();
 					 groupData.put("hotChargeLength", length);
 					 groupData.put("hotChargeDestination", destination);
+					 groupData.put("hotChargeBtype", btype); // **添加 btype 到分组数据**
 					 groupData.put("totalCount", 0);
 					 groupData.put("totalWeight", BigDecimal.ZERO);
 					 return groupData;