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-06-09 18:02:45 +08:00
parent bd82a98c7e
commit b3bad102c3
3 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -89,7 +89,6 @@ public class EmisTmsScanRecordController extends EmisBaseController
emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode()); emisTmsScanRecord.getParams().put("thisSiteCode",getLoginUser().getUser().getOwnerSiteCode());
List<ScanStatDataInfo> list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord); List<ScanStatDataInfo> list = emisTmsScanRecordService.queryScanStatList(emisTmsScanRecord);
return getDataTable(list); return getDataTable(list);
} }
@ -261,6 +260,11 @@ public class EmisTmsScanRecordController extends EmisBaseController
List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord); List<EmisTmsScanRecord> list = emisTmsScanRecordService.selectEmisTmsScanRecordList(emisTmsScanRecord);
return getDataTable(list); return getDataTable(list);
} }

1
emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
View File

@ -120,7 +120,6 @@ public class EmisTmsScanRecord extends BaseEntity
/* 状态 1-启用 0-不启用 */ /* 状态 1-启用 0-不启用 */
private String status; private String status;
// 扩展参数 // 扩展参数
private EmisWaybill waybillDetail; private EmisWaybill waybillDetail;

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

@ -71,7 +71,12 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
@Override @Override
public List<EmisTmsScanRecord> selectEmisTmsScanRecordList(EmisTmsScanRecord emisTmsScanRecord) public List<EmisTmsScanRecord> selectEmisTmsScanRecordList(EmisTmsScanRecord emisTmsScanRecord)
{ {
return emisTmsScanRecordMapper.selectEmisTmsScanRecordList(emisTmsScanRecord); List<EmisTmsScanRecord> listTraceList = emisTmsScanRecordMapper.selectEmisTmsScanRecordList(emisTmsScanRecord);
for(EmisTmsScanRecord scanRecord:listTraceList){
String content=cvtScanRecordToTraceStr(scanRecord,true);
scanRecord.setInnerTraceInfo(content);
}
return listTraceList;
} }
/** /**