|
@@ -2568,6 +2568,10 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
+ if(parameters.get("railwayNoArr") != null) {
|
|
|
|
|
+ String[] railwayNoList = parameters.get("railwayNoArr").toString().split(",");
|
|
|
|
|
+ parameters.put("railwayNoList", railwayNoList);
|
|
|
|
|
+ }
|
|
|
List<MeterWorkRailwayActualBak> rows = meterWorkRailwayActualBakMapper.likeByDescTemp(parameters);
|
|
List<MeterWorkRailwayActualBak> rows = meterWorkRailwayActualBakMapper.likeByDescTemp(parameters);
|
|
|
return rows;
|
|
return rows;
|
|
|
}
|
|
}
|
|
@@ -2621,6 +2625,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
|
|
|
rm.setFailed();
|
|
rm.setFailed();
|
|
|
try {
|
|
try {
|
|
|
int count = 0;
|
|
int count = 0;
|
|
|
|
|
+ int lcCount = 0;
|
|
|
if(models.size() >= 1) {
|
|
if(models.size() >= 1) {
|
|
|
List<MeterWorkRailwayActFirstBak> grossList = new ArrayList<>();
|
|
List<MeterWorkRailwayActFirstBak> grossList = new ArrayList<>();
|
|
|
List<MeterWorkRailwayActFirstBak> tareList = new ArrayList<>();
|
|
List<MeterWorkRailwayActFirstBak> tareList = new ArrayList<>();
|
|
@@ -2638,6 +2643,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
|
|
|
}
|
|
}
|
|
|
grossList.add(grossModel);
|
|
grossList.add(grossModel);
|
|
|
tareList.add(tareModel);
|
|
tareList.add(tareModel);
|
|
|
|
|
+ lcCount += 2;
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
@@ -2649,7 +2655,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
|
|
|
model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
|
|
model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
|
|
|
.replaceAll("轨道衡", "")
|
|
.replaceAll("轨道衡", "")
|
|
|
.replaceAll("静轨", "")
|
|
.replaceAll("静轨", "")
|
|
|
- .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
|
|
|
|
|
|
|
+ .replaceAll("静态", "") + "-" + afl + lcNo + "(" + lcCount + ")");
|
|
|
model.setLcNo(model.getLcNo());
|
|
model.setLcNo(model.getLcNo());
|
|
|
meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
|
|
meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
|
|
|
}
|
|
}
|
|
@@ -2662,7 +2668,7 @@ public class MeterWorkRailwayActualBakServiceImpl extends BaseServiceImpl<MeterW
|
|
|
model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
|
|
model.setLcNo(model.getBaseSpotName().replaceAll("#", "")
|
|
|
.replaceAll("轨道衡", "")
|
|
.replaceAll("轨道衡", "")
|
|
|
.replaceAll("静轨", "")
|
|
.replaceAll("静轨", "")
|
|
|
- .replaceAll("静态", "") + "-" + afl + lcNo + "(" + models.size() + ")");
|
|
|
|
|
|
|
+ .replaceAll("静态", "") + "-" + afl + lcNo + "(" + lcCount + ")");
|
|
|
model.setLcNo(model.getLcNo());
|
|
model.setLcNo(model.getLcNo());
|
|
|
meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
|
|
meterWorkRailwayActFirstBakMapper.updateByPrimaryKeySelective(model);
|
|
|
}
|
|
}
|