确保异常重复钢坯入库

zgzt-sys-java/jeecg-module-conn/src/main/java/org/jeecg/modules/billetActual/service/impl/BilletBasicInfoExceptionServiceImpl.java

@@ -1,6 +1,7 @@
 package org.jeecg.modules.billetActual.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import lombok.extern.slf4j.Slf4j;
 import org.jeecg.common.util.DateUtils;
 import org.jeecg.common.util.oConvertUtils;
@@ -48,42 +49,22 @@ public class BilletBasicInfoExceptionServiceImpl extends ServiceImpl<BilletBasic
             String brandNumStr = !oConvertUtils.getString(redisTemplate.opsForValue().get(brandNum)).isEmpty() ? oConvertUtils.getString(redisTemplate.opsForValue().get(brandNum)) : "";
             log.info("{}{}", "钢坯实绩异常数据接收时，缓存中的班组班别：", classShiftGroupStr + " " + classShiftStr);
             // 查询钢坯基础是否存在
-            LambdaQueryWrapper<BilletBasicInfoException> queryWrapper = new LambdaQueryWrapper<BilletBasicInfoException>()
-                    .eq(BilletBasicInfoException::getBilletNo, billetBasicInfoException.getBilletNo())
-                    .eq(BilletBasicInfoException::getCcmNo, billetBasicInfoException.getCcmNo())
-                    .eq(BilletBasicInfoException::getHeatNo, billetBasicInfoException.getHeatNo())
-                    .orderByDesc(BilletBasicInfoException::getCreateTime).last("limit 1");
-            BilletBasicInfoException basicInfoExceptionData = baseMapper.selectOne(queryWrapper);
-            if (oConvertUtils.isNotEmpty(basicInfoExceptionData) && oConvertUtils.isNotEmpty(basicInfoExceptionData.getId())) { // 编辑
-                log.info("{}{}", "更新钢坯实绩异常数据最新一条中的班组班别：", basicInfoExceptionData.getShiftGroup() + " " + basicInfoExceptionData.getShift());
-                // 编辑钢坯基础信息
-                billetBasicInfoException.setId(basicInfoExceptionData.getId());
-                billetBasicInfoException.setBilletWeight(basicInfoExceptionData.getBilletWeight());
-                billetBasicInfoException.setWeight(basicInfoExceptionData.getWeight());
-                billetBasicInfoException.setShift(basicInfoExceptionData.getShift());
-                billetBasicInfoException.setActualLength(basicInfoExceptionData.getActualLength());
-                billetBasicInfoException.setThickness(basicInfoExceptionData.getThickness());
-                billetBasicInfoException.setSpec(basicInfoExceptionData.getSpec());
-                billetBasicInfoException.setGrade(basicInfoExceptionData.getGrade());
-                billetBasicInfoException.setShiftGroup(basicInfoExceptionData.getShiftGroup());
-                baseMapper.updateById(billetBasicInfoException);
-            } else {
-                // 查询定尺规则
-                LambdaQueryWrapper<BilletRulerConfig> queryWrapperbilletRulerConfig = new LambdaQueryWrapper<BilletRulerConfig>()
-                        .eq(BilletRulerConfig::getLength, billetBasicInfoException.getLength());
-                BilletRulerConfig billetRulerConfig = billetRulerConfigMapper.selectOne(queryWrapperbilletRulerConfig);
-                Double weight = 0.0;
-                if (oConvertUtils.isNotEmpty(billetRulerConfig)) {
-                    weight = billetRulerConfig.getWeight();
-                }
-                // 新增数据
-                billetBasicInfoException.setBilletWeight(weight);
-                billetBasicInfoException.setShift(classShiftStr);
-                billetBasicInfoException.setBrandNum(brandNumStr);
-                billetBasicInfoException.setShiftGroup(classShiftGroupStr);
-                log.info("{}{}", "新增钢坯实绩异常数据：", billetBasicInfoException.getShiftGroup() + " " + billetBasicInfoException.getShift());
-                baseMapper.insert(billetBasicInfoException);
+            // 查询定尺规则
+            LambdaQueryWrapper<BilletRulerConfig> queryWrapperbilletRulerConfig = new LambdaQueryWrapper<BilletRulerConfig>()
+                    .eq(BilletRulerConfig::getLength, billetBasicInfoException.getLength());
+            BilletRulerConfig billetRulerConfig = billetRulerConfigMapper.selectOne(queryWrapperbilletRulerConfig);
+            Double weight = 0.0;
+            if (oConvertUtils.isNotEmpty(billetRulerConfig)) {
+                weight = billetRulerConfig.getWeight();
             }
+            // 新增数据
+            billetBasicInfoException.setId(String.valueOf(IdWorker.getId()));
+            billetBasicInfoException.setBilletWeight(weight);
+            billetBasicInfoException.setShift(classShiftStr);
+            billetBasicInfoException.setBrandNum(brandNumStr);
+            billetBasicInfoException.setShiftGroup(classShiftGroupStr);
+            log.info("{}{}", "新增钢坯实绩异常数据：", billetBasicInfoException.getShiftGroup() + " " + billetBasicInfoException.getShift());
+            baseMapper.insert(billetBasicInfoException);
             log.info("{}{}", "end钢坯实绩<异常>数据逻辑处理结束:", DateUtils.date2Str(new Date(), DateUtils.datetimeFormat.get()));
         } catch (Exception e) {
             log.error("自动化处理钢坯实绩异常数据时发生异常", e);