From a9eb2c97b0f832adc9d67277c2e08273079cc884 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 24 Sep 2024 10:21:41 +0800
Subject: [PATCH] md

---
 .../com/xdadan/erp/emis/domain/EmisTmsScanRecord.java  | 10 +++++++++-
 .../erp/emis/mapper/EmisTmsScanRecordMapper.java       |  5 +++++
 .../erp/emis/service/IEmisTmsScanRecordService.java    |  3 ++-
 .../service/impl/EmisTmsScanRecordServiceImpl.java     | 10 ++++++++++
 4 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
index 38981f844..e49322ff8 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisTmsScanRecord.java
@@ -12,6 +12,8 @@ package com.xdadan.erp.emis.domain;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
+import com.xdadan.erp.common.annotation.audit.DataAuditField;
+import com.xdadan.erp.common.annotation.audit.DataAuditTable;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.xdadan.erp.common.annotation.Excel;
@@ -31,11 +33,11 @@ import lombok.Data;
  */
 //@JsonInclude(JsonInclude.Include.ALWAYS.NON_NULL)
 @Data
+@DataAuditTable(tableName = "emis_tms_scan_record",tableComment = "扫描记录表")
 public class EmisTmsScanRecord extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 
-
     /* id */
     private Long id;
     /* 扫描运单号 */
@@ -49,8 +51,10 @@ public class EmisTmsScanRecord extends BaseEntity
     /* 扫描类型: 收发到派签  */
     private String scanType;
     /* 上下一站点 */
+    @DataAuditField(fieldComment = "上/下一站名称")
     private String preOrNextStation;
     /* 上下一站点代码,收件:上一站，发件:下一站 */
+    @DataAuditField(fieldComment = "上/下一站代码")
     private String preOrNextStationCode;
     /* 上下站点电话 */
     private String preOrNextStationPhone;
@@ -62,16 +66,20 @@ public class EmisTmsScanRecord extends BaseEntity
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone="GMT+8")
     private Date scanDate;
     /* 扫描员代码 */
+    @DataAuditField(fieldComment = "扫描员代码")
     private String scanManCode;
     /* 扫描员电话 */
     private String scanManPhone;
     /* 扫描员 */
+    @DataAuditField(fieldComment = "扫描员")
     private String scanMan;
     /* 上下一站点人员 */
     private String preOrNextMan;
     /* 扫描站点 */
+    @DataAuditField(fieldComment = "扫描站点")
     private String scanSite;
     /* 扫描站点代码 */
+    @DataAuditField(fieldComment = "扫描站点代码")
     private String scanSiteCode;
     /* 扫描网点代码 */
     private String scanSitePhone;
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
index 767c5dbaf..0cb32d5ba 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/mapper/EmisTmsScanRecordMapper.java
@@ -15,11 +15,15 @@ import java.util.List;
 import java.util.Map;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.xdadan.erp.common.annotation.audit.DataAuditLog;
+import com.xdadan.erp.common.annotation.audit.OperateType;
 import com.xdadan.erp.emis.domain.EmisTmsScanPicInfo;
 import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo;
 import com.xdadan.erp.emis.domain.stat.ScanStatInfoDtl;
+import com.xdadan.erp.emis.service.impl.EmisTmsScanRecordServiceImpl;
+import com.xdadan.erp.emis.service.impl.EmisWaybillServiceImpl;
 import org.apache.ibatis.annotations.Param;
 
 /**
@@ -65,6 +69,7 @@ public interface EmisTmsScanRecordMapper extends BaseMapper<EmisTmsScanRecord>
      * @param emisTmsScanRecord 
      * @return 
      */
+    @DataAuditLog(operateType= OperateType.UPDATE,serviceClass= EmisTmsScanRecordServiceImpl.class)
     public int updateEmisTmsScanRecord(EmisTmsScanRecord emisTmsScanRecord);
 
     /**
diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
index f8f75b59e..0aac19e6e 100644
--- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
+++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisTmsScanRecordService.java
@@ -12,6 +12,7 @@ package com.xdadan.erp.emis.service;
 import java.util.List;
 import java.util.Map;
 
+import com.xdadan.erp.common.core.audit.IDataAuditService;
 import com.xdadan.erp.emis.domain.EmisTmsScanRecord;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.stat.ScanStatDataInfo;
@@ -24,7 +25,7 @@ import com.xdadan.erp.emis.domain.vo.scan.ScanResult;
  * @author linfso
  * @date 2024-03-01 08:54:59
  */
-public interface IEmisTmsScanRecordService 
+public interface IEmisTmsScanRecordService extends IDataAuditService
 {
    /**
      * 主键查询
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 71c22f905..98d01aba4 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
@@ -73,6 +73,16 @@ public class EmisTmsScanRecordServiceImpl extends EmisBaseService implements IEm
     private EmisWaybillProblemInfoMapper emisWaybillProblemInfoMapper;
 
 
+    /**
+     * 获取稽核数据
+     * @param id
+     * @return
+     */
+    @Override
+    public Object getAuditObjectById(Object id) {
+        EmisTmsScanRecord emisTmsScanRecord = emisTmsScanRecordMapper.selectEmisTmsScanRecordById((Long)id);
+        return emisTmsScanRecord;
+    }
 
 
     /**