From 728129555c243c86c2a0295b2a2058367846db88 Mon Sep 17 00:00:00 2001
From: "HUOJIN\\92525" <925258474@qq.com>
Date: Thu, 24 Apr 2025 16:00:05 +0800
Subject: [PATCH] no message

---
 .../wms/receive/asn/domain/entity/AsnEntity.java | 16 ++++++++++++++++
 .../receive/asn/service/impl/AsnServiceImpl.java |  1 -
 .../service/DataTracerChangeContentService.java  |  2 +-
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java
index 2a88ba0..ced6ad9 100644
--- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java
+++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/domain/entity/AsnEntity.java
@@ -15,6 +15,11 @@ import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
+import net.lab1024.sa.admin.module.business.oa.enterprise.constant.EnterpriseTypeEnum;
+import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum;
+import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderTypeEnum;
+import net.lab1024.sa.base.module.support.datatracer.annoation.DataTracerFieldEnum;
+import net.lab1024.sa.base.module.support.datatracer.annoation.DataTracerFieldLabel;
 
 /**
  * 入库单 实体类
@@ -40,46 +45,57 @@ public class AsnEntity implements Serializable {
     /**
      * 入库单号
      */
+    @DataTracerFieldLabel("入库单号")
     private String asnNumber;
 
     /**
      * 客户订单号
      */
+    @DataTracerFieldLabel("客户订单号")
     private String customerNumber;
 
     /**
      * 单据类型
      */
+    @DataTracerFieldLabel("单据类型")
+    @DataTracerFieldEnum(enumClass = AsnOrderTypeEnum.class)
     private String orderType;
 
     /**
      * 状态
      */
+    @DataTracerFieldLabel("状态")
+    @DataTracerFieldEnum(enumClass = AsnOrderStatusEnum.class)
     private String status;
 
     /**
      * 收货单位
      */
+    @DataTracerFieldLabel("收货单位")
     private Long addressId;
 
     /**
      * 联系人
      */
+    @DataTracerFieldLabel("联系人")
     private String person;
 
     /**
      * 电话
      */
+    @DataTracerFieldLabel("电话")
     private String telephone;
 
     /**
      * 地址
      */
+    @DataTracerFieldLabel("地址")
     private String address;
 
     /**
      * 客户
      */
+    @DataTracerFieldLabel("客户")
     private Long customerId;
 
     /**
diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/impl/AsnServiceImpl.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/impl/AsnServiceImpl.java
index d59c4ac..fb91315 100644
--- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/impl/AsnServiceImpl.java
+++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asn/service/impl/AsnServiceImpl.java
@@ -2,7 +2,6 @@ package net.lab1024.sa.admin.module.business.wms.receive.asn.service.impl;
 
 import jakarta.annotation.Resource;
 import net.lab1024.sa.admin.module.business.wms.receive.asn.constant.AsnOrderStatusEnum;
-import net.lab1024.sa.admin.module.business.wms.receive.asn.dao.AsnDao;
 import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.entity.AsnEntity;
 import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnAddForm;
 import net.lab1024.sa.admin.module.business.wms.receive.asn.domain.form.AsnUpdateForm;
diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
index e872c7b..2b159fa 100644
--- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
+++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/datatracer/service/DataTracerChangeContentService.java
@@ -430,7 +430,7 @@ public class DataTracerChangeContentService {
         // 从缓存中查询
         Class<?> tClass = obj.getClass();
         List<Field> fieldList = fieldMap.get(tClass);
-        if (null != fieldList) {
+        if (CollectionUtils.isNotEmpty(fieldList)) {
             return fieldList;
         }