dev
parent
345bdad842
commit
8611125d4f
|
|
@ -998,7 +998,7 @@ public class OrderclusterSyncService extends BaseSyncService {
|
|||
// 已有车辆的,在结转前,需要将已经分配其他集团订单的车辆去掉
|
||||
List<Object> ts = new ArrayList<>();
|
||||
List<String> tsql = new ArrayList<>();
|
||||
Map<String, Integer> delmap = new HashMap<>();
|
||||
Map<String, OrderclusterTruck> delmap = new HashMap<>();
|
||||
|
||||
// 检查提交上来的车辆字符串是否用重复的
|
||||
for (int i = 0; i < octs.size(); i++) {
|
||||
|
|
@ -1006,7 +1006,7 @@ public class OrderclusterSyncService extends BaseSyncService {
|
|||
ts.add(oct.getTruckLicense());
|
||||
tsql.add("?");
|
||||
|
||||
delmap.put(oct.getTruckLicense(), i);
|
||||
delmap.put(oct.getTruckLicense(), oct);
|
||||
}
|
||||
|
||||
ts.add(0, cutoff_time); // 加到查询参数里面
|
||||
|
|
@ -1022,7 +1022,7 @@ public class OrderclusterSyncService extends BaseSyncService {
|
|||
if (chkduk != null && !chkduk.isEmpty()) {
|
||||
for (Record record : chkduk) {
|
||||
if (delmap.containsKey(record.getStr("truck_license"))) {
|
||||
octs.remove(delmap.get(record.getStr("truck_license")).intValue());
|
||||
octs.remove(delmap.get(record.getStr("truck_license")));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue