aike/emis-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

demand: tms-扫描管理-发件扫描、到件扫描等扫描-扫描日志保存子单号，区分子单-主单 tms-客户管理-快件跟踪-日志记录-子单扫描拼接子单号做区分

Browse Source 
committer: heyu
This commit is contained in:
aike 2025-11-11 14:15:40 +08:00
parent 588b3d3a78
commit 84a9a6a490
2 changed files with 39 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1841,7 +1841,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", emisTmsScanRecord.getScanType()); String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", emisTmsScanRecord.getScanType());
// 记录扫描操作日志 // 记录扫描操作日志
recordWaybillOperLog( recordWaybillOperLog(
mainBillCode, scanBillCode,
WaybillOperLogType.SITE_DO_SCAN, WaybillOperLogType.SITE_DO_SCAN,
getCurrentUser().getEmpName(), getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(), getCurrentUser().getOwnerSiteName(),

20
emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java
View File

@ -55,9 +55,23 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
} }
@Override @Override
public List<EmisWaybillOperLog> selectListByMainBillCode(String mainBillCode) public List<EmisWaybillOperLog> selectListByMainBillCode(String mainBillCode) {
{ List<EmisWaybillOperLog> list = emisWaybillOperLogMapper.selectListByMainBillCode(mainBillCode);
return emisWaybillOperLogMapper.selectListByMainBillCode(mainBillCode); if (list != null && mainBillCode != null) {
for (EmisWaybillOperLog log : list) {
if (log != null && log.getBillCode() != null
&& log.getBillCode().length() > mainBillCode.length()) {
String opDesc = log.getOpDesc();
if (opDesc == null) {
opDesc = "子单" + log.getBillCode();
} else {
opDesc = opDesc + "-子单-" + log.getBillCode();
}
log.setOpDesc(opDesc);
}
}
}
return list;
} }
/** /**