当班浇筑炉次操作按钮验证

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/controller/StorageBillController.java

@@ -1851,10 +1851,11 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 				.eq(BilletHotsendChangeShift::getShift, shift)
 				.eq(BilletHotsendChangeShift::getShiftGroup, shiftGroup)
 				.isNotNull(BilletHotsendChangeShift::getChangeShiftTime)
-				.orderByDesc(BilletHotsendChangeShift::getChangeShiftTime)
+				.orderByDesc(BilletHotsendChangeShift::getCreateTime)
 				.last("limit 1");
 		BilletHotsendChangeShift billetHotsendChangeShift = billetHotsendChangeShiftService.getOne(queryWrapper);
 		if (billetHotsendChangeShift ==	null){
+			log.info("{}{}", "查询当班浇筑信息失败，交班记录为空！", ccmNo + "失败时间：" + new Date());
 			return Result.OK(heatsActualsInfoList);
 		}
 		//根据ccmNo、shift、shiftGroup、大于billetHotsendChangeShift的创建时间 查询所有炉次传递单BilletHotsend
@@ -1866,6 +1867,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 				.orderByDesc(BilletHotsend::getCreateTime);
 		List<BilletHotsend> billetHotsendList = billetHotsendBaseService.list(queryWrapper1);
 		if (oConvertUtils.listIsEmpty(billetHotsendList)){
+			log.info("{}{}", "查询当班浇筑信息失败，炉次传递单为空！", ccmNo + "失败时间：" + new Date());
 			return Result.OK(heatsActualsInfoList);
 		}
 		billetHotsendList.forEach(x -> {
@@ -1880,6 +1882,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 					.eq(BilletBasicInfo::getShiftGroup, x.getShiftGroup());
 			List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper2);
 			if (oConvertUtils.listIsEmpty(billetBasicInfoList)){
+				log.info("{}{}", "查询当班浇筑信息失败，钢坯实绩信息为空！", x.getCcmNo() + "失败时间：" + new Date());
 				return;
 			}
 			// 统计各流号的数量
@@ -2033,6 +2036,22 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			resultMap.put("totalWeight", totalWeight);
 			String sumJsonResult = JSON.toJSONString(resultMap); // 使用FastJSON转换
 			heatsActualsInfo.setTotalInfo(sumJsonResult);
+
+
+			// 过滤列表：获取belongTable为null并且assemblyNumber不为空的数据
+			List<BilletBasicInfo> notUsedBilletBasicInfoList = billetBasicInfoList.stream()
+					.filter(info -> info.getBelongTable() == null)  // 过滤belongTable为null的记录
+					.filter(info -> info.getAssemblyNumber() != null && !info.getAssemblyNumber().isEmpty())  // 过滤assemblyNumber不为空的记录
+					.collect(Collectors.toList());  // 收集结果到新列表
+
+			// 按assemblyNumber分组，并检查每组数量是否都为4
+			boolean allGroupsSizeIsFour = notUsedBilletBasicInfoList.stream()
+					.collect(Collectors.groupingBy(BilletBasicInfo::getAssemblyNumber, Collectors.counting()))
+					.values()
+					.stream()
+					.allMatch(count -> count == 4);
+			heatsActualsInfo.setOperateStatus(allGroupsSizeIsFour);
+
 			heatsActualsInfoList.add(heatsActualsInfo);
 		});
 		return Result.OK(heatsActualsInfoList);

zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/billet/storageBill/entity/HeatsActualsInfo.java

@@ -30,4 +30,6 @@ public class HeatsActualsInfo {
 
     private String totalInfo;
 
+    private Boolean operateStatus;
+
 }