diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java index 89993e7da..871bd5ed8 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java @@ -2453,12 +2453,14 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm if(!CollectionUtil.isEmpty(transferList)){ listTraces.addAll(transferList); + } + if(!CollectionUtil.isEmpty(listTraces)) { //按时间从最最近排序 - Collections.sort(listTraces, new Comparator(){ + Collections.sort(listTraces, new Comparator() { @Override public int compare(EmisTmsScanRecord a, EmisTmsScanRecord b) { - if(isAsc) { + if (isAsc) { if (a.getScanDate().after(b.getScanDate())) { return -1; } else if (a.getScanDate().before(b.getScanDate())) { @@ -2466,7 +2468,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } else { return 0; } - }else{ + } else { if (a.getScanDate().after(b.getScanDate())) { return 1; } else if (a.getScanDate().before(b.getScanDate())) { @@ -2477,8 +2479,8 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm } } }); - } + log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces)); return listTraces; }