From 836fa2e43bb088fd203ef137cb9b7ed513c5589d Mon Sep 17 00:00:00 2001 From: "HUOJIN\\92525" Date: Fri, 11 Apr 2025 16:09:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E5=BA=8F=E5=88=97=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../wms/base/address/domain/entity/AddressEntity.java | 4 +++- .../business/wms/base/area/domain/entity/AreaEntity.java | 4 +++- .../wms/base/customer/domain/entity/CustomerEntity.java | 4 +++- .../business/wms/base/item/domain/entity/ItemEntity.java | 4 +++- .../wms/base/location/domain/entity/LocationEntity.java | 5 +++-- .../business/wms/base/stock/domain/entity/StockEntity.java | 4 +++- .../wms/inventory/domain/entity/InventoryEntity.java | 4 +++- .../business/wms/itemKey/domain/entity/ItemKeyEntity.java | 4 +++- .../business/wms/receive/asn/domain/entity/AsnEntity.java | 4 +++- .../wms/receive/asnDetail/domain/entity/AsnDetailEntity.java | 4 +++- .../module/business/wms/task/domain/entity/TaskEntity.java | 4 +++- .../serialnumber/service/impl/SerialNumberInternService.java | 1 - .../serialnumber/service/impl/SerialNumberRedisService.java | 2 ++ 13 files changed, 35 insertions(+), 13 deletions(-) diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/entity/AddressEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/entity/AddressEntity.java index b588fa7..6c46687 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/entity/AddressEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/address/domain/entity/AddressEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.time.LocalDateTime; import lombok.AllArgsConstructor; @@ -25,7 +27,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_address") -public class AddressEntity { +public class AddressEntity implements Serializable { /** * 收货地址id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/entity/AreaEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/entity/AreaEntity.java index e08621e..4dd9dc0 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/entity/AreaEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/area/domain/entity/AreaEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.time.LocalDateTime; import lombok.AllArgsConstructor; @@ -25,7 +27,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_area") -public class AreaEntity { +public class AreaEntity implements Serializable{ /** * 库区id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/entity/CustomerEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/entity/CustomerEntity.java index 00df2cc..6430103 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/entity/CustomerEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/customer/domain/entity/CustomerEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.time.LocalDateTime; import lombok.AllArgsConstructor; @@ -25,7 +27,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_customer") -public class CustomerEntity { +public class CustomerEntity implements Serializable { /** * 客户id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/entity/ItemEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/entity/ItemEntity.java index b55208c..4f3dd64 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/entity/ItemEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/item/domain/entity/ItemEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -26,7 +28,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_item") -public class ItemEntity { +public class ItemEntity implements Serializable { /** * 物料id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/entity/LocationEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/entity/LocationEntity.java index 596ce07..571b867 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/entity/LocationEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/location/domain/entity/LocationEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.time.LocalDateTime; import lombok.AllArgsConstructor; @@ -25,8 +27,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_location") -public class LocationEntity { - +public class LocationEntity implements Serializable{ /** * 库位id */ diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/entity/StockEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/entity/StockEntity.java index 23468e1..0de739e 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/entity/StockEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/base/stock/domain/entity/StockEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.time.LocalDateTime; import lombok.AllArgsConstructor; @@ -25,7 +27,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_stock") -public class StockEntity { +public class StockEntity implements Serializable { /** * 容器id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/entity/InventoryEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/entity/InventoryEntity.java index 977c848..a7bae25 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/entity/InventoryEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/inventory/domain/entity/InventoryEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -27,7 +29,7 @@ import net.lab1024.sa.base.common.util.SmartRequestUtil; @AllArgsConstructor @NoArgsConstructor @TableName("t_inventory") -public class InventoryEntity { +public class InventoryEntity implements Serializable { /** * 库存id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/entity/ItemKeyEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/entity/ItemKeyEntity.java index a6bd3e9..fb2fc99 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/entity/ItemKeyEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/itemKey/domain/entity/ItemKeyEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.time.LocalDate; import java.time.LocalDateTime; @@ -26,7 +28,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_item_key") -public class ItemKeyEntity { +public class ItemKeyEntity implements Serializable { /** * id 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 872ce53..2a88ba0 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 @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDate; import java.time.LocalDateTime; @@ -27,7 +29,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_asn") -public class AsnEntity { +public class AsnEntity implements Serializable { /** * 入库单id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/entity/AsnDetailEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/entity/AsnDetailEntity.java index ec22c39..27b2c3e 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/entity/AsnDetailEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/receive/asnDetail/domain/entity/AsnDetailEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -26,7 +28,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_asn_detail") -public class AsnDetailEntity { +public class AsnDetailEntity implements Serializable { /** * 入库明细id diff --git a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/entity/TaskEntity.java b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/entity/TaskEntity.java index bb9699c..d1bfa4e 100644 --- a/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/entity/TaskEntity.java +++ b/nc_wms_java/sa-admin/src/main/java/net/lab1024/sa/admin/module/business/wms/task/domain/entity/TaskEntity.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; + +import java.io.Serializable; import java.math.BigDecimal; import java.time.LocalDateTime; @@ -26,7 +28,7 @@ import lombok.NoArgsConstructor; @AllArgsConstructor @NoArgsConstructor @TableName("t_task") -public class TaskEntity { +public class TaskEntity implements Serializable { /** * 任务id diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java index 8a21ebc..c37e694 100644 --- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java +++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberInternService.java @@ -21,7 +21,6 @@ import java.util.concurrent.ConcurrentHashMap; * @Email lab1024@163.com * @Copyright 1024创新实验室 */ -@Service public class SerialNumberInternService extends SerialNumberBaseService { /** diff --git a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java index 571e0d9..dfc56fb 100644 --- a/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java +++ b/nc_wms_java/sa-base/src/main/java/net/lab1024/sa/base/module/support/serialnumber/service/impl/SerialNumberRedisService.java @@ -10,6 +10,7 @@ import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberGenera import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberInfoBO; import net.lab1024.sa.base.module.support.serialnumber.domain.SerialNumberLastGenerateBO; import net.lab1024.sa.base.module.support.serialnumber.service.SerialNumberBaseService; +import org.springframework.stereotype.Service; import java.util.List; @@ -23,6 +24,7 @@ import java.util.List; * @Copyright 1024创新实验室 */ @Slf4j +@Service public class SerialNumberRedisService extends SerialNumberBaseService { private static final int MAX_GET_LOCK_COUNT = 5;