From f9324eeb9fb1a47bb939adb44063b85a694877a6 Mon Sep 17 00:00:00 2001 From: linfso Date: Thu, 29 Aug 2024 08:31:10 +0800 Subject: [PATCH] md --- .../xdadan/erp/web/emis/EmisTmsScanRecordController.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java index bf3be0fc4..233ec15c7 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisTmsScanRecordController.java @@ -17,6 +17,7 @@ import javax.servlet.http.HttpServletResponse; import com.alibaba.fastjson.JSON; import com.xdadan.erp.common.annotation.filter.jackson.JacksonFilter; import com.xdadan.erp.common.core.domain.entity.SysUser; +import com.xdadan.erp.common.utils.DateUtils; import com.xdadan.erp.emis.domain.*; import com.xdadan.erp.emis.domain.enumtype.ScanType; import com.xdadan.erp.emis.domain.exception.EmisBizError; @@ -250,7 +251,11 @@ public class EmisTmsScanRecordController extends EmisBaseController EmisTmsScanRecord lastScanRecord=emisTmsScanRecordService.selectLastRecord(billCode); String traceStr=emisBaseService.cvtScanRecordToTraceStr(lastScanRecord,true); - return AjaxResult.success("查询成功",traceStr); + HashMap traceInfoMap = new HashMap<>(); + traceInfoMap.put("lastTraceInfo",traceStr); + traceInfoMap.put("scanDate", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,lastScanRecord.getScanDate())); + + return AjaxResult.success("查询成功",traceInfoMap); }