推钢室炉次上个班组处理

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

@@ -1898,7 +1898,7 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			log.info("{}{}", "查询浇筑信息失败，炉次传递单为空！", ccmNo + "失败时间：" + new Date());
 			return Result.OK(heatsActualsInfoList);
 		}
-		List<BilletHotsend> billetHotsendListLast = new ArrayList<>();
+		List<BilletHotsend> billetHotsendListLast;
 		// 上一个班组的炉次传递单最新的2炉信息
 		if ("1".equals(queryType) && lastBilletHotsendChangeShift != null){
 			LambdaQueryWrapper<BilletHotsend> queryWrapperLast = new LambdaQueryWrapper<>();
@@ -1910,10 +1910,19 @@ public class StorageBillController extends JeecgController<StorageBill, IStorage
 			billetHotsendListLast = billetHotsendBaseService.list(queryWrapperLast);
 			if(oConvertUtils.listIsNotEmpty(billetHotsendListLast)){
 				for(BilletHotsend x : billetHotsendListLast){
-					int sum = x.getRollcluboneNum() + x.getRollclubtwoNum() + x.getRollclubthreeNum()
-							+ x.getRollheightNum() + x.getRolloutshippNum() + x.getStackNum() + x.getWasteNum();
-					if(x.getAmountTotal() > sum && (x.getAmountTotal() - sum) % 4 == 0){
-						billetHotsendList.add(x);
+					// 根据ccmNo、heatNo、shift、shiftGroup查询钢坯实绩，BelongTable等于NULL的
+					LambdaQueryWrapper<BilletBasicInfo> queryWrapper2 = new LambdaQueryWrapper<>();
+					queryWrapper2.eq(BilletBasicInfo::getCcmNo, x.getCcmNo())
+							.eq(BilletBasicInfo::getHeatNo, x.getHeatNo())
+							.eq(BilletBasicInfo::getShift, x.getShift())
+							.eq(BilletBasicInfo::getShiftGroup, x.getShiftGroup())
+							.isNull(BilletBasicInfo::getBelongTable)
+							.isNull(BilletBasicInfo::getBhtcId);
+					List<BilletBasicInfo> billetBasicInfoList = billetBasicInfoService.list(queryWrapper2);
+					if (oConvertUtils.listIsNotEmpty(billetBasicInfoList)){
+						if (billetBasicInfoList.size() >= 4 || billetBasicInfoList.size() % 4 == 0){
+							billetHotsendList.add(x);
+						}
 					}
 				}
 				// 按创建时间倒序排序