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-29 20:08:53 +08:00
parent cf1cb3093c
commit 723bb6868f
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -247,21 +247,26 @@ public class EmisTmsScanRecordController extends EmisBaseController
// return AjaxResult.error("运单号不能为空"); // return AjaxResult.error("运单号不能为空");
return AjaxResult.success("查询成功",""); return AjaxResult.success("查询成功","");
} }
HashMap<String, String> traceInfoMap = new HashMap<>();
try { try {
EmisTmsScanRecord lastScanRecord=emisTmsScanRecordService.selectLastRecord(billCode); EmisTmsScanRecord lastScanRecord=emisTmsScanRecordService.selectLastRecord(billCode);
String traceStr = emisBaseService.cvtScanRecordToTraceStr(lastScanRecord, true); if(lastScanRecord!=null) {
String traceStr = emisBaseService.cvtScanRecordToTraceStr(lastScanRecord, true);
traceInfoMap.put("lastTraceInfo", traceStr);
traceInfoMap.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lastScanRecord.getScanDate()));
HashMap<String, String> traceInfoMap = new HashMap<>(); return AjaxResult.success("查询成功", traceInfoMap);
traceInfoMap.put("lastTraceInfo", traceStr); }else{
traceInfoMap.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS, lastScanRecord.getScanDate())); traceInfoMap.put("lastTraceInfo", "");
traceInfoMap.put("scanDate", DateUtils.getTime());
return AjaxResult.success("查询成功", traceInfoMap); return AjaxResult.success("查询成功", traceInfoMap);
}
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
HashMap<String, String> traceInfoMap = new HashMap<>();
traceInfoMap.put("lastTraceInfo", ""); traceInfoMap.put("lastTraceInfo", "");
traceInfoMap.put("scanDate", DateUtils.getTime()); traceInfoMap.put("scanDate", DateUtils.getTime());
return AjaxResult.success("查询成功", traceInfoMap); return AjaxResult.success("查询成功", traceInfoMap);
} }
} }