|
|
@@ -59,6 +59,7 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
|
|
|
String brandNum = String.format("billet:basic:info:brand:num:%s", billetBasicInfo.getCcmNo()); // 牌号
|
|
|
String classShiftStr = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShift)) : "";
|
|
|
String classShiftGroupStr = !oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(classShiftGroup)) : "";
|
|
|
+ String brandNumStr = !oConvertUtils.getString(redisTemplate.opsForValue().get(brandNum)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(brandNum)) : "";
|
|
|
log.info("{}{}", "钢坯实绩接收时缓存中的班组班别：", classShiftGroupStr + " " + classShiftStr);
|
|
|
// 查询钢坯基础是否存在
|
|
|
LambdaQueryWrapper<BilletBasicInfo> queryWrapper = new LambdaQueryWrapper<BilletBasicInfo>().eq(BilletBasicInfo::getBilletNo, billetBasicInfo.getBilletNo()).eq(BilletBasicInfo::getCcmNo, billetBasicInfo.getCcmNo()).eq(BilletBasicInfo::getHeatNo, billetBasicInfo.getHeatNo()).orderByDesc(BilletBasicInfo::getCreateTime).last("limit 1");
|
|
|
@@ -89,7 +90,7 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
|
|
|
// 新增数据
|
|
|
billetBasicInfo.setBilletWeight(weight);
|
|
|
billetBasicInfo.setShift(classShiftStr);
|
|
|
- billetBasicInfo.setBrandNum(brandNum);
|
|
|
+ billetBasicInfo.setBrandNum(brandNumStr);
|
|
|
billetBasicInfo.setShiftGroup(classShiftGroupStr);
|
|
|
|
|
|
log.info("{}{}", "新增钢坯实绩时班组班别：", billetBasicInfo.getShiftGroup() + " " + billetBasicInfo.getShift());
|
|
|
@@ -136,7 +137,7 @@ public class BilletBasicInfoServiceImpl extends ServiceImpl<BilletBasicInfoMappe
|
|
|
billetHotsend.setCcmNo(String.valueOf(billetBasicInfo.getCcmNo())); // 铸机号
|
|
|
billetHotsend.setHeatNo(billetBasicInfo.getHeatNo()); // 炉号
|
|
|
billetHotsend.setShiftGroup(classShiftGroupStr); // 班组
|
|
|
- billetHotsend.setBrandNum(brandNum);
|
|
|
+ billetHotsend.setBrandNum(brandNumStr);
|
|
|
billetHotsend.setShift(classShiftStr); // 班别
|
|
|
billetHotsend.setSteel(billetBasicInfo.getGrade()); // 钢种
|
|
|
billetHotsend.setSpec(billetBasicInfo.getSpec()); // 规格
|
