From e92655c7da461243a6763f5fcf692cdbacd98fec Mon Sep 17 00:00:00 2001 From: linfso Date: Fri, 9 May 2025 07:01:21 +0800 Subject: [PATCH] md --- .../java/com/xdadan/erp/web/emis/EmisCommonController.java | 2 +- .../com/xdadan/erp/web/emis/EmisTmsScanRecordController.java | 2 +- .../xdadan/erp/emis/service/IEmisTmsScanRecordService.java | 2 +- .../erp/emis/service/impl/EmisTmsScanRecordServiceImpl.java | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java index ac4904b67..e48e7748b 100644 --- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java +++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisCommonController.java @@ -555,7 +555,7 @@ public class EmisCommonController extends EmisBaseController // receiveCountry -- 收件国二字码 rstMap.put("billCode",mainNo); - List stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang); + List stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang,false); rstMap.put("steps",stepList); rstList.add(rstMap); 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 18fe82ef4..0355609ea 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 @@ -241,7 +241,7 @@ public class EmisTmsScanRecordController extends EmisBaseController for (String billCode:billCodeArr) { Map rstMap = new HashMap<>(); rstMap.put("billCode",billCode); - List stepList=emisTmsScanRecordService.queryWaybillTraceInfo(billCode,lang); + List stepList=emisTmsScanRecordService.queryWaybillTraceInfo(billCode,lang,true); rstMap.put("steps",stepList); rstList.add(rstMap); } diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java index d22cbd79b..b64ad3fcb 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java @@ -105,7 +105,7 @@ public interface IEmisTmsScanRecordService extends IDataAuditService * @param lang * @return */ - public List queryWaybillTraceInfo(String billCode, String lang); + public List queryWaybillTraceInfo(String billCode, String lang,boolean isInner); /** 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 6bf7c3e31..890397d8e 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 @@ -2592,13 +2592,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm // 获取物流跟踪列表 @Override - public List queryWaybillTraceInfo(String billCode,String lang) { + public List queryWaybillTraceInfo(String billCode,String lang,boolean isInner) { List stepList = new ArrayList<>(); List listTraceList= getTraceListByBillCode(billCode,true); for(EmisTmsScanRecord scanRecord:listTraceList){ - String content=cvtScanRecordToTraceStr(scanRecord,false); + String content=cvtScanRecordToTraceStr(scanRecord,isInner); if(content!=null) { Map step = new HashMap<>(); step.put("time", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate()));