aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2024-08-25 06:58:22 +08:00
parent d1c069fb9d
commit e63bfaec4f
3 changed files with 29 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java
View File

@ -305,7 +305,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
public TableDataInfo getTraceListByBillCode(EmisTmsScanRecord emisTmsScanRecord) public TableDataInfo getTraceListByBillCode(EmisTmsScanRecord emisTmsScanRecord)
{ {
startPage(); startPage();
List<EmisTmsScanRecord> list = emisTmsScanRecordService.getTraceListByBillCode(emisTmsScanRecord.getBillCode()); List<EmisTmsScanRecord> list = emisTmsScanRecordService.getTraceListByBillCode(emisTmsScanRecord.getBillCode(),true);
return getDataTable(list); return getDataTable(list);
} }

2
emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
View File

@ -87,7 +87,7 @@ public interface IEmisTmsScanRecordService
* @param billCode * @param billCode
* @return * @return
*/ */
public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode); public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode,Boolean isAsc);
/** /**
* 获取跟踪信息 * 获取跟踪信息

29
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java
View File

@ -2402,12 +2402,37 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
* @return * @return
*/ */
@Override @Override
public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode) { public List<EmisTmsScanRecord> getTraceListByBillCode(String billCode,Boolean isAsc) {
List<EmisTmsScanRecord> listTraces = emisTmsScanRecordMapper.selectTraceListByBillCode(billCode); List<EmisTmsScanRecord> listTraces = emisTmsScanRecordMapper.selectTraceListByBillCode(billCode);
List<EmisTmsScanRecord> transferList=cvtTransferTraceToScanRecord(billCode); List<EmisTmsScanRecord> transferList=cvtTransferTraceToScanRecord(billCode);
if(!CollectionUtil.isEmpty(transferList)){ if(!CollectionUtil.isEmpty(transferList)){
listTraces.addAll(transferList); listTraces.addAll(transferList);
//按时间从最最近排序
Collections.sort(listTraces, new Comparator<EmisTmsScanRecord>(){
@Override
public int compare(EmisTmsScanRecord a, EmisTmsScanRecord b) {
if(isAsc) {
if (a.getScanDate().after(b.getScanDate())) {
return -1;
} else if (a.getScanDate().before(b.getScanDate())) {
return 1;
} else {
return 0;
}
}else{
if (a.getScanDate().after(b.getScanDate())) {
return 1;
} else if (a.getScanDate().before(b.getScanDate())) {
return -1;
} else {
return 0;
}
}
}
});
} }
log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces)); log.error("====getTraceListByBillCode===>",JSON.toJSONString(listTraces));
return listTraces; return listTraces;
@ -2418,7 +2443,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
public List<Map> queryWaybillTraceInfo(String billCode,String lang) { public List<Map> queryWaybillTraceInfo(String billCode,String lang) {
List<Map> stepList = new ArrayList<>(); List<Map> stepList = new ArrayList<>();
List<EmisTmsScanRecord> listTraceList= getTraceListByBillCode(billCode); List<EmisTmsScanRecord> listTraceList= getTraceListByBillCode(billCode,true);
for(EmisTmsScanRecord scanRecord:listTraceList){ for(EmisTmsScanRecord scanRecord:listTraceList){
String content=cvtScanRecordToTraceStr(scanRecord,false); String content=cvtScanRecordToTraceStr(scanRecord,false);