后端提交

src/main/java/com/steerinfo/meterwork/meterworkcaractual/service/impl/MeterWorkCarActualServiceImpl.java

@@ -1102,7 +1102,7 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
                 logModel.setOperationFunction("结净废除");
                 logModel.setOperationId(model.getActualNo());
                 logModel.setOperationPredictionNo(model.getPredictionNo());
-                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationCarnNo(model.getCarNo());
                 logModel.setOperationBeforeFix(model.toString());
                 logModel.setOperationAfterFix(modelTemp.toString());
                 meterBaseOperationLogMapper.insertSelective(logModel);
@@ -1278,8 +1278,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
 
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if(model.getUpdateTime() != null && StringUtils.isNotEmpty(model.getUpdateTime().toString())) {
-                long eTime = df.parse(model.getUpdateTime().toString()).getTime();
-                long sTime = df.parse((new Date()).toString()).getTime();
+                long sTime = df.parse(model.getUpdateTime().toString()).getTime();
+                long eTime = df.parse((new Date()).toString()).getTime();
                 long diff = (eTime - sTime) / 1000;
                 if(diff <= 15) {
                     throw new MarkerMetException(500, "匹配委托需在解除委托15秒后进行，请稍等");
@@ -1392,8 +1392,8 @@ public class MeterWorkCarActualServiceImpl extends BaseServiceImpl<MeterWorkCarA
             try{
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 if(mwcaquery.getUpdateTime() != null && StringUtils.isNotEmpty(mwcaquery.getUpdateTime().toString())) {
-                    long eTime = df.parse(mwcaquery.getUpdateTime().toString()).getTime();
-                    long sTime = df.parse((new Date()).toString()).getTime();
+                    long sTime = df.parse(mwcaquery.getUpdateTime().toString()).getTime();
+                    long eTime = df.parse((new Date()).toString()).getTime();
                     long diff = (eTime - sTime) / 1000;
                     if(diff <= 15) {
                         throw new MarkerMetException(500, "解除委托需在匹配委托15秒后进行，请稍等");

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

@@ -4039,7 +4039,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             logModel02.setOperationFunction("混装委托结净");
             logModel02.setOperationId(actualRow2.getActualNo());
             logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
-            logModel01.setOperationBeforeFix(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
+            logModel02.setOperationBeforeFix(actualNo1 + "+" + actualNo2 + "+" + actualNo3);
             logModel02.setOperationCarnNo(actualRow2.getCarNo());
             meterBaseOperationLogMapper.insertSelective(logModel02);
         }
@@ -4307,7 +4307,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             logModel02.setOperationFunction("混卸委托结净");
             logModel02.setOperationId(actualRow2.getActualNo());
             logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
-            logModel01.setOperationBeforeFix(actualNo1 + "," + actualNo2 + "," + actualNo3);
+            logModel02.setOperationBeforeFix(actualNo1 + "," + actualNo2 + "," + actualNo3);
             logModel02.setOperationCarnNo(actualRow2.getCarNo());
             meterBaseOperationLogMapper.insertSelective(logModel02);
         }
@@ -4645,7 +4645,7 @@ public class MeterWorkCarActualFirstServiceImpl extends BaseServiceImpl<MeterWor
             logModel02.setOperationFunction("双委托结净");
             logModel02.setOperationId(actualNo2);
             logModel02.setOperationPredictionNo(predictionNo1 + "+" + predictionNo2);
-            logModel01.setOperationBeforeFix(actualRow2.getActualFirst1No() + "," + actualRow2.getActualFirst2No());
+            logModel02.setOperationBeforeFix(actualRow2.getActualFirst1No() + "," + actualRow2.getActualFirst2No());
             logModel02.setOperationCarnNo(actualRow2.getCarNo());
             meterBaseOperationLogMapper.insertSelective(logModel02);
 

src/main/java/com/steerinfo/meterwork/meterworkrailwayactual/service/impl/MeterWorkRailwayActualServiceImpl.java

@@ -423,9 +423,9 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
                 logModel.setCreateTime(new Date());
                 logModel.setOperationPage("web端-轨道衡净重数据维护");
                 logModel.setOperationFunction("批量发布");
-                logModel.setOperationId(model.getActualNo());
-                logModel.setOperationPredictionNo(model.getPredictionNo());
-                logModel.setOperationCarnNo(model.getRailwayNo());
+                logModel.setOperationId(modelTemp.getActualNo());
+                logModel.setOperationPredictionNo(modelTemp.getPredictionNo());
+                logModel.setOperationCarnNo(modelTemp.getRailwayNo());
                 meterBaseOperationLogMapper.insertSelective(logModel);
                 count ++;
             }
@@ -827,8 +827,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
         try{
             SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             if(queryrow.getUpdateTime() != null && StringUtils.isNotEmpty(queryrow.getUpdateTime().toString())) {
-                long eTime = df.parse(queryrow.getUpdateTime().toString()).getTime();
-                long sTime = df.parse((new Date()).toString()).getTime();
+                long sTime = df.parse(queryrow.getUpdateTime().toString()).getTime();
+                long eTime = df.parse((new Date()).toString()).getTime();
                 long diff = (eTime - sTime) / 1000;
                 if(diff <= 15) {
                     throw new MarkerMetException(500, "匹配委托需在解除委托15秒后进行，请稍等");
@@ -1039,8 +1039,8 @@ public class MeterWorkRailwayActualServiceImpl extends BaseServiceImpl<MeterWork
             try{
                 SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                 if(mwcaquery.getUpdateTime() != null && StringUtils.isNotEmpty(mwcaquery.getUpdateTime().toString())) {
-                    long eTime = df.parse(mwcaquery.getUpdateTime().toString()).getTime();
-                    long sTime = df.parse((new Date()).toString()).getTime();
+                    long sTime = df.parse(mwcaquery.getUpdateTime().toString()).getTime();
+                    long eTime = df.parse((new Date()).toString()).getTime();
                     long diff = (eTime - sTime) / 1000;
                     if(diff <= 15) {
                         throw new MarkerMetException(500, "解除委托需在匹配委托15秒后进行，请稍等");