Bladeren bron

Merge branch 'gp-master'

guoqiang 6 maanden geleden
bovenliggende
commit
dc1af1d563

+ 12 - 1
zgztBus/jeecg-module-sbm/src/main/java/org/jeecg/modules/actualControl/heatsActuals/controller/HeatsActualsController.java

@@ -11,6 +11,7 @@ import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
+import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.actualControl.billetActual.billetActual.entity.BilletBasicInfo;
 import org.jeecg.modules.actualControl.billetActual.billetActual.service.IBilletBasicInfoService;
 import org.jeecg.modules.actualControl.heatsActuals.entity.HeatsActuals;
@@ -65,16 +66,26 @@ public class HeatsActualsController extends JeecgController<HeatsActuals, IHeats
 		List<HeatsActuals> list = pageList.getRecords();
 		// 处理钢坯目的地信息
 		list.forEach(item ->{
+			// 定尺规格统计数量
 			LambdaQueryWrapper<BilletBasicInfo> queryBilletWrapper = new LambdaQueryWrapper<BilletBasicInfo>().eq(BilletBasicInfo::getHeatNo, item.getHeatsCode())
 					.eq(BilletBasicInfo::getCcmNo,  item.getCasterCode());
 			List<BilletBasicInfo> billetBasicList = billetBasicInfoService.list(queryBilletWrapper);
 			Map<Integer, Long> lengthCountMap = billetBasicList.stream().collect(Collectors.groupingBy(BilletBasicInfo::getLength, Collectors.counting()));
+			// 判断空值
+			if(oConvertUtils.isEmpty(item.getLastCutTime())){ // 没有切割完实时统计
+				item.setBilletSum(billetBasicList.size());
+			} else if(oConvertUtils.isNotEmpty(item.getLastCutTime()) && item.getBilletSum() == 0){ // 最后切割时间有了并且没有统计支数
+				item.setBilletSum(billetBasicList.size());
+				item.setId(item.getId());
+				item.setBilletSum(billetBasicList.size());
+				heatsActualsService.updateById(item);
+			}
 			item.setBasicInfoLengthList(lengthCountMap);
 		});
 		pageList.setRecords(list);
 		return Result.OK(pageList);
 	}
-	
+
 	/**
 	 *   添加
 	 *