乐观锁。

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countJob/vo/CountJobMainBaseVO.java

@@ -145,4 +145,7 @@ public class CountJobMainBaseVO {
     @Schema(description = "出库库存状态范围")
     private String outInventoryStatuses;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanDetailBaseVO.java

@@ -1,7 +1,5 @@
 package com.win.module.wms.controller.countPlan.vo;
 
-import com.win.framework.excel.core.annotations.DictFormat;
-import com.win.module.wms.enums.DictTypeConstants;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -46,4 +44,7 @@ public class CountPlanDetailBaseVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countPlan/vo/CountPlanMainBaseVO.java

@@ -92,4 +92,7 @@ public class CountPlanMainBaseVO {
     @Schema(description = "是否可用")
     private String available;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestDetailBaseVO.java

@@ -81,4 +81,7 @@ public class CountRequestDetailBaseVO {
     @Schema(description = "从器具号")
     private String containerNumber;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countRequest/vo/CountRequestMainBaseVO.java

@@ -93,4 +93,8 @@ public class CountRequestMainBaseVO {
 
     @Schema(description = "生成盘点调整状态")
     private String countAdjustStatus;
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestDetailBaseVO.java

@@ -99,4 +99,7 @@ public class CountadjustRequestDetailBaseVO {
     @Schema(description = "物品代码")
     private String itemCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/countadjustRequest/vo/CountadjustRequestMainBaseVO.java

@@ -83,4 +83,7 @@ public class CountadjustRequestMainBaseVO {
     @NotNull(message = "直接生成记录不能为空")
     private String directCreateRecord;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectJob/vo/InspectJobMainBaseVO.java

@@ -183,4 +183,7 @@ public class InspectJobMainBaseVO {
     @Schema(description = "出库库存状态范围")
     private String outInventoryStatuses;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestDetailBaseVO.java

@@ -68,4 +68,7 @@ public class InspectRequestDetailBaseVO {
     @Schema(description = "计量单位")
     private String uom;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inspectRequest/vo/InspectRequestMainBaseVO.java

@@ -127,4 +127,7 @@ public class InspectRequestMainBaseVO {
     @Schema(description = "直接生成记录", requiredMode = Schema.RequiredMode.REQUIRED)
     private String directCreateRecord;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptJob/vo/PurchasereceiptJobMainBaseVO.java

@@ -1,7 +1,5 @@
 package com.win.module.wms.controller.purchasereceiptJob.vo;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
@@ -171,4 +169,7 @@ public class PurchasereceiptJobMainBaseVO {
     @Schema(description = "出库库存状态范围")
     private String outInventoryStatuses;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestDetailBaseVO.java

@@ -129,4 +129,7 @@ public class PurchasereceiptRequestDetailBaseVO {
     @Schema(description = "创建者用户名")
     private String creator;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereceiptRequest/vo/PurchasereceiptRequestMainBaseVO.java

@@ -111,4 +111,7 @@ public class PurchasereceiptRequestMainBaseVO {
     @Schema(description = "车牌号")
     private String vehiclePlateNumber;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnJob/vo/PurchasereturnJobMainBaseVO.java

@@ -175,4 +175,7 @@ public class PurchasereturnJobMainBaseVO {
     @Schema(description = "出库库存状态范围")
     private String outInventoryStatuses;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestDetailBaseVO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.controller.purchasereturnRequest.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import javax.validation.constraints.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -102,4 +103,7 @@ public class PurchasereturnRequestDetailBaseVO {
     @Schema(description = "到货主代码")
     private String toOwnerCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasereturnRequest/vo/PurchasereturnRequestMainBaseVO.java

@@ -114,4 +114,7 @@ public class PurchasereturnRequestMainBaseVO {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestDetailBaseVO.java

@@ -1,13 +1,12 @@
 package com.win.module.wms.controller.putawayRequest.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 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;
 
@@ -94,4 +93,8 @@ public class PutawayRequestDetailBaseVO {
 
     @Schema(description = "主表id")
     private Long masterId;
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/putawayRequest/vo/PutawayRequestMainBaseVO.java

@@ -94,4 +94,7 @@ public class PutawayRequestMainBaseVO {
     @Schema(description = "直接生成记录", requiredMode = Schema.RequiredMode.REQUIRED)
     private String directCreateRecord;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countJob/CountJobMainDO.java

@@ -1,9 +1,6 @@
 package com.win.module.wms.dal.dataobject.countJob;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.sun.xml.bind.v2.TODO;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
@@ -76,7 +73,8 @@ public class CountJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 状态
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanDetailDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.countPlan;
 
 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.*;
@@ -46,6 +47,7 @@ public class CountPlanDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countPlan/CountPlanMainDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.countPlan;
 
 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.*;
@@ -93,7 +94,8 @@ public class CountPlanMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestDetailDO.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.dal.dataobject.countRequest;
 
+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 com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 盘点申请子 DO
@@ -95,7 +95,8 @@ public class CountRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 物品代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countRequest/CountRequestMainDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.countRequest;
 
 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 CountRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestDetailDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.countadjustRequest;
 
 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.*;
@@ -114,7 +115,8 @@ public class CountadjustRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 物品代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/countadjustRequest/CountadjustRequestMainDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.countadjustRequest;
 
 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,7 +77,8 @@ public class CountadjustRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectJob/InspectJobMainDO.java

@@ -1,9 +1,6 @@
 package com.win.module.wms.dal.dataobject.inspectJob;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.sun.xml.bind.v2.TODO;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
@@ -75,7 +72,8 @@ public class InspectJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 状态
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestDetailDO.java

@@ -1,11 +1,13 @@
 package com.win.module.wms.dal.dataobject.inspectRequest;
 
+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 com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 检验申请子 DO
@@ -51,7 +53,8 @@ public class InspectRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 主表ID
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inspectRequest/InspectRequestMainDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.inspectRequest;
 
 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.*;
@@ -91,7 +92,8 @@ public class InspectRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptJob/PurchasereceiptJobMainDO.java

@@ -1,9 +1,6 @@
 package com.win.module.wms.dal.dataobject.purchasereceiptJob;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.sun.xml.bind.v2.TODO;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
@@ -94,7 +91,8 @@ public class PurchasereceiptJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 优先级
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestDetailDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchasereceiptRequest;
 
 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.*;
@@ -151,7 +152,8 @@ public class PurchasereceiptRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 从货主代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereceiptRequest/PurchasereceiptRequestMainDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchasereceiptRequest;
 
 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.*;
@@ -116,7 +117,8 @@ public class PurchasereceiptRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 工作流流水号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnJob/PurchasereturnJobMainDO.java

@@ -95,7 +95,8 @@ public class PurchasereturnJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 状态
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestDetailDO.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.dal.dataobject.purchasereturnRequest;
 
+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 com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 采购退货申请子 DO
@@ -121,7 +121,8 @@ public class PurchasereturnRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 从货主代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasereturnRequest/PurchasereturnRequestMainDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchasereturnRequest;
 
 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.*;
@@ -108,7 +109,8 @@ public class PurchasereturnRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayJob/PutawayJobMainDO.java

@@ -1,9 +1,6 @@
 package com.win.module.wms.dal.dataobject.putawayJob;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.sun.xml.bind.v2.TODO;
 import com.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
@@ -62,7 +59,8 @@ public class PutawayJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 状态
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestDetailDO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.dal.dataobject.putawayRequest;
 
+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 com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 上架申请子 DO
@@ -106,7 +107,8 @@ public class PutawayRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 从货主代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/putawayRequest/PutawayRequestMainDO.java

@@ -1,13 +1,13 @@
 package com.win.module.wms.dal.dataobject.putawayRequest;
 
+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.time.LocalDateTime;
+
 import java.time.LocalDateTime;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 上架申请主 DO
@@ -87,7 +87,8 @@ public class PutawayRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/countRequest/CountRequestMainServiceImpl.java

@@ -419,6 +419,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
             countJobMainDO.setStatus(JobStatusEnum.PENDING.getCode());
             countJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            countJobMainDO.setConcurrencyStamp(1);
             String number = serialNumberApi.generateCode(RuleCodeEnum.COUNT_JOB.getCode());
             countJobMainDO.setNumber(number);
             countJobMainMapper.insert(countJobMainDO);
@@ -460,6 +461,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             //调整数量的绝对值
             countadjustRequestDetailDO.setQty(countadjustRequestDetailDO.getAdjustQty().abs());
             countadjustRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            countadjustRequestDetailDO.setConcurrencyStamp(1);
             countadjustRequestDetailDOList.add(countadjustRequestDetailDO);
         }
         int result = 0;
@@ -479,6 +481,7 @@ public class CountRequestMainServiceImpl implements CountRequestMainService {
             countadjustRequestMainDO.setCountRequestNumber(countRequestMainDO.getNumber());
             countadjustRequestMainDO.setStatus(RequestStatusEnum.NEW.getCode());
             countadjustRequestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            countadjustRequestMainDO.setConcurrencyStamp(1);
             result = countadjustRequestMainMapper.insert(countadjustRequestMainDO);
             for(CountadjustRequestDetailDO countadjustRequestDetailDO : countadjustRequestDetailDOList) {
                 countadjustRequestDetailDO.setMasterId(countadjustRequestMainDO.getId());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectJob/InspectJobMainServiceImpl.java

@@ -350,9 +350,11 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
             requestMainDO.setSampleMethod("QTY");
             requestMainDO.setStatus(RequestStatusEnum.NEW.getCode());
             requestMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            requestMainDO.setConcurrencyStamp(1);
             inspectRequestMainMapper.insert(requestMainDO);
             for(InspectRequestDetailDO inspectRequestDetailDO : requestDetailDOList) {
                 inspectRequestDetailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+                inspectRequestDetailDO.setConcurrencyStamp(1);
                 inspectRequestDetailDO.setMasterId(requestMainDO.getId());
                 inspectRequestDetailDO.setNumber(requestNumber);
             }
@@ -386,10 +388,12 @@ public class InspectJobMainServiceImpl implements InspectJobMainService {
                 putawayRequestDetailCreateReqVO.setItemName(inspectRecordMainDO.getItemCode());
                 putawayRequestDetailCreateReqVO.setInventoryStatus("OK");
                 putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+                putawayRequestDetailCreateReqVO.setConcurrencyStamp(1);
                 putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO);
             }
             putawayRequestMainCreateReqVO.setToWarehouseCode(inspectRecordMainDO.getFromWarehouseCode());
             putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            putawayRequestMainCreateReqVO.setConcurrencyStamp(1);
             putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList);
             if(!putawayRequestDetailCreateReqVOList.isEmpty()) {
                 putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO);

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inspectRequest/InspectRequestMainServiceImpl.java

@@ -404,6 +404,7 @@ public class InspectRequestMainServiceImpl implements InspectRequestMainService
         inspectJobMainDO.setRequestNumber(mainDO.getNumber());
         inspectJobMainDO.setWarehouseCode(mainDO.getFromWarehouseCode());
         inspectJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+        inspectJobMainDO.setConcurrencyStamp(1);
         String number = serialNumberApi.generateCode(RuleCodeEnum.INSPECT_JOB.getCode());
         inspectJobMainDO.setNumber(number);
         //增加业务类型

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptJob/PurchasereceiptJobMainServiceImpl.java

@@ -468,9 +468,11 @@ public class PurchasereceiptJobMainServiceImpl implements PurchasereceiptJobMain
                 putawayRequestDetailCreateReqVO.setFromLocationCode(purchasereceiptRecordDetailDO.getToLocationCode());
                 putawayRequestDetailCreateReqVO.setInventoryStatus("OK");
                 putawayRequestDetailCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+                putawayRequestDetailCreateReqVO.setConcurrencyStamp(1);
                 putawayRequestDetailCreateReqVOList.add(putawayRequestDetailCreateReqVO);
             }
             putawayRequestMainCreateReqVO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            putawayRequestMainCreateReqVO.setConcurrencyStamp(1);
             putawayRequestMainCreateReqVO.setSubList(putawayRequestDetailCreateReqVOList);
             putawayRequestMainService.createPutawayRequestMain(putawayRequestMainCreateReqVO);
         }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereceiptRequest/PurchasereceiptRequestMainServiceImpl.java

@@ -515,6 +515,7 @@ public class PurchasereceiptRequestMainServiceImpl implements PurchasereceiptReq
             String number = serialNumberApi.generateCode(RuleCodeEnum.PURCHASE_RECEIPT_JOB.getCode());
             purchasereceiptJobMainDO.setNumber(number);
             purchasereceiptJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            purchasereceiptJobMainDO.setConcurrencyStamp(1);
             //增加业务类型
             BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReceiptJob");
             purchasereceiptJobMainDO.setBusinessType(businesstypeDO.getCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasereturnRequest/PurchasereturnRequestMainServiceImpl.java

@@ -121,6 +121,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         purchasereturnRequestMainMapper.insert(mainDO);
         for (PurchasereturnRequestDetailDO detailDO : subDOList) {
             detailDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+            detailDO.setConcurrencyStamp(1);
             detailDO.setMasterId(mainDO.getId());
             detailDO.setNumber(number);
         }
@@ -374,6 +375,7 @@ public class PurchasereturnRequestMainServiceImpl implements PurchasereturnReque
         purchasereturnJobMainDO.setAllowModifyBatch(jobsettingDO.getAllowModifyBach());
         purchasereturnJobMainDO.setRequestTime(mainDO.getRequestTime());
         purchasereturnJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+        purchasereturnJobMainDO.setConcurrencyStamp(1);
         BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("PurchaseReturnRequest");
         purchasereturnJobMainDO.setBusinessType(businesstypeDO.getCode());
         purchasereturnJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/putawayRequest/PutawayRequestMainServiceImpl.java

@@ -360,6 +360,7 @@ public class PutawayRequestMainServiceImpl implements PutawayRequestMainService
         putawayJobMainDO.setInInventoryStatuses(businesstypeDO.getInInventoryStatuses());
         putawayJobMainDO.setOutInventoryStatuses(businesstypeDO.getOutInventoryStatuses());
         putawayJobMainDO.setId(null).setCreator(null).setCreateTime(null).setUpdater(null).setUpdateTime(null);
+        putawayJobMainDO.setConcurrencyStamp(1);
         putawayJobMainMapper.insert(putawayJobMainDO);
         List<PutawayJobDetailDO> putawayJobDetailDOList = new ArrayList<>();
         for(PutawayRequestDetailDO putawayRequestDetailDO : detailDOList) {