From 9cfcc5ea43e70718abf44e38f8366a03d9d7d5d2 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 21 Dec 2023 08:02:36 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/balance/vo/BalanceBaseVO.java | 3 +++ .../container/vo/ContainerDetailBaseVO.java | 9 ++++++--- .../container/vo/ContainerMainBaseVO.java | 9 ++++++--- .../expectin/vo/ExpectinBaseVO.java | 3 +++ .../expectout/vo/ExpectoutBaseVO.java | 9 ++++++--- .../vo/LocationcapacityBaseVO.java | 11 ++++++----- .../packageMassage/vo/PackageBaseVO.java | 3 +++ .../strategy/vo/StrategyBaseVO.java | 3 +++ .../transaction/vo/TransactionBaseVO.java | 3 +++ .../transferlog/vo/TransferlogBaseVO.java | 14 +++++++------- .../wms/dal/dataobject/balance/BalanceDO.java | 6 ++++++ .../container/ContainerDetailDO.java | 15 ++++++++++++--- .../dataobject/container/ContainerMainDO.java | 15 ++++++++++++--- .../dal/dataobject/expectin/ExpectinDO.java | 6 ++++++ .../dal/dataobject/expectout/ExpectoutDO.java | 6 ++++++ .../locationcapacity/LocationcapacityDO.java | 16 +++++++++++----- .../dataobject/packageMassage/PackageDO.java | 19 +++++++++++-------- .../dal/dataobject/strategy/StrategyDO.java | 4 +++- .../dataobject/transaction/TransactionDO.java | 6 ++++++ .../dataobject/transferlog/TransferlogDO.java | 18 ++++++++++++------ 20 files changed, 131 insertions(+), 47 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceBaseVO.java index 529080ff..4efad131 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceBaseVO.java @@ -101,4 +101,7 @@ public class BalanceBaseVO { @Schema(description = "体积") private BigDecimal volume; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailBaseVO.java index b2527ae8..763727cb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailBaseVO.java @@ -1,10 +1,10 @@ package com.win.module.wms.controller.container.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import javax.validation.constraints.*; /** * 器具子 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -38,4 +38,7 @@ public class ContainerDetailBaseVO { @Schema(description = "数量") private BigDecimal qty; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainBaseVO.java index b2999c02..4bba2a0b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerMainBaseVO.java @@ -1,10 +1,10 @@ package com.win.module.wms.controller.container.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import javax.validation.constraints.*; /** * 器具主 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -35,4 +35,7 @@ public class ContainerMainBaseVO { @NotNull(message = "货主代码不能为空") private String ownerCode; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java index 2c1f3f20..195a353a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectin/vo/ExpectinBaseVO.java @@ -53,4 +53,7 @@ public class ExpectinBaseVO { @Schema(description = "货主代码") private String ownerCode; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutBaseVO.java index 7103f5b0..7ab68bb7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutBaseVO.java @@ -1,10 +1,10 @@ package com.win.module.wms.controller.expectout.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; +import lombok.Data; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import javax.validation.constraints.*; /** * 预计出库存 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -56,4 +56,7 @@ public class ExpectoutBaseVO { @Schema(description = "货主代码") private String ownerCode; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityBaseVO.java index a6d00f70..df6c40eb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationcapacity/vo/LocationcapacityBaseVO.java @@ -1,12 +1,10 @@ package com.win.module.wms.controller.locationcapacity.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; +import lombok.Data; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; -import javax.validation.constraints.*; /** * 库位容量 Base VO，提供给添加、修改、详细的子 VO 使用 @@ -41,4 +39,7 @@ public class LocationcapacityBaseVO { @NotNull(message = "是否无限容量不能为空") private String isInfinity; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java index 9c279671..4d3c5be6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java @@ -156,4 +156,7 @@ public class PackageBaseVO { @Schema(description = "生产线") private String productionLineCodePackage; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyBaseVO.java index 94b2ba5e..decdc3d5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyBaseVO.java @@ -40,4 +40,7 @@ public class StrategyBaseVO { @NotNull(message = "是否生效不能为空") private String isActive; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionBaseVO.java index 57fe6816..e664f845 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionBaseVO.java @@ -111,4 +111,7 @@ public class TransactionBaseVO { @Schema(description = "货主代码") private String ownerCode; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogBaseVO.java index 12b93122..bcf4995e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogBaseVO.java @@ -1,15 +1,12 @@ package com.win.module.wms.controller.transferlog.vo; import io.swagger.v3.oas.annotations.media.Schema; -import lombok.*; -import java.util.*; -import java.time.LocalDateTime; +import lombok.Data; +import org.springframework.format.annotation.DateTimeFormat; + +import javax.validation.constraints.NotNull; import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import javax.validation.constraints.*; -import org.springframework.format.annotation.DateTimeFormat; import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND; @@ -160,4 +157,7 @@ public class TransferlogBaseVO { @NotNull(message = "到货主代码不能为空") private String toOwnerCode; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/balance/BalanceDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/balance/BalanceDO.java index b08707da..d555453b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/balance/BalanceDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/balance/BalanceDO.java @@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.balance; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -125,6 +126,11 @@ public class BalanceDO extends BaseDO { * 枚举 {@link TODO frozen_reason 对应的类} */ private String frozenReason; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; /** * 最后事务号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerDetailDO.java index f37f28a3..45f2e58a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerDetailDO.java @@ -1,10 +1,14 @@ package com.win.module.wms.dal.dataobject.container; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; + import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 器具子 DO @@ -63,5 +67,10 @@ public class ContainerDetailDO extends BaseDO { * 数量 */ private BigDecimal qty; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerMainDO.java index f957053a..b5a71030 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerMainDO.java @@ -1,10 +1,14 @@ package com.win.module.wms.dal.dataobject.container; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; + import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 器具主 DO @@ -53,5 +57,10 @@ public class ContainerMainDO extends BaseDO { * 货主代码 */ private String ownerCode; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java index 530b4c8c..2830f51f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectin/ExpectinDO.java @@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.expectin; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -72,5 +73,10 @@ public class ExpectinDO extends BaseDO { * 货主代码 */ private String ownerCode; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java index e1357108..2aa07af2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java @@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.expectout; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -76,5 +77,10 @@ public class ExpectoutDO extends BaseDO { * 货主代码 */ private String ownerCode; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/locationcapacity/LocationcapacityDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/locationcapacity/LocationcapacityDO.java index 2f0c755b..a665810b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/locationcapacity/LocationcapacityDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/locationcapacity/LocationcapacityDO.java @@ -1,12 +1,13 @@ package com.win.module.wms.dal.dataobject.locationcapacity; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.math.BigDecimal; -import java.math.BigDecimal; + import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 库位容量 DO @@ -51,5 +52,10 @@ public class LocationcapacityDO extends BaseDO { * 是否无限容量 */ private String isInfinity; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java index 974c734e..a9930a31 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java @@ -1,16 +1,14 @@ package com.win.module.wms.dal.dataobject.packageMassage; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.math.BigDecimal; -import java.math.BigDecimal; -import java.math.BigDecimal; + import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; +import java.time.LocalDateTime; /** * 包装 DO @@ -201,5 +199,10 @@ public class PackageDO extends BaseDO { * 体积 */ private String volume; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java index e5ef51ee..c6aa467b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java @@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.strategy; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -78,7 +79,8 @@ public class StrategyDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 地点ID */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transaction/TransactionDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transaction/TransactionDO.java index e916500c..0c26a48e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transaction/TransactionDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transaction/TransactionDO.java @@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.transaction; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -139,5 +140,10 @@ public class TransactionDO extends BaseDO { * 货主代码 */ private String ownerCode; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferlog/TransferlogDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferlog/TransferlogDO.java index 93b95e7f..54ceaed6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferlog/TransferlogDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferlog/TransferlogDO.java @@ -1,14 +1,15 @@ package com.win.module.wms.dal.dataobject.transferlog; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; +import com.sun.xml.bind.v2.TODO; +import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; + import java.math.BigDecimal; import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import com.baomidou.mybatisplus.annotation.*; -import com.win.framework.mybatis.core.dataobject.BaseDO; /** * 库存转移日志 DO @@ -179,5 +180,10 @@ public class TransferlogDO extends BaseDO { * 到货主代码 */ private String toOwnerCode; + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } From 17de40acb229ff6c3c69199e0088fa4c2af674cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Thu, 21 Dec 2023 08:31:29 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E7=94=9F=E4=BA=A7=E9=80=80=E6=96=99?= =?UTF-8?q?=E7=9B=B4=E6=8E=A5=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/ProductionreturnRecordMainBaseVO.java | 1 - .../ProductionreturnRecordMainServiceImpl.java | 16 ++++++++-------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java index 577e31a3..89d6e23e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java @@ -24,7 +24,6 @@ public class ProductionreturnRecordMainBaseVO { private Long id; @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "申请单号不能为空") private String requestNumber; @Schema(description = "任务单号") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java index a34a7f23..de9030f4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java @@ -124,13 +124,13 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe for (ProductionreturnRecordDetailDO detailDO : subDOList) { detailDO.setMasterId(mainDO.getId()); detailDO.setNumber(number); - LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode()); - if(locationDOFrom != null) { - detailDO.setFromAreaCode(locationDOFrom.getAreaCode()); - detailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); - } else { - throw exception(LOCATION_NOT_EXISTS); - } +// LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode()); +// if(locationDOFrom != null) { +// detailDO.setFromAreaCode(locationDOFrom.getAreaCode()); +// detailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode()); +// } else { +// throw exception(LOCATION_NOT_EXISTS); +// } LocationDO locationDOTo = locationService.selectLocation(detailDO.getToLocationCode()); if(locationDOTo != null) { detailDO.setToAreaCode(locationDOTo.getAreaCode()); @@ -149,7 +149,7 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe throw exception(ITEMBASIC_NOT_EXISTS); } //查询库存余额 - BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode()); + BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getToLocationCode()); if (balanceDO == null) { throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS); } From aac0390374dd148b4b7c338cc2a581c50385b0a8 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Dec 2023 09:16:41 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81DO/VO=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/CustomerreceiptRecordMainBaseVO.java | 3 +++ .../vo/CustomerreceiptRequestMainBaseVO.java | 3 +++ .../customerreturnJob/vo/CustomerreturnJobMainBaseVO.java | 2 ++ .../vo/CustomerreturnRecordMainBaseVO.java | 2 ++ .../vo/CustomerreturnRequestMainBaseVO.java | 3 +++ .../vo/CustomersettleRecordMainBaseVO.java | 2 ++ .../vo/CustomersettleRequestMainBaseVO.java | 2 ++ .../controller/deliverJob/vo/DeliverJobMainBaseVO.java | 2 ++ .../controller/deliverPlan/vo/DeliverPlanMainBaseVO.java | 2 ++ .../deliverRecord/vo/DeliverRecordMainBaseVO.java | 2 ++ .../deliverRequest/vo/DeliverRequestMainBaseVO.java | 3 +++ .../vo/InventorychangeRecordMainBaseVO.java | 3 +++ .../vo/InventorychangeRequestMainBaseVO.java | 2 ++ .../inventorymoveJob/vo/InventorymoveJobMainBaseVO.java | 2 ++ .../vo/InventorymoveRecordMainBaseVO.java | 2 ++ .../vo/InventorymoveRequestMainExcelVO.java | 3 +++ .../CustomerreceiptRecordMainDO.java | 6 +----- .../CustomerreceiptRequestMainDO.java | 2 +- .../customerreturnJob/CustomerreturnJobMainDO.java | 2 ++ .../CustomerreturnRequestMainDO.java | 1 + .../CustomersettleRequestMainDO.java | 1 + .../wms/dal/dataobject/deliverJob/DeliverJobMainDO.java | 1 + .../wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java | 1 + .../dal/dataobject/deliverRecord/DeliverRecordMainDO.java | 6 +----- .../dataobject/deliverRequest/DeliverRequestMainDO.java | 1 + .../InventorychangeRequestMainDO.java | 1 + .../inventorymoveJob/InventorymoveJobMainDO.java | 1 + .../inventorymoveRequest/InventorymoveRequestMainDO.java | 1 + .../CustomerreturnRecordMainServiceImpl.java | 5 +++++ .../CustomerreturnRequestMainServiceImpl.java | 1 + .../deliverRecord/DeliverRecordMainServiceImpl.java | 5 +++++ .../deliverRequest/DeliverRequestMainServiceImpl.java | 1 + .../InventorymoveRecordMainServiceImpl.java | 8 +++++++- .../InventorymoveRequestMainServiceImpl.java | 1 + 34 files changed, 71 insertions(+), 12 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java index 683ce5c4..642f008f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java @@ -115,4 +115,7 @@ public class CustomerreceiptRecordMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java index b9ea404b..aa34f71f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java @@ -115,4 +115,7 @@ public class CustomerreceiptRequestMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatus; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java index b8ab8d16..9d44b7d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java @@ -169,4 +169,6 @@ public class CustomerreturnJobMainBaseVO { @Schema(description = "允许修改箱码") private String allowModifyPackingNumber; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java index 7de85ff2..b560b083 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java @@ -123,4 +123,6 @@ public class CustomerreturnRecordMainBaseVO { @Schema(description = "从库区代码范围") private String fromAreaCodes; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java index 8a5d08d5..d58d8617 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java @@ -122,4 +122,7 @@ public class CustomerreturnRequestMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatus; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java index e94785b9..06897bf4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java @@ -94,4 +94,6 @@ public class CustomersettleRecordMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java index 0ef5575d..0ab2a35f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java @@ -91,4 +91,6 @@ public class CustomersettleRequestMainBaseVO { @Schema(description = "直接生成记录") private String directCreateRecord; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java index f42a1019..4c5851a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java @@ -172,4 +172,6 @@ public class DeliverJobMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatuses; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java index 09835003..54f2d30b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java @@ -62,4 +62,6 @@ public class DeliverPlanMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java index 080fbc20..00bb5583 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java @@ -123,4 +123,6 @@ public class DeliverRecordMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java index f8f0d0e8..3e17fc76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java @@ -120,4 +120,7 @@ public class DeliverRequestMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatus; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java index 43c8d672..86660b5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java @@ -90,4 +90,7 @@ public class InventorychangeRecordMainBaseVO { @Schema(description = "状态") private String status; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java index a1d653d2..11ab89be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java @@ -78,4 +78,6 @@ public class InventorychangeRequestMainBaseVO { @NotNull(message = "直接生成记录不能为空") private String directCreateRecord; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java index e766e872..30fdeb85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java @@ -150,4 +150,6 @@ public class InventorymoveJobMainBaseVO { @Schema(description = "允许修改箱码") private String allowModifyPackingNumber; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java index c238286f..b83f5500 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java @@ -118,4 +118,6 @@ public class InventorymoveRecordMainBaseVO { @NotNull(message = "是否可用不能为空") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java index d542badd..4eab7494 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java @@ -174,4 +174,7 @@ public class InventorymoveRequestMainExcelVO { @ExcelProperty("物品代码") private String itemCode; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java index 9776a1df..8d8f132c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java @@ -1,11 +1,7 @@ package com.win.module.wms.dal.dataobject.customerreceiptRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java index 2cf7535e..ef973584 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java @@ -114,6 +114,7 @@ public class CustomerreceiptRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 从库位类型范围 @@ -163,5 +164,4 @@ public class CustomerreceiptRequestMainDO extends BaseDO { * 出库库存状态范围 */ private String outInventoryStatuses; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java index 24b1f22e..5645a9ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.customerreturnJob; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -104,6 +105,7 @@ public class CustomerreturnJobMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java index f55023da..bd3c970e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java @@ -112,6 +112,7 @@ public class CustomerreturnRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java index 0956200b..2a4a2a33 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java @@ -105,6 +105,7 @@ public class CustomersettleRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java index c69f1b5d..dffe76b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java @@ -106,6 +106,7 @@ public class DeliverJobMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java index 65930868..cfdfe997 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java @@ -79,6 +79,7 @@ public class DeliverPlanMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java index 42674df6..5259c9d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java @@ -1,11 +1,7 @@ package com.win.module.wms.dal.dataobject.deliverRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java index 3ef5b41d..31e34436 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java @@ -128,6 +128,7 @@ public class DeliverRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java index 34b854e7..b38f1285 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java @@ -74,6 +74,7 @@ public class InventorychangeRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 自动提交 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java index d7cc7f49..5e37103a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java @@ -75,6 +75,7 @@ public class InventorymoveJobMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java index 76282f5c..a8760228 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java @@ -74,6 +74,7 @@ public class InventorymoveRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 从仓库代码 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java index 16f7c22c..375b7870 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java @@ -33,6 +33,7 @@ import javax.annotation.Resource; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import java.time.LocalDateTime; import java.util.*; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO; @@ -85,6 +86,10 @@ public class CustomerreturnRecordMainServiceImpl implements CustomerreturnRecord mainDO.setNumber(number); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerreturnRecord"); mainDO.setBusinessType(businesstypeDO.getCode()); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + mainDO.setDepartmentCode(user.getDeptId().toString()); + mainDO.setExecuteTime(LocalDateTime.now()); + mainDO.setActiveDate(LocalDateTime.now()); mainDO.setAvailable("TRUE"); customerreturnRecordMainMapper.insert(mainDO); //库存事务 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 3e0b17eb..2c9b572e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -336,6 +336,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque customerreturnJobMainDO.setCreateTime(null); customerreturnJobMainDO.setUpdater(null); customerreturnJobMainDO.setUpdateTime(null); + customerreturnJobMainDO.setConcurrencyStamp("1"); customerreturnJobMainDO.setInInventoryStatuses(mainDO.getInInventoryStatuses()); customerreturnJobMainDO.setOutInventoryStatuses(mainDO.getOutInventoryStatuses()); // 获取任务单据设置 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index 650ce1ed..d1fcd239 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; +import com.win.module.system.api.dept.DeptApi; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; @@ -75,6 +76,8 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { private RecordsettingService recordsettingService; @Resource private LocationService locationService; + @Resource + private DeptApi deptApi; @Override @Transactional @@ -85,6 +88,8 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { List subDOList = DeliverRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); String number = serialNumberApi.generateCode(RuleCodeEnum.DELIVER_RECORD.getCode()); mainDO.setNumber(number); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + mainDO.setDepartmentCode(user.getDeptId().toString()); mainDO.setExecuteTime(LocalDateTime.now()); mainDO.setActiveDate(LocalDateTime.now()); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("DeliverRecord"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java index 72fc2d52..2b88f77d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java @@ -581,6 +581,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService deliverJobMainDO.setUpdater(null); deliverJobMainDO.setUpdateTime(null); deliverJobMainDO.setStatus("1"); + deliverJobMainDO.setConcurrencyStamp("1"); // 获取任务单据设置 JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("DeliverJob"); deliverJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java index 4372b27b..33bed38c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; +import java.time.LocalDateTime; import java.util.*; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; @@ -96,11 +97,16 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRecord"); }else if("InventoryMoveRecord".equals(mainDO.getBusinessType())){ - number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); + number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode()); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord"); } mainDO.setNumber(number); mainDO.setBusinessType(businesstypeDO.getCode()); + mainDO.setInterfaceType(recordsettingDO.getInterfaceType()); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + mainDO.setDepartmentCode(user.getDeptId().toString()); + mainDO.setExecuteTime(LocalDateTime.now()); + mainDO.setActiveDate(LocalDateTime.now()); mainDO.setAvailable("TRUE"); inventorymoveRecordMainMapper.insert(mainDO); //库存事务 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index bd7b14b8..18be7b1e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -673,6 +673,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest inventorymoveJobMainDO.setCreateTime(null); inventorymoveJobMainDO.setUpdater(null); inventorymoveJobMainDO.setUpdateTime(null); + inventorymoveJobMainDO.setConcurrencyStamp("1"); inventorymoveJobMainDO.setExpiredTime(inventorymoveJobMainDO.getRequestDueTime()); inventorymoveJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); inventorymoveJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation()); From feaee411376681c1fa3af9a4bcd1a9db34d9282b Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Dec 2023 09:28:57 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81DO/VO=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/InventorymoveRequestMainBaseVO.java | 2 ++ .../vo/InventorymoveRequestMainExcelVO.java | 3 --- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainBaseVO.java index cd1c78e9..11b01fb2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainBaseVO.java @@ -98,4 +98,6 @@ public class InventorymoveRequestMainBaseVO { @NotNull(message = "直接生成记录不能为空") private String directCreateRecord; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java index 4eab7494..d542badd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java @@ -174,7 +174,4 @@ public class InventorymoveRequestMainExcelVO { @ExcelProperty("物品代码") private String itemCode; - - @Schema(description = "乐观锁") - private Integer concurrencyStamp; } From dcd94591d0bb6952be8b4dcb9351ead8279d88df Mon Sep 17 00:00:00 2001 From: yejiaxing <591141169@qq.com> Date: Thu, 21 Dec 2023 09:37:14 +0800 Subject: [PATCH 5/6] =?UTF-8?q?BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/wms/enums/DictTypeConstants.java | 1 + .../purchase/vo/PurchaseDetailBaseVO.java | 4 +- .../vo/PurchasePlanMainExcelVO.java | 27 +++---- ...upplierinvoiceRequestDetailController.java | 4 + .../SupplierinvoiceRequestMainController.java | 11 ++- .../SupplierinvoiceRequestMainPageReqVO.java | 3 + .../dataobject/purchase/PurchaseDetailDO.java | 4 +- .../dataobject/purchase/PurchaseMainDO.java | 3 +- .../purchasePlan/PurchasePlanDetailDO.java | 4 +- .../purchasePlan/PurchasePlanMainDO.java | 4 +- .../PurchaseclaimRequestDetailDO.java | 3 +- .../PurchaseclaimRequestMainDO.java | 4 +- .../SupplierdeliverRequestDetailDO.java | 3 +- .../SupplierdeliverRequestMainDO.java | 3 +- .../SupplierinvoiceRequestMainDO.java | 3 +- .../purchase/PurchaseMainServiceImpl.java | 8 +- .../PurchasePlanMainServiceImpl.java | 39 ++++++++- ...SupplierdeliverRequestMainServiceImpl.java | 10 ++- .../SupplierinvoiceRequestMainService.java | 8 ++ ...SupplierinvoiceRequestMainServiceImpl.java | 79 +++++++++++++++++++ 20 files changed, 193 insertions(+), 32 deletions(-) diff --git a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java index f728351f..cde8a4ff 100644 --- a/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java +++ b/win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java @@ -68,6 +68,7 @@ public interface DictTypeConstants { String INVENTORY_STATUS = "inventory_status";//库存状态 String REQUEST_STATUS = "request_status";//请求状态 String PLAN_STATUS = "plan_status";//计划状态 + String PURCHASE_PLAN_STATUS = "purchase_plan_status";//计划状态 String PURCHASE_ORDER_TYPE = "purchase_order_type";//采购订单类型 String PURCHASE_RETURN_REASON = "purchase_return_reason";//原因 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java index a4dbce86..32684509 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchase/vo/PurchaseDetailBaseVO.java @@ -114,8 +114,8 @@ public class PurchaseDetailBaseVO { @Schema(description = "最后更新者用户名") private String updater; - @Schema(description = "并发乐观锁") - private String concurrencyStamp; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; @Schema(description = "明细状态", requiredMode = Schema.RequiredMode.REQUIRED) @NotNull(message = "明细状态不能为空") diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainExcelVO.java index 9cbcd303..81d47718 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainExcelVO.java @@ -16,6 +16,8 @@ import java.time.LocalDateTime; @Data public class PurchasePlanMainExcelVO { + @ExcelProperty("单据号") + private String number; @ExcelProperty("供应商代码") private String supplierCode; @@ -28,20 +30,12 @@ public class PurchasePlanMainExcelVO { @ExcelProperty("月台代码") private String dockCode; - @ExcelProperty("单据号") - private String number; - @ExcelProperty("业务类型") private String businessType; - @ExcelProperty("备注") - private String remark; - - @ExcelProperty("创建时间") - private LocalDateTime createTime; - - @ExcelProperty("创建者用户名") - private String creator; + @ExcelProperty(value = "状态", converter = DictConvert.class) + @DictFormat("purchase_plan_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 + private String status; @ExcelProperty("开始时间") private String beginTime; @@ -49,9 +43,11 @@ public class PurchasePlanMainExcelVO { @ExcelProperty("结束时间") private String endTime; - @ExcelProperty(value = "状态", converter = DictConvert.class) - @DictFormat("plan_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 - private String status; + @ExcelProperty("创建时间") + private LocalDateTime createTime; + + @ExcelProperty("创建者用户名") + private String creator; @ExcelProperty("最后更新时间") private LocalDateTime updateTime; @@ -63,4 +59,7 @@ public class PurchasePlanMainExcelVO { @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中 private String available; + @ExcelProperty("备注") + private String remark; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java index 5f784699..f0c2bb1e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java @@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.*; +import com.win.module.wms.convert.supplierinvoiceRequest.SupplierinvoiceRequestMainConvert; +import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestMainDO; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; @@ -121,4 +123,6 @@ public class SupplierinvoiceRequestDetailController { ExcelUtils.write(response, "供应商发票申请子.xls", "数据", SupplierinvoiceRequestDetailExcelVO.class, datas); } + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java index a3e49726..e03b8182 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java @@ -39,7 +39,6 @@ public class SupplierinvoiceRequestMainController { @Resource private SupplierinvoiceRequestMainService supplierinvoiceRequestMainService; - @Resource private AdminUserApi userApi; @@ -92,6 +91,7 @@ public class SupplierinvoiceRequestMainController { PageResult pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainPage(pageVO); return success(SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult)); } + @PostMapping("/senior") @Operation(summary = "高级搜索获得供应商发票申请主信息分页") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:query')") @@ -105,6 +105,7 @@ public class SupplierinvoiceRequestMainController { } return success(result); } + @GetMapping("/export-excel") @Operation(summary = "导出供应商发票申请主 Excel") @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:export')") @@ -122,4 +123,12 @@ public class SupplierinvoiceRequestMainController { ExcelUtils.write(response, "供应商发票申请主.xls", "数据", SupplierinvoiceRequestMainExcelVO.class, datas); } + @GetMapping("/getNumber") + @Operation(summary = "获得供应商发票子单据号分页") + @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:getNumber')") + public CommonResult> getNumber(@Valid SupplierinvoiceRequestMainPageReqVO pageVO) { + List supplierinvoiceRequestMainDOList = supplierinvoiceRequestMainService.getNumber(pageVO); + return success(supplierinvoiceRequestMainDOList) ; + } + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainPageReqVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainPageReqVO.java index a388ecf5..4538de19 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainPageReqVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainPageReqVO.java @@ -72,4 +72,7 @@ public class SupplierinvoiceRequestMainPageReqVO extends PageParam { @Schema(description = "直接生成记录") private String directCreateRecord; + private String recordType; + + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java index e5c36d5e..55068e02 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java @@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchase; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -128,7 +129,8 @@ public class PurchaseDetailDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 明细状态 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseMainDO.java index 53febb56..c8841d70 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseMainDO.java @@ -102,7 +102,8 @@ public class PurchaseMainDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 明细 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java index 4a5a4355..fe54171d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java @@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchasePlan; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -72,7 +73,8 @@ public class PurchasePlanDetailDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 是否可用 * diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanMainDO.java index 345cdd91..e864afe4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanMainDO.java @@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.purchasePlan; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -79,7 +80,8 @@ public class PurchasePlanMainDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 工作流流水号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java index f29fa9dd..2baff5b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java @@ -104,6 +104,7 @@ public class PurchaseclaimRequestDetailDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java index 5a1c8678..afb49851 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java @@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchaseclaimRequest; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.Version; import com.sun.xml.bind.v2.TODO; import com.win.framework.mybatis.core.dataobject.BaseDO; import lombok.*; @@ -84,7 +85,8 @@ public class PurchaseclaimRequestMainDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 权限所属人员id */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java index c285b8db..7be6fd8a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java @@ -135,7 +135,8 @@ public class SupplierdeliverRequestDetailDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 从货主代码 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestMainDO.java index ef35aed8..7e223050 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestMainDO.java @@ -130,7 +130,8 @@ public class SupplierdeliverRequestMainDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 工作流流水号 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestMainDO.java index cfedb412..44556811 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestMainDO.java @@ -82,7 +82,8 @@ public class SupplierinvoiceRequestMainDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 权限所属人员id */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java index 02217d06..67cfdcb0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java @@ -113,8 +113,6 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { @Resource private DictDataApi dictDataApi; - - @Override public Long createPurchaseMain(PurchaseMainCreateReqVO createReqVO) { // 插入主表 @@ -348,6 +346,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { purchaseMainDO.setCreateTime(null); purchaseMainDO.setUpdater(null); purchaseMainDO.setUpdateTime(null); + purchaseMainDO.setConcurrencyStamp(1); purchaseMainMapper.insert(purchaseMainDO); for (PurchaseDetailDO purchaseDetailDO : subDOList) { validatorDetailMethod(purchaseDetailDO, purchaseMainDO); @@ -359,7 +358,6 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { purchaseDetailDO.setReturnedQty(BigDecimal.ZERO); purchaseDetailDO.setPutawayQty(BigDecimal.ZERO); purchaseDetailDO.setErpLocationCode(null); - purchaseDetailDO.setAvailable("TRUE"); purchaseDetailDO.setStatus(OrderStatusEnum.READY.getCode()); purchaseDetailDO.setId(null); purchaseDetailDO.setCreator(null); @@ -381,7 +379,9 @@ public class PurchaseMainServiceImpl implements PurchaseMainService { validatorDetailMethod(purchaseDetailDO, purchaseMainDO); } purchaseMainMapper.updateById(purchaseMainDO); - purchaseDetailMapper.updateBatch(subDOList); + if (subDOList != null && !subDOList.isEmpty()) { + purchaseDetailMapper.updateBatch(subDOList); + } return purchaseMainDO; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java index 6092abea..a2b415d2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java @@ -2,6 +2,8 @@ package com.win.module.wms.service.purchasePlan; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.exceptions.UtilException; +import cn.hutool.json.JSONObject; +import cn.hutool.json.JSONUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; @@ -14,6 +16,7 @@ import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.enums.serialNumber.RuleCodeEnum; import com.win.module.wms.controller.purchasePlan.vo.*; +import com.win.module.wms.controller.rule.vo.RuleRespVO; import com.win.module.wms.convert.purchasePlan.PurchasePlanDetailConvert; import com.win.module.wms.convert.purchasePlan.PurchasePlanMainConvert; import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO; @@ -37,6 +40,7 @@ import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.service.itembasic.ItembasicService; import com.win.module.wms.service.purchase.PurchaseMainService; import com.win.module.wms.service.requestsetting.RequestsettingService; +import com.win.module.wms.service.rule.RuleService; import com.win.module.wms.service.shift.ShiftService; import com.win.module.wms.service.supplier.SupplierService; import com.win.module.wms.service.supplieritem.SupplieritemService; @@ -88,7 +92,8 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { private DictDataApi dictDataApi; @Resource private PurchaseMainService purchaseMainService; - + @Resource + private RuleService ruleService; @Resource private PurchaseMainMapper purchaseMainMapper; @Resource @@ -198,6 +203,11 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { return supplierService.selectSupplier(supplierCode); } + //主表校验 校验供应商送货策略 + private RuleRespVO validatorDeliverGoods(String supplierCode) { + return ruleService.deliverGoods(supplierCode, null); + } + //子表校验 校验供应商基础信息 private void validatorItembasic(String itemCode) { itembasicService.selectItembasic(itemCode); @@ -215,6 +225,17 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { if (supplierDO == null) { throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); } + RuleRespVO ruleRespVO = this.validatorDeliverGoods(mainDo.getSupplierCode()); + if (ruleRespVO == null) { + throw new ServiceException(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); + } else { + JSONObject conditionObject = JSONUtil.parseObj(ruleRespVO.getConfiguration()); + mainDo.setWarehouseCode(String.valueOf(conditionObject.get("WarehouseCode"))); + mainDo.setDockCode(String.valueOf(conditionObject.get("DockCode"))); + mainDo.setBeginTime(String.valueOf(conditionObject.get("BeginTime"))); + mainDo.setEndTime(String.valueOf(conditionObject.get("EndTime"))); + mainDo.setTimeWindow(mainDo.getBeginTime() + "-" + mainDo.getEndTime()); + } mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增")); return mainDo; } @@ -311,6 +332,22 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService { } catch (ServiceException ex) { messageMain += ex.getMessage() + ","; } + //校验供应商发货策略 + try { + RuleRespVO ruleRespVO = this.validatorDeliverGoods(mainDo.getSupplierCode()); + if (ruleRespVO == null) { + throw new ServiceException(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS); + } else { + JSONObject conditionObject = JSONUtil.parseObj(ruleRespVO.getConfiguration()); + mainDo.setWarehouseCode(String.valueOf(conditionObject.get("WarehouseCode"))); + mainDo.setDockCode(String.valueOf(conditionObject.get("DockCode"))); + mainDo.setBeginTime(String.valueOf(conditionObject.get("BeginTime"))); + mainDo.setEndTime(String.valueOf(conditionObject.get("EndTime"))); + mainDo.setTimeWindow(mainDo.getBeginTime() + "-" + mainDo.getEndTime()); + } + } catch (ServiceException ex) { + messageMain += ex.getMessage() + ","; + } return messageMain; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java index d1af3bc7..f714d542 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java @@ -737,11 +737,19 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq PurchasereceiptRequestDetailCreateReqVO purchasereceiptRequestDetailCreateReqVO = new PurchasereceiptRequestDetailCreateReqVO(); //供应商子表 BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailCreateReqVO); + purchasereceiptRequestDetailCreateReqVO.setQty(packageDO.getQty()); purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getBatch()); + purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getUom()); + purchasereceiptRequestDetailCreateReqVO.setItemCode(packageDO.getItemCode()); + purchasereceiptRequestDetailCreateReqVO.setStdPackQty(packageDO.getStdPackQty()); + purchasereceiptRequestDetailCreateReqVO.setStdPackUnit(packageDO.getStdPackUnit()); + purchasereceiptRequestDetailCreateReqVO.setItemName(packageDO.getItemName()); + purchasereceiptRequestDetailCreateReqVO.setItemDesc1(packageDO.getItemDesc1()); + purchasereceiptRequestDetailCreateReqVO.setItemDesc2(packageDO.getItemDesc2()); purchasereceiptRequestDetailCreateReqVO.setAltBatch(packageDO.getAltBatch()); - purchasereceiptRequestDetailCreateReqVO.setArriveDate(detailDO.getArriveDate()); purchasereceiptRequestDetailCreateReqVO.setProduceDate(packageDO.getProduceDate()); purchasereceiptRequestDetailCreateReqVO.setExpireDate(packageDO.getExpireDate()); + purchasereceiptRequestDetailCreateReqVO.setArriveDate(detailDO.getArriveDate()); purchasereceiptRequestDetailCreateReqVO.setPackingNumber(packageDO.getNumber()); purchasereceiptRequestDetailCreateReqVO.setInventoryStatus("INSP"); SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), detailDO.getItemCode()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java index eebef71d..1924ea36 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java @@ -79,4 +79,12 @@ public interface SupplierinvoiceRequestMainService { */ List getSupplierinvoiceRequestMainList(SupplierinvoiceRequestMainExportReqVO exportReqVO); + /** + * 获得供应商发票申请主分页 + * + * @param pageReqVO 分页查询 + * @return 供应商发票申请主分页 + */ + List getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO); + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java index 32d35a10..446a8383 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java @@ -1,12 +1,33 @@ package com.win.module.wms.service.supplierinvoiceRequest; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; +import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO; +import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO; +import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainCreateReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO; import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainUpdateReqVO; +import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO; +import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordMainDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO; +import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO; +import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO; +import com.win.module.wms.dal.dataobject.supplier.SupplierDO; +import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestDetailDO; +import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO; +import com.win.module.wms.dal.mysql.purchaseclaimRecord.PurchaseclaimRecordMainMapper; +import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper; +import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordMainMapper; +import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService; +import com.win.module.wms.service.supplier.SupplierService; +import com.win.module.wms.service.supplieritem.SupplieritemService; +import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; + import javax.annotation.Resource; + import org.springframework.validation.annotation.Validated; import java.util.*; @@ -31,6 +52,17 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq @Resource private SupplierinvoiceRequestMainMapper supplierinvoiceRequestMainMapper; + @Resource + private PurchasereceiptRecordMainMapper purchasereceiptRecordMainMapper; + @Resource + private PurchasereturnRecordMainMapper purchasereturnRecordMainMapper; + @Resource + private PurchaseclaimRecordMainMapper purchaseclaimRecordMainMapper; + @Resource + private SupplierService supplierService; + @Resource + private PurchasereceiptRecordMainService purchasereceiptRecordMainService; + @Override public Long createSupplierinvoiceRequestMain(SupplierinvoiceRequestMainCreateReqVO createReqVO) { @@ -49,6 +81,7 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq SupplierinvoiceRequestMainDO updateObj = SupplierinvoiceRequestMainConvert.INSTANCE.convert(updateReqVO); supplierinvoiceRequestMainMapper.updateById(updateObj); } + @Override public PageResult getSupplierinvoiceRequestMainSenior(CustomConditions conditions) { return supplierinvoiceRequestMainMapper.selectSenior(conditions); @@ -88,4 +121,50 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq return supplierinvoiceRequestMainMapper.selectList(exportReqVO); } + //主表校验客户代码 + private SupplierDO validatorSupplier(String supplierCode) { + return supplierService.selectSupplier(supplierCode); + } + + + @Override + public List getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO) { + List supplierinvoiceRequestMainDOList=new ArrayList<>(); + // 收货单号 purchasereceiptRecordMainMapper + if ("1".equals(pageReqVO.getRecordType())) { + QueryWrapper purchasereceiptRecordMainDOQueryWrapper = new QueryWrapper<>(); + purchasereceiptRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode()); + List purchasereceiptRecordMainDOList = purchasereceiptRecordMainMapper.selectList(purchasereceiptRecordMainDOQueryWrapper); + for (PurchasereceiptRecordMainDO purchasereceiptRecordMainDO : purchasereceiptRecordMainDOList) { + SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO(); + BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO); + supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO); + } + } + // 退货单号 purchasereturnRecordMainMapper + else if ("2".equals(pageReqVO.getRecordType())) { + QueryWrapper purchasereturnRecordMainDOQueryWrapper = new QueryWrapper<>(); + purchasereturnRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode()); + List purchasereturnRecordMainDOList = purchasereturnRecordMainMapper.selectList(purchasereturnRecordMainDOQueryWrapper); + for (PurchasereturnRecordMainDO purchasereceiptRecordMainDO : purchasereturnRecordMainDOList) { + SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO(); + BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO); + supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO); + } + } + // 索赔单号 purchaseclaimRecordMainMapper + else if ("3".equals(pageReqVO.getRecordType())) { + QueryWrapper purchaseclaimRecordMainDOQueryWrapper = new QueryWrapper<>(); + purchaseclaimRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode()); + List purchasereturnRecordMainDOList = purchaseclaimRecordMainMapper.selectList(purchaseclaimRecordMainDOQueryWrapper); + for (PurchaseclaimRecordMainDO purchaseclaimRecordMainDO : purchasereturnRecordMainDOList) { + SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO(); + BeanUtils.copyProperties(purchaseclaimRecordMainDO, supplierinvoiceRequestMainDO); + supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO); + } + } + return supplierinvoiceRequestMainDOList; + } + + } From 3b1195dd799b8d744769795206b96c223fd34ad6 Mon Sep 17 00:00:00 2001 From: liuchen864 <23082234@qq.com> Date: Thu, 21 Dec 2023 09:50:15 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/dict/DictDataServiceImpl.java | 11 ++++--- .../wms/controller/index/IndexController.java | 7 +++++ .../wms/service/balance/BalanceService.java | 20 ++++++++++--- .../service/balance/BalanceServiceImpl.java | 29 +++++++++++++++++-- 4 files changed, 55 insertions(+), 12 deletions(-) diff --git a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java index 0c8ea1ae..714a9502 100644 --- a/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java +++ b/win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java @@ -1,8 +1,8 @@ package com.win.module.system.service.dict; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.exceptions.UtilException; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.google.common.annotations.VisibleForTesting; import com.win.framework.common.enums.CommonStatusEnum; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.util.collection.CollectionUtils; @@ -14,7 +14,6 @@ import com.win.module.system.convert.dict.DictDataConvert; import com.win.module.system.dal.dataobject.dict.DictDataDO; import com.win.module.system.dal.dataobject.dict.DictTypeDO; import com.win.module.system.dal.mysql.dict.DictDataMapper; -import com.google.common.annotations.VisibleForTesting; import com.win.module.system.dal.mysql.dict.DictTypeMapper; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; @@ -189,11 +188,11 @@ public class DictDataServiceImpl implements DictDataService { //调用公共方法 查询字典项 @Override public DictDataDO selectDictTypeAndLabel(String ptype,String plabel) { - QueryWrapper queryWrapper = new QueryWrapper(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("type",ptype); DictTypeDO dictTypeDO = dictTypeMapper.selectOne(queryWrapper); if(dictTypeDO != null && 0 == dictTypeDO.getStatus()){ - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("dict_type",ptype); queryWrapper1.eq("label",plabel); DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1); @@ -209,7 +208,7 @@ public class DictDataServiceImpl implements DictDataService { @Override public DictDataDO selectDictLabel(String plabel){ - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("label",plabel); DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1); if(dictDataDO != null && 0 == dictDataDO.getStatus()){ @@ -220,7 +219,7 @@ public class DictDataServiceImpl implements DictDataService { } @Override public DictDataDO selectDictValue(String value){ - QueryWrapper queryWrapper1 = new QueryWrapper(); + QueryWrapper queryWrapper1 = new QueryWrapper<>(); queryWrapper1.eq("value",value); DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1); if(dictDataDO != null && 0 == dictDataDO.getStatus()){ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java index 1d221d20..273eabc9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java @@ -1,6 +1,7 @@ package com.win.module.wms.controller.index; import com.win.framework.common.pojo.CommonResult; +import com.win.module.wms.service.balance.BalanceService; import com.win.module.wms.service.deliverPlan.DeliverPlanMainService; import com.win.module.wms.service.issueRequest.IssueRequestMainService; import com.win.module.wms.service.location.LocationService; @@ -59,6 +60,8 @@ public class IndexController { private ProductputawayJobDetailService productputawayJobDetailService; @Resource private DeliverPlanMainService deliverPlanMainService; + @Resource + private BalanceService balanceService; @GetMapping("/indexSupplier") @Operation(summary = "供应商首页") @@ -86,6 +89,8 @@ public class IndexController { dataMap.put("issueRequestTodayCount", issueRequestMainService.getIssueRequestToday());//今日叫料请求(已发料) dataMap.put("freeLocationCount", locationService.getFreeLocationCount());//空闲库位数 dataMap.put("totalLocationCount", locationService.getTotalLocationCount());//总库位数 + dataMap.put("stagnantBalanceList", balanceService.getStagnantBalanceList());//呆滞库存预警 + dataMap.put("overdueBalanceList", balanceService.getOverdueBalanceList());//超期库存预警 return success(dataMap); } @@ -94,6 +99,8 @@ public class IndexController { public CommonResult> indexProduct() { Map dataMap = new HashMap<>(); dataMap.put("deliverPlanTodayCount", deliverPlanMainService.getDeliverPlanToday());//今日发货计划(未发货) + dataMap.put("stagnantBalanceList", balanceService.getStagnantBalanceList());//呆滞库存预警 + dataMap.put("overdueBalanceList", balanceService.getOverdueBalanceList());//超期库存预警 return success(dataMap); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java index 7d5d20db..7812eee9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java @@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.module.wms.controller.balance.vo.BalanceExportReqVO; import com.win.module.wms.controller.balance.vo.BalancePageReqVO; +import com.win.module.wms.controller.balance.vo.BalanceRespVO; import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO; import com.win.module.wms.dal.dataobject.balance.BalanceDO; @@ -49,7 +50,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - public List selectNumber(String itemCode, List inventoryStatus, String locationCode); + List selectNumber(String itemCode, List inventoryStatus, String locationCode); /** * TB2----BY_BATCH * 跟据管理模式查询批次 @@ -60,7 +61,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - public List selectBatch(String itemCode, String batch, List inventoryStatus, String locationCode); + List selectBatch(String itemCode, String batch, List inventoryStatus, String locationCode); /** * TB2----BY_PACKAGING * 跟据管理模式查询包装号 @@ -72,7 +73,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - public List selectPackaging(String itemCode, String packingNumber, String batch, List inventoryStatus, String locationCode); + List selectPackaging(String itemCode, String packingNumber, String batch, List inventoryStatus, String locationCode); /** * TB2----BY_UNIQUE_ID * 跟据管理模式查询唯一码 @@ -82,7 +83,7 @@ public interface BalanceService { * @param locationCode 库位code * @return */ - public List selectUniqueId(String packingNumber, String locationCode, List inventoryStatus); + List selectUniqueId(String packingNumber, String locationCode, List inventoryStatus); void updateBalance(BalanceUpdateReqVO updateReqVO); /** @@ -93,4 +94,15 @@ public interface BalanceService { PageResult getBalanceItemsPage(BalancePageReqVO pageVO); PageResult getSeniroBalanceItemsPage(CustomConditions conditions); + + /** + * 呆滞库存预警 + * @return 呆滞库存 + */ + List getStagnantBalanceList(); + /** + * 超期库存预警 + * @return 超期库存 + */ + List getOverdueBalanceList(); } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index 178c6dc1..6d7d854b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -6,14 +6,18 @@ import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.mybatis.core.util.MyBatisUtils; import com.win.framework.mybatis.core.util.QueryWrapperUtils; +import com.win.module.system.api.dict.DictDataApi; +import com.win.module.system.api.dict.dto.DictDataRespDTO; import com.win.module.system.api.user.AdminUserApi; import com.win.module.wms.controller.balance.vo.BalanceExportReqVO; import com.win.module.wms.controller.balance.vo.BalancePageReqVO; +import com.win.module.wms.controller.balance.vo.BalanceRespVO; import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO; import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO; import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO; import com.win.module.wms.convert.balance.BalanceConvert; import com.win.module.wms.dal.dataobject.balance.BalanceDO; +import com.win.module.wms.dal.dataobject.packageMassage.PackageDO; import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO; import com.win.module.wms.dal.mysql.balance.BalanceMapper; import com.win.module.wms.dal.mysql.packageMassage.PackageMapper; @@ -54,6 +58,8 @@ public class BalanceServiceImpl implements BalanceService { private JobUtils jobUtils; @Resource private BalanceMapper balanceMapper; + @Resource + private DictDataApi dictDataApi; @Override public PageResult getBalancePage(BalancePageReqVO pageReqVO) { @@ -109,7 +115,7 @@ public class BalanceServiceImpl implements BalanceService { public List selectBatch(String itemCode, String batch, List inventoryStatus, String locationCode) { QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("item_code", itemCode); - if (batch == null || batch.equals("")) { + if (batch == null || batch.isEmpty()) { queryWrapper.eq("batch", ""); } queryWrapper.in("inventory_status", inventoryStatus); @@ -238,7 +244,7 @@ public class BalanceServiceImpl implements BalanceService { transactionCreateReqVOList.add(transactionCreateReqVOOut); // 更新包装信息 PackageUpdateReqVO packageUpdateReqVO = new PackageUpdateReqVO(); - QueryWrapper queryWrapper = new QueryWrapper<>(); + QueryWrapper queryWrapper = new QueryWrapper<>(); queryWrapper.eq("number",balanceDO.getPackingNumber()); packageUpdateReqVO.setId(packageMapper.selectOne(queryWrapper).getId()); packageUpdateReqVO.setNumber(balanceDO.getPackingNumber()); @@ -268,4 +274,23 @@ public class BalanceServiceImpl implements BalanceService { mpPage.setRecords(list); return new PageResult<>(mpPage.getRecords(), mpPage.getTotal()); } + + @Override + public List getStagnantBalanceList() { + DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictTypeAndLabel("stagnant_time", "默认时间(天)"); + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.apply(" DATEDIFF(NOW(), arrive_date) > {0}", dictDataRespDTO.getValue()); + queryWrapper.last("LIMIT 10"); + List balanceDOList = balanceMapper.selectList(queryWrapper); + return BalanceConvert.INSTANCE.convertList(balanceDOList); + } + + @Override + public List getOverdueBalanceList() { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.apply("expire_date>NOW()"); + queryWrapper.last("LIMIT 10"); + List balanceDOList = balanceMapper.selectList(queryWrapper); + return BalanceConvert.INSTANCE.convertList(balanceDOList); + } }