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

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

@ -1,10 +1,10 @@
/**
/**
* @Project: emis
* @Title: EmisTmsScanRecordServiceImpl.java
* @author linfso
* @date 2024-03-01 08:54:59
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @version v1.0
* @Description: <p> TMS扫描记录 实体类 </p>
*/
@ -43,7 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
/**
* TMS扫描记录Service业务层处理
*
*
* @author linfso
* @date 2024-03-01 08:54:59
*/
@ -88,7 +88,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
/**
* 查询TMS扫描记录
*
*
* @param id TMS扫描记录主键
* @return TMS扫描记录
*/
@ -124,7 +124,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
/**
* 查询TMS扫描记录列表
*
*
* @param emisTmsScanRecord TMS扫描记录
* @return TMS扫描记录
*/
@ -171,7 +171,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
/**
* 新增TMS扫描记录
*
*
* @param emisTmsScanRecord TMS扫描记录
* @return 结果
*/
@ -183,7 +183,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
/**
* 修改TMS扫描记录
*
*
* @param emisTmsScanRecord TMS扫描记录
* @return 结果
*/
@ -195,7 +195,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
/**
* 批量删除TMS扫描记录
*
*
* @param ids 需要删除的TMS扫描记录主键
* @return 结果
*/
@ -207,7 +207,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
/**
* 删除TMS扫描记录信息
*
*
* @param id TMS扫描记录主键
* @return 结果
*/
@ -1841,7 +1841,7 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
String scanTypeLabel = DictUtils.getDictLabel("emis_scan_type", emisTmsScanRecord.getScanType());
// 记录扫描操作日志
recordWaybillOperLog(
mainBillCode,
scanBillCode,
WaybillOperLogType.SITE_DO_SCAN,
getCurrentUser().getEmpName(),
getCurrentUser().getOwnerSiteName(),

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

@ -1,10 +1,10 @@
/**
/**
* @Project: emis
* @Title: EmisWaybillOperLogServiceImpl.java
* @author linfso
* @date 2025-01-20 15:55:57
* @Copyright: ShangHai Duta 2022 All rights reserved.
* @version v1.0
* @version v1.0
* @Description: <p> 运单操作日志 实体类 </p>
*/
@ -19,19 +19,19 @@ import com.xdadan.erp.emis.service.IEmisWaybillOperLogService;
/**
* 运单操作日志Service业务层处理
*
*
* @author linfso
* @date 2025-01-20 15:55:57
*/
@Service
public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
{
@Autowired
private EmisWaybillOperLogMapper emisWaybillOperLogMapper;
/**
* 查询运单操作日志
*
*
* @param id 运单操作日志主键
* @return 运单操作日志
*/
@ -44,7 +44,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
/**
* 查询运单操作日志列表
*
*
* @param emisWaybillOperLog 运单操作日志
* @return 运单操作日志
*/
@ -55,15 +55,29 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
}
@Override
public List<EmisWaybillOperLog> selectListByMainBillCode(String mainBillCode)
{
return emisWaybillOperLogMapper.selectListByMainBillCode(mainBillCode);
public List<EmisWaybillOperLog> selectListByMainBillCode(String mainBillCode) {
List<EmisWaybillOperLog> list = 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;
}
/**
* 检查是否重复
*
* @param emisWaybillOperLog
*
* @param emisWaybillOperLog
* @return 数量
*/
@Override
@ -74,7 +88,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
/**
* 新增运单操作日志
*
*
* @param emisWaybillOperLog 运单操作日志
* @return 结果
*/
@ -86,7 +100,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
/**
* 修改运单操作日志
*
*
* @param emisWaybillOperLog 运单操作日志
* @return 结果
*/
@ -98,7 +112,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
/**
* 批量删除运单操作日志
*
*
* @param ids 需要删除的运单操作日志主键
* @return 结果
*/
@ -110,7 +124,7 @@ public class EmisWaybillOperLogServiceImpl implements IEmisWaybillOperLogService
/**
* 删除运单操作日志信息
*
*
* @param id 运单操作日志主键
* @return 结果
*/