From 84a9a6a490ff3a3fcc1d70eeeb4c5e1d42822a02 Mon Sep 17 00:00:00 2001
From: aike <17730485278@139.com>
Date: Tue, 11 Nov 2025 14:15:40 +0800
Subject: [PATCH] =?UTF-8?q?demand:=20=20=20=20tms-=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E7=AE=A1=E7=90=86-=E5=8F=91=E4=BB=B6=E6=89=AB=E6=8F=8F?=
=?UTF-8?q?=E3=80=81=E5=88=B0=E4=BB=B6=E6=89=AB=E6=8F=8F=E7=AD=89=E6=89=AB?=
=?UTF-8?q?=E6=8F=8F-=E6=89=AB=E6=8F=8F=E6=97=A5=E5=BF=97=E4=BF=9D?=
=?UTF-8?q?=E5=AD=98=E5=AD=90=E5=8D=95=E5=8F=B7=EF=BC=8C=E5=8C=BA=E5=88=86?=
=?UTF-8?q?=E5=AD=90=E5=8D=95-=E4=B8=BB=E5=8D=95=20=20tms-=E5=AE=A2?=
=?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86-=E5=BF=AB=E4=BB=B6=E8=B7=9F?=
=?UTF-8?q?=E8=B8=AA-=E6=97=A5=E5=BF=97=E8=AE=B0=E5=BD=95-=E5=AD=90?=
=?UTF-8?q?=E5=8D=95=E6=89=AB=E6=8F=8F=E6=8B=BC=E6=8E=A5=E5=AD=90=E5=8D=95?=
=?UTF-8?q?=E5=8F=B7=E5=81=9A=E5=8C=BA=E5=88=86=20committer:=20heyu?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../impl/EmisTmsScanRecordServiceImpl.java | 20 ++++-----
.../impl/EmisWaybillOperLogServiceImpl.java | 44 ++++++++++++-------
2 files changed, 39 insertions(+), 25 deletions(-)
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 f4b8633c5..acb38e0b4 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
@@ -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: TMS扫描记录 实体类
*/
@@ -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(),
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java
index 1d130f381..dbfeb340b 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillOperLogServiceImpl.java
@@ -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: 运单操作日志 实体类
*/
@@ -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 selectListByMainBillCode(String mainBillCode)
- {
- return emisWaybillOperLogMapper.selectListByMainBillCode(mainBillCode);
+ public List selectListByMainBillCode(String mainBillCode) {
+ List 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 结果
*/