|
@@ -18,7 +18,6 @@ import org.springframework.stereotype.Service;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Date;
|
|
|
import java.util.List;
|
|
|
-import java.util.Optional;
|
|
|
|
|
|
/**
|
|
|
* @Description: 钢坯交班记录
|
|
@@ -61,15 +60,11 @@ public class BilletHotsendChangeShiftServiceImpl extends ServiceImpl<BilletHotse
|
|
|
billetHotsendChangeShift.setChangeShiftTime(new Date());
|
|
|
baseMapper.updateById(billetHotsendChangeShift);
|
|
|
// 获取当前最新炉号
|
|
|
- BilletBasicInfo billetBasicInfo = Optional.ofNullable(billetBasicInfoService.list(new LambdaQueryWrapper<BilletBasicInfo>()
|
|
|
- .orderByDesc(BilletBasicInfo::getCreateTime)))
|
|
|
- .flatMap(list -> list.stream().findFirst())
|
|
|
- .orElse(null);
|
|
|
- if (oConvertUtils.isNotEmpty(billetBasicInfo)){
|
|
|
+ if (oConvertUtils.isNotEmpty(billetHotsendChangeShift.getHeatNo())){
|
|
|
// 根据当前炉号、铸机号、班组、班别查询总生产的钢坯数
|
|
|
LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<BilletBasicInfo>()
|
|
|
.eq(BilletBasicInfo::getCcmNo, Integer.valueOf(billetHotsendChangeShiftVo.getCcmNo()))
|
|
|
- .eq(BilletBasicInfo::getHeatNo, billetBasicInfo.getHeatNo())
|
|
|
+ .eq(BilletBasicInfo::getHeatNo, billetHotsendChangeShift.getHeatNo())
|
|
|
.eq(BilletBasicInfo::getShift, billetHotsendChangeShift.getShift())
|
|
|
.eq(BilletBasicInfo::getShiftGroup, billetHotsendChangeShift.getShiftGroup())
|
|
|
.orderByDesc(BilletBasicInfo::getCreateTime);
|