md

emis-biz-web/emis-biz-web.iml

@@ -60,7 +60,6 @@
     <orderEntry type="library" name="Maven: org.springframework:spring-websocket:5.3.16" level="project" />
     <orderEntry type="library" name="Maven: org.springframework.boot:spring-boot-starter-aop:2.5.10" level="project" />
     <orderEntry type="library" name="Maven: org.springframework:spring-aop:5.3.16" level="project" />
-    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-boot-starter:3.5.0" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus:3.5.0" level="project" />
     <orderEntry type="library" name="Maven: com.baomidou:mybatis-plus-extension:3.5.0" level="project" />
@@ -271,5 +270,6 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
     <orderEntry type="library" name="Maven: com.aspose:aspose-words:19.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
   </component>
 </module>

emis-biz/emis-biz.iml

@@ -230,5 +230,6 @@
     <orderEntry type="library" name="Maven: org.apache.xmlgraphics:batik-codec:1.14" level="project" />
     <orderEntry type="library" name="Maven: com.aspose:aspose-words:19.1.0" level="project" />
     <orderEntry type="library" name="Maven: org.apache.commons:commons-text:1.10.0" level="project" />
+    <orderEntry type="library" name="Maven: org.aspectj:aspectjweaver:1.9.7" level="project" />
   </component>
 </module>

emis-biz/pom.xml

@@ -151,6 +151,10 @@
             <artifactId>commons-text</artifactId>
             <version>1.10.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+        </dependency>
 
 
     </dependencies>

emis-biz/src/main/java/com/xdadan/erp/emis/domain/EmisWaybill.java

@@ -14,6 +14,8 @@ import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 //import com.xdadan.erp.common.annotation.audit.DataAuditFilter;
+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;
@@ -37,6 +39,7 @@ import lombok.Data;
 //@DataAuditFilter
 @Data
 @TableName("emis_waybill")
+@DataAuditTable(tableName = "emis_waybill",tableComment = "运单表")
 public class EmisWaybill extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
@@ -239,9 +242,11 @@ public class EmisWaybill extends BaseEntity
     private Integer parcelQty;
     /* 实际重量 */
     @TableField
+    @DataAuditField(fieldComment = "实际重量")
     private BigDecimal billWeight;
     /* 体积重量 */
     @TableField
+    @DataAuditField(fieldComment = "体积重量")
     private BigDecimal volumeWeight;
     /* 费用币种 */
     private String currency;

emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisBrandService.java

@@ -10,6 +10,7 @@
 package com.xdadan.erp.emis.service;
 
 import java.util.List;
+
 import com.xdadan.erp.emis.domain.EmisBrand;
 
 /**

emis-biz/src/main/java/com/xdadan/erp/emis/service/IEmisWaybillService.java

@@ -14,6 +14,8 @@ import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
 
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.xdadan.erp.common.core.audit.IDataAuditParser;
 import com.xdadan.erp.emis.domain.EmisWaybill;
 import com.xdadan.erp.emis.domain.exception.EmisBizError;
 import com.xdadan.erp.emis.domain.vo.AddressParseResult;
@@ -27,7 +29,7 @@ import javax.servlet.http.HttpServletResponse;
  * @author linfso
  * @date 2024-02-29 08:15:14
  */
-public interface IEmisWaybillService 
+public interface IEmisWaybillService extends IDataAuditParser
 {
 
 

emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisWaybillServiceImpl.java

@@ -113,7 +113,18 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
     @Autowired
     private ISysFileInfoService sysFileInfoService;
 
-
+    /**
+     * 获取稽核数据
+     * @param id
+     * @param dataAuditLog
+     * @param pkIdName
+     * @return
+     */
+    @Override
+    public Object getAuditObjectById(Object id, DataAuditLog dataAuditLog, String pkIdName) {
+        EmisWaybill emisWaybill = emisWaybillMapper.selectEmisWaybillById((Long)id);
+        return emisWaybill;
+    }
 
     @Override
     public EmisWaybill selectById(Long id)
@@ -3428,6 +3439,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
 
 
 
+
+
     public static void main(String[] args) {
 
 //        Snowflake snowflake = IdUtil.getSnowflake(0, 0);
@@ -3444,7 +3457,8 @@ public class EmisWaybillServiceImpl extends EmisBaseService implements IEmisWayb
         double fee = Double.valueOf(AviatorEvaluator.execute(calcExprStr).toString());
         System.out.println(fee);
 
-
     }
 
+
+
 }