后端修改

src/main/java/com/steerinfo/meterwork/meterworkcaractualfirst/service/impl/MeterWorkCarActualFirstServiceImpl.java

@@ -1382,9 +1382,12 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
 
             //判断结净数据是否匹配委托
             if (StringUtils.isNotEmpty(netDb.getPredictionNo())) {
-                MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(firstUpdate.getActualFirstNo(), netDb.getPredictionNo());
+                MeterWorkCarActualFirst meca1 = meterWorkCarActualFirstMapper.selectAndMatch(netDb.getActualFirst1No(), netDb.getPredictionNo());
                 meca1.setIsPreScale("1");
+                MeterWorkCarActualFirst meca2 = meterWorkCarActualFirstMapper.selectAndMatch(netDb.getActualFirst2No(), netDb.getPredictionNo());
+                meca2.setIsPreScale("1");
                 meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca1);
+                meterWorkCarActualFirstMapper.updateByPrimaryKeySelective(meca2);
                 PreTrackScale preTrackScale = new PreTrackScale();
                 preTrackScale.setPredictionNo(netDb.getPredictionNo());
                 preTrackScale.setValueFlag("2");

src/main/java/com/steerinfo/meterwork/meterworkrailwayactfirst/service/impl/MeterWorkRailwayActFirstServiceImpl.java

@@ -9098,7 +9098,7 @@ public class MeterWorkRailwayActFirstServiceImpl extends BaseServiceImpl<MeterWo
     }
 
     @Override
-    public RESTfulResult batchRailwayFirst(List<HashMap> models) {
+    public synchronized RESTfulResult batchRailwayFirst(List<HashMap> models) {
         RESTfulResult rm = new RESTfulResult();
         rm.setFailed();
         try {