修改

src/main/java/com/steerinfo/meterwork/meterworkcaractualbak/service/impl/MeterWorkCarActualBakServiceImpl.java

@@ -28,6 +28,7 @@ import com.steerinfo.meterwork.meterworkimage.mapper.MeterWorkImageMapper;
 import com.steerinfo.meterwork.meterworkimage.model.MeterWorkImage;
 import com.steerinfo.meterwork.meterworkprelink.mapper.MeterWorkPreLinkMapper;
 import com.steerinfo.meterwork.meterworkprelink.service.IMeterWorkPreLinkService;
+import com.steerinfo.meterwork.meterworkrailwayactfirst.model.MeterWorkRailwayActFirst;
 import com.steerinfo.meterwork.meterworkrailwayactual.mapper.MeterWorkRailwayActualMapper;
 import com.steerinfo.meterwork.meterworkrailwayactual.model.MeterWorkRailwayActual;
 import com.steerinfo.pretrack.pretracknotice.mapper.PreTrackNoticeMapper;
@@ -2415,6 +2416,19 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 actual.setActualFirst2No(actual.getActualFirst2No() + "bak");
                 actual.setActualNo(actual.getActualNo()+"bak");
 
+                MeterWorkCarActual tempActual = meterWorkCarActualMapper.selectByPrimaryKey(actual.getActualNo());
+                if(tempActual != null) {
+                    throw new Exception("结净数据已转成正式数据，不能重复转正式数据");
+                }
+                MeterWorkCarActualFirst tempGrossFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(actual.getActualFirst1No());
+                if(tempActual != null) {
+                    throw new Exception("一次毛重数据已转成正式数据，不能重复转正式数据");
+                }
+                MeterWorkCarActualFirst tempTareFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(actual.getActualFirst2No());
+                if(tempActual != null) {
+                    throw new Exception("一次皮重数据已转成正式数据，不能重复转正式数据");
+                }
+
                 meterWorkCarActualMapper.insert(actual);
 
                 //同时将两个一次也复制一下
@@ -2478,6 +2492,19 @@ public class MeterWorkCarActualBakServiceImpl extends BaseServiceImpl<MeterWorkC
                 actual.setActualFirst2No(actual.getActualFirst2No() + "bak");
                 actual.setActualNo(actual.getActualNo()+"bak");
 
+                MeterWorkCarActual tempActual = meterWorkCarActualMapper.selectByPrimaryKey(actual.getActualNo());
+                if(tempActual != null) {
+                    throw new Exception("结净数据已转成正式数据，不能重复转正式数据");
+                }
+                MeterWorkCarActualFirst tempGrossFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(actual.getActualFirst1No());
+                if(tempActual != null) {
+                    throw new Exception("一次毛重数据已转成正式数据，不能重复转正式数据");
+                }
+                MeterWorkCarActualFirst tempTareFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(actual.getActualFirst2No());
+                if(tempActual != null) {
+                    throw new Exception("一次皮重数据已转成正式数据，不能重复转正式数据");
+                }
+
                 meterWorkCarActualMapper.insert(actual);
 
                 //同时将两个一次也复制一下

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirstbak/service/impl/MeterWorkCarActualFirstBakServiceImpl.java

@@ -5712,7 +5712,10 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
                 BeanUtils.copyProperties(meterWorkCarActualFirstBak,first);
                 //修改主键
                 first.setActualFirstNo(first.getActualFirstNo()+"bak");
-
+                MeterWorkCarActualFirst tempFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(first.getActualFirstNo());
+                if(tempFirst != null) {
+                    throw new Exception("一次数据已转成正式数据，不能重复转正式数据");
+                }
                 meterWorkCarActualFirstMapper.insert(first);
 
                 meterWorkCarActualFirstBak.setValueFlag("0");
@@ -5748,12 +5751,18 @@ public class MeterWorkCarActualFirstBakServiceImpl extends BaseServiceImpl<Meter
             //判断是否符合要求
             String note = isSuit(meterWorkCarActualFirstBak,1);
             if (note.equals("1")){
+
                 //复制到First正式表里面
                 MeterWorkCarActualFirst first = new MeterWorkCarActualFirst();
                 //复制一份
                 BeanUtils.copyProperties(meterWorkCarActualFirstBak,first);
                 //修改主键
                 first.setActualFirstNo(first.getActualFirstNo()+"bak");
+
+                MeterWorkCarActualFirst tempFirst = meterWorkCarActualFirstMapper.selectByPrimaryKey(first.getActualFirstNo());
+                if(tempFirst != null) {
+                    throw new Exception("一次数据已转成正式数据，不能重复转正式数据");
+                }
                 meterWorkCarActualFirstMapper.insert(first);
 
                 meterWorkCarActualFirstBak.setValueFlag("0");

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirstbak/service/impl/MeterWorkRailwayActFirstBakServiceImpl.java

@@ -7536,6 +7536,10 @@ public class MeterWorkRailwayActFirstBakServiceImpl extends BaseServiceImpl<Mete
                     BeanUtils.copyProperties(firstModel,first);
                     //修改主键
                     first.setActualFirstNo(first.getActualFirstNo()+"bak");
+                    MeterWorkRailwayActFirst tempFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(first.getActualFirstNo());
+                    if(tempFirst != null) {
+                        throw new Exception("一次数据已转成正式数据，不能重复转正式数据");
+                    }
                     meterWorkRailwayActFirstMapper.insert(first);
                     firstModel.setValueFlag("0");
                     meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(firstModel);

src/main/java/com/steerinfo/meterwork/meterworkrailwayactualbak/service/impl/MeterWorkRailwayActualBakServiceImpl.java

@@ -2756,6 +2756,19 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
                     actual.setActualFirst2No(actual.getActualFirst2No() + "bak");
                     actual.setActualNo(actual.getActualNo() + "bak");
 
+                    MeterWorkRailwayActual tempActual = meterWorkRailwayActualMapper.selectByPrimaryKey(actual.getActualNo());
+                    if(tempActual != null) {
+                        throw new Exception("结净数据已转成正式数据，不能重复转正式数据");
+                    }
+                    MeterWorkRailwayActFirst tempGrossFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actual.getActualFirst1No());
+                    if(tempActual != null) {
+                        throw new Exception("一次毛重数据已转成正式数据，不能重复转正式数据");
+                    }
+                    MeterWorkRailwayActFirst tempTareFirst = meterWorkRailwayActFirstMapper.selectByPrimaryKey(actual.getActualFirst2No());
+                    if(tempActual != null) {
+                        throw new Exception("一次皮重数据已转成正式数据，不能重复转正式数据");
+                    }
+
                     meterWorkRailwayActualMapper.insert(actual);
 
                     //同时将两个一次也复制一下