This commit is contained in:
linfso 2024-08-29 08:31:10 +08:00
parent 6656d852a9
commit f9324eeb9f

View File

@ -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<String,String> 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);
}