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 2025-05-09 07:01:21 +08:00
parent 85b62e8a96
commit e92655c7da
4 changed files with 5 additions and 5 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/EmisCommonController.java
View File

@ -555,7 +555,7 @@ public class EmisCommonController extends EmisBaseController
// receiveCountry -- 收件国二字码
rstMap.put("billCode",mainNo);
List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang);
List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(mainNo,lang,false);
rstMap.put("steps",stepList);
rstList.add(rstMap);

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

@ -241,7 +241,7 @@ public class EmisTmsScanRecordController extends EmisBaseController
for (String billCode:billCodeArr) {
Map<String,Object> rstMap = new HashMap<>();
rstMap.put("billCode",billCode);
List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(billCode,lang);
List<Map> stepList=emisTmsScanRecordService.queryWaybillTraceInfo(billCode,lang,true);
rstMap.put("steps",stepList);
rstList.add(rstMap);
}

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

@ -105,7 +105,7 @@ public interface IEmisTmsScanRecordService extends IDataAuditService
* @param lang
* @return
*/
public List<Map> queryWaybillTraceInfo(String billCode, String lang);
public List<Map> queryWaybillTraceInfo(String billCode, String lang,boolean isInner);
/**

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

@ -2592,13 +2592,13 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
// 获取物流跟踪列表
@Override
public List<Map> queryWaybillTraceInfo(String billCode,String lang) {
public List<Map> queryWaybillTraceInfo(String billCode,String lang,boolean isInner) {
List<Map> stepList = new ArrayList<>();
List<EmisTmsScanRecord> listTraceList= getTraceListByBillCode(billCode,true);
for(EmisTmsScanRecord scanRecord:listTraceList){
String content=cvtScanRecordToTraceStr(scanRecord,false);
String content=cvtScanRecordToTraceStr(scanRecord,isInner);
if(content!=null) {
Map<String, Object> step = new HashMap<>();
step.put("time", DateUtils.parseDateToStr(DateUtils.YYYY_MM_DD_HH_MM_SS,scanRecord.getScanDate()));