Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarBaseVO.java

@@ -60,4 +60,7 @@ public class AccountcalendarBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicBaseVO.java

@@ -55,4 +55,7 @@ public class AreabasicBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomBaseVO.java

@@ -61,4 +61,8 @@ public class BomBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java

@@ -89,4 +89,6 @@ public class BusinesstypeBaseVO {
     @Schema(description = "是否软删除")
     private String isSoftDeleted;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierBaseVO.java

@@ -83,4 +83,7 @@ public class CarrierBaseVO {
     @NotNull(message = "是否可用不能为空")
     private String available;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeBaseVO.java

@@ -47,4 +47,7 @@ public class CurrencyexchangeBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerBaseVO.java

@@ -79,4 +79,7 @@ public class CustomerBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockBaseVO.java

@@ -67,4 +67,7 @@ public class CustomerdockBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java

@@ -70,4 +70,7 @@ public class CustomeritemBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java

@@ -118,4 +118,7 @@ public class DeliverRecordDetailBaseVO {
 
     @Schema(description = "是否可用")
     private String available;
+
+    @Schema(description = "主表ID")
+    private String masterId;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockBaseVO.java

@@ -68,4 +68,7 @@ public class DockBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingBaseVO.java

@@ -80,4 +80,6 @@ public class DocumentsettingBaseVO {
     @Schema(description = "是否软删除")
     private String isSoftDeleted;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java

@@ -24,7 +24,6 @@ public class InventorymoveRecordMainBaseVO {
     private Long id;
 
     @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "申请单号不能为空")
     private String requestNumber;
 
     @Schema(description = "任务单号")
@@ -34,20 +33,16 @@ public class InventorymoveRecordMainBaseVO {
     private String useOnTheWayLocation;
 
     @Schema(description = "出库事务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "出库事务类型不能为空")
     private String outTransactionType;
 
     @Schema(description = "入库事务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "入库事务类型不能为空")
     private String inTransactionType;
 
     @Schema(description = "执行时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "执行时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime executeTime;
 
     @Schema(description = "生效日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生效日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime activeDate;
 
@@ -60,11 +55,9 @@ public class InventorymoveRecordMainBaseVO {
     private LocalDateTime dueTime;
 
     @Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "部门不能为空")
     private String departmentCode;
 
     @Schema(description = "接口类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "接口类型不能为空")
     private String interfaceType;
 
     @Schema(description = "代码", requiredMode = Schema.RequiredMode.REQUIRED)
@@ -72,50 +65,40 @@ public class InventorymoveRecordMainBaseVO {
     private String code;
 
     @Schema(description = "单据号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "单据号不能为空")
     private String number;
 
     @Schema(description = "业务类型", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "业务类型不能为空")
     private String businessType;
 
     @Schema(description = "备注")
     private String remark;
 
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "创建时间不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime createTime;
 
     @Schema(description = "创建者Id", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "创建者Id不能为空")
     private String creator;
 
     @Schema(description = "从仓库代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从仓库代码不能为空")
     private String fromWarehouseCode;
 
     @Schema(description = "从库位类型范围", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从库位类型范围不能为空")
     private String fromLocationTypes;
 
     @Schema(description = "从库区代码范围", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从库区代码范围不能为空")
     private String fromAreaCodes;
 
     @Schema(description = "到仓库代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到仓库代码不能为空")
     private String toWarehouseCode;
 
     @Schema(description = "到库位类型范围", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到库位类型范围不能为空")
     private String toLocationTypes;
 
     @Schema(description = "到库区代码范围")
     private String toAreaCodes;
 
     @Schema(description = "是否可用", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "是否可用不能为空")
     private String available;
 
     @Schema(description = "乐观锁")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java

@@ -153,4 +153,7 @@ public class IssueJobMainBaseVO {
     @Schema(description = "备料计划单号")
     private String preparetoissuePlanNumber;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java

@@ -92,4 +92,6 @@ public class IssueRequestDetailBaseVO {
     @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/issueRequest/vo/IssueRequestMainBaseVO.java

@@ -100,4 +100,7 @@ public class IssueRequestMainBaseVO {
     @Schema(description = "备料计划单号")
     private String preparetoissuePlanNumber;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java

@@ -116,4 +116,7 @@ public class ItembasicBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java

@@ -77,4 +77,7 @@ public class ItempackagingBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/vo/JobsettingBaseVO.java

@@ -89,4 +89,7 @@ public class JobsettingBaseVO {
     @Schema(description = "是否软删除")
     private String isSoftDeleted;
 
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationBaseVO.java

@@ -94,4 +94,7 @@ public class LocationBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/vo/LocationgroupBaseVO.java

@@ -52,4 +52,7 @@ public class LocationgroupBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerBaseVO.java

@@ -83,4 +83,7 @@ public class OwnerBaseVO {
     @NotNull(message = "是否可用不能为空")
     private String available;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java

@@ -71,4 +71,7 @@ public class PreparetoissueDetailBaseVO {
     @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/preparetoissue/vo/PreparetoissueMainBaseVO.java

@@ -79,4 +79,7 @@ public class PreparetoissueMainBaseVO {
     @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/process/vo/ProcessBaseVO.java

@@ -55,4 +55,7 @@ public class ProcessBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainBaseVO.java

@@ -143,4 +143,7 @@ public class ProductdismantleJobMainBaseVO {
     @Schema(description = "允许修改箱码")
     private String allowModifyPackingNumber;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java

@@ -111,4 +111,7 @@ public class ProductdismantleRequestDetailaBaseVO {
     @Schema(description = "主表ID")
     private String masterId;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainBaseVO.java

@@ -89,4 +89,7 @@ public class ProductdismantleRequestMainBaseVO {
     @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/production/vo/ProductionDetailBaseVO.java

@@ -67,4 +67,6 @@ public class ProductionDetailBaseVO {
     @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/production/vo/ProductionMainBaseVO.java

@@ -88,4 +88,6 @@ public class ProductionMainBaseVO {
     @Schema(description = "订单行")
     private String woLine;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineBaseVO.java

@@ -58,4 +58,7 @@ public class ProductionlineBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java

@@ -49,4 +49,6 @@ public class ProductionlineitemBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainBaseVO.java

@@ -153,4 +153,8 @@ public class ProductionreceiptJobMainBaseVO {
     @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/productionreturnJob/vo/ProductionreturnJobMainBaseVO.java

@@ -150,4 +150,6 @@ public class ProductionreturnJobMainBaseVO {
     @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/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java

@@ -92,4 +92,7 @@ public class ProductionreturnRequestDetailBaseVO {
     @Schema(description = "主表ID")
     private String masterId;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainBaseVO.java

@@ -94,4 +94,7 @@ public class ProductionreturnRequestMainBaseVO {
     @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/productputawayJob/vo/ProductputawayJobMainBaseVO.java

@@ -150,4 +150,6 @@ public class ProductputawayJobMainBaseVO {
     @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/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java

@@ -92,4 +92,7 @@ public class ProductputawayRequestDetailBaseVO {
     @Schema(description = "主表ID")
     private String masterId;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainBaseVO.java

@@ -94,4 +94,7 @@ public class ProductputawayRequestMainBaseVO {
     @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/productreceiptJob/vo/ProductreceiptJobMainBaseVO.java

@@ -155,4 +155,7 @@ public class ProductreceiptJobMainBaseVO {
     @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/productreceiptJob/vo/ProductreceiptJobMainRespVO.java

@@ -10,10 +10,7 @@ import java.util.List;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ProductreceiptJobMainRespVO extends ProductreceiptJobMainBaseVO {
-
-    @Schema(description = "并发乐观锁")
-    private String concurrencyStamp;
-
+    
     @Schema(description = "制品收货任务子表job_productreceipt_detail", requiredMode = Schema.RequiredMode.REQUIRED)
     private List subList;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java

@@ -122,4 +122,7 @@ public class ProductreceiptRequestDetailBaseVO {
 
     @Schema(description = "主表ID")
     private String masterId;
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainBaseVO.java

@@ -94,4 +94,7 @@ public class ProductreceiptRequestMainBaseVO {
     @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/purchaseprice/vo/PurchasepriceBaseVO.java

@@ -51,4 +51,6 @@ public class PurchasepriceBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingBaseVO.java

@@ -49,4 +49,7 @@ public class RecordsettingBaseVO {
     @Schema(description = "是否软删除")
     private String isSoftDeleted;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainBaseVO.java

@@ -146,4 +146,7 @@ public class RepleinshJobMainBaseVO {
     @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/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java

@@ -74,4 +74,7 @@ public class RepleinshRequestDetailBaseVO {
     @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/repleinshRequest/vo/RepleinshRequestMainBaseVO.java

@@ -92,4 +92,7 @@ public class RepleinshRequestMainBaseVO {
     @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/requestsetting/vo/RequestsettingBaseVO.java

@@ -65,4 +65,6 @@ public class RequestsettingBaseVO {
     @Schema(description = "是否软删除")
     private String isSoftDeleted;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java

@@ -51,4 +51,7 @@ public class SalepriceBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftBaseVO.java

@@ -64,4 +64,7 @@ public class ShiftBaseVO {
     @NotNull(message = "是否可用不能为空")
     private String available;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceBaseVO.java

@@ -51,4 +51,7 @@ public class StdcostpriceBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/vo/SupplierBaseVO.java

@@ -80,4 +80,7 @@ public class SupplierBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java

@@ -79,4 +79,7 @@ public class SupplieritemBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/vo/SystemcalendarBaseVO.java

@@ -46,4 +46,7 @@ public class SystemcalendarBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/vo/TeamBaseVO.java

@@ -51,4 +51,7 @@ public class TeamBaseVO {
     @NotNull(message = "是否可用不能为空")
     private String available;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/vo/TransactiontypeBaseVO.java

@@ -60,4 +60,8 @@ public class TransactiontypeBaseVO {
     @Schema(description = "是否软删除")
     private String isSoftDeleted;
 
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/vo/WarehouseBaseVO.java

@@ -47,4 +47,7 @@ public class WarehouseBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/vo/WorkshopBaseVO.java

@@ -47,4 +47,8 @@ public class WorkshopBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationBaseVO.java

@@ -61,4 +61,7 @@ public class WorkstationBaseVO {
     @Schema(description = "备注")
     private String remark;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/accountcalendar/AccountcalendarDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.accountcalendar;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 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,13 +85,14 @@ public class AccountcalendarDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
     private String siteId;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/areabasic/AreabasicDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.areabasic;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 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.*;
@@ -87,13 +88,15 @@ public class AreabasicDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
     private String siteId;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/bom/BomDO.java

@@ -91,13 +91,15 @@ public class BomDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
     private String siteId;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java

@@ -125,10 +125,6 @@ public class BusinesstypeDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
@@ -146,4 +142,9 @@ public class BusinesstypeDO extends BaseDO {
      */
     private String isSoftDeleted;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/carrier/CarrierDO.java

@@ -114,10 +114,6 @@ public class CarrierDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
@@ -126,5 +122,10 @@ public class CarrierDO extends BaseDO {
      * 是否可用
      */
     private String available;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/currencyexchange/CurrencyexchangeDO.java

@@ -73,13 +73,14 @@ public class CurrencyexchangeDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
     private String siteId;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customer/CustomerDO.java

@@ -121,13 +121,14 @@ public class CustomerDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
     private String siteId;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerdock/CustomerdockDO.java

@@ -103,7 +103,8 @@ public class CustomerdockDO 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/customeritem/CustomeritemDO.java

@@ -109,13 +109,14 @@ public class CustomeritemDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
     private String siteId;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dock/DockDO.java

@@ -105,7 +105,8 @@ public class DockDO 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/documentsetting/DocumentsettingDO.java

@@ -101,10 +101,6 @@ public class DocumentsettingDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
@@ -117,5 +113,9 @@ public class DocumentsettingDO extends BaseDO {
      * 是否软删除
      */
     private String isSoftDeleted;
-
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/enterprise/EnterpriseDO.java

@@ -76,7 +76,8 @@ public class EnterpriseDO 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/issueJob/IssueJobMainDO.java

@@ -73,10 +73,6 @@ public class IssueJobMainDO extends BaseDO {
      * 最后更新者用户名
      */
     private String lastModiferName;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 状态
      *
@@ -233,4 +229,10 @@ public class IssueJobMainDO extends BaseDO {
      */
     private String preparetoissuePlanNumber;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java

@@ -105,10 +105,6 @@ public class IssueRequestMainDO extends BaseDO {
      * 枚举 {@link TODO request_status 对应的类}
      */
     private String status;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 权限所属人员id
      */
@@ -151,5 +147,10 @@ public class IssueRequestMainDO extends BaseDO {
      */
     private String preparetoissuePlanNumber;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.itembasic;
 import com.baomidou.mybatisplus.annotation.KeySequence;
 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.*;
@@ -184,7 +185,8 @@ public class ItembasicDO 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/itempackaging/ItempackagingDO.java

@@ -128,7 +128,8 @@ public class ItempackagingDO 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/jobsetting/JobsettingDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.jobsetting;
 
 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.*;
 
@@ -62,10 +63,7 @@ public class JobsettingDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
+
     /**
      * 地点ID
      */
@@ -118,5 +116,9 @@ public class JobsettingDO extends BaseDO {
      * 是否软删除
      */
     private String isSoftDeleted;
-
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java

@@ -132,7 +132,8 @@ public class LocationDO 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/locationgroup/LocationgroupDO.java

@@ -83,7 +83,8 @@ public class LocationgroupDO 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/owner/OwnerDO.java

@@ -117,7 +117,8 @@ public class OwnerDO 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/preparetoissue/PreparetoissueMainDO.java

@@ -87,14 +87,13 @@ public class PreparetoissueMainDO extends BaseDO {
     private LocalDateTime endTime;
     /**
      * 状态
-     *
-     * 枚举 {@link TODO plan_status 对应的类}
      */
     private String status;
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */
@@ -105,8 +104,6 @@ public class PreparetoissueMainDO extends BaseDO {
     private String serialNumber;
     /**
      * 是否可用
-     *
-     * 枚举 {@link TODO true_false 对应的类}
      */
     private String available;
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/process/ProcessDO.java

@@ -89,7 +89,8 @@ public class ProcessDO 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/productdismantleJob/ProductdismantleJobMainDO.java

@@ -73,10 +73,6 @@ public class ProductdismantleJobMainDO extends BaseDO {
      * 过期时间
      */
     private LocalDateTime expiredTime;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 状态
      *
@@ -203,5 +199,10 @@ public class ProductdismantleJobMainDO extends BaseDO {
      * 允许修改箱码
      */
     private String allowModifyPackingNumber;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestMainDO.java

@@ -96,10 +96,6 @@ public class ProductdismantleRequestMainDO extends BaseDO {
      * 枚举 {@link TODO request_status 对应的类}
      */
     private String status;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 权限所属人员id
      */
@@ -133,4 +129,9 @@ public class ProductdismantleRequestMainDO extends BaseDO {
      * 出库库存状态范围
      */
     private String outInventoryStatuses;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java

@@ -92,10 +92,6 @@ public class ProductionMainDO extends BaseDO {
      * 枚举 {@link TODO plan_status 对应的类}
      */
     private String status;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 权限所属人员id
      */
@@ -109,6 +105,12 @@ public class ProductionMainDO extends BaseDO {
      */
     private String available;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
+
 //    /**
 //     * 订单号
 //     */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionline/ProductionlineDO.java

@@ -93,7 +93,8 @@ public class ProductionlineDO 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/productionlineitem/ProductionlineitemDO.java

@@ -84,6 +84,7 @@ public class ProductionlineitemDO 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/productionreceiptJob/ProductionreceiptJobMainDO.java

@@ -75,10 +75,6 @@ public class ProductionreceiptJobMainDO extends BaseDO {
      * 过期时间
      */
     private LocalDateTime expiredTime;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 状态
      *
@@ -221,5 +217,10 @@ public class ProductionreceiptJobMainDO extends BaseDO {
      * 出库库存状态范围
      */
     private String outInventoryStatuses;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobMainDO.java

@@ -69,10 +69,6 @@ public class ProductionreturnJobMainDO extends BaseDO {
      * 过期时间
      */
     private LocalDateTime expiredTime;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 状态
      *
@@ -212,5 +208,11 @@ public class ProductionreturnJobMainDO extends BaseDO {
      * 出库库存状态范围
      */
     private String outInventoryStatuses;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
+
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestMainDO.java

@@ -86,10 +86,6 @@ public class ProductionreturnRequestMainDO extends BaseDO {
      * 枚举 {@link TODO request_status 对应的类}
      */
     private String status;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 权限所属人员id
      */
@@ -128,5 +124,9 @@ public class ProductionreturnRequestMainDO extends BaseDO {
      * 直接生成记录
      */
     private String directCreateRecord;
-
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobMainDO.java

@@ -93,10 +93,6 @@ public class ProductputawayJobMainDO extends BaseDO {
      * 过期时间
      */
     private LocalDateTime expiredTime;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 状态
      *
@@ -215,5 +211,9 @@ public class ProductputawayJobMainDO extends BaseDO {
      * 出库库存状态范围
      */
     private String outInventoryStatuses;
-
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobMainDO.java

@@ -73,10 +73,6 @@ public class ProductreceiptJobMainDO extends BaseDO {
      * 过期时间
      */
     private LocalDateTime expiredTime;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 状态
      *
@@ -215,5 +211,10 @@ public class ProductreceiptJobMainDO extends BaseDO {
      * 出库库存状态范围
      */
     private String outInventoryStatuses;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestMainDO.java

@@ -100,10 +100,6 @@ public class ProductreceiptRequestMainDO extends BaseDO {
      * 枚举 {@link TODO request_status 对应的类}
      */
     private String status;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 权限所属人员id
      */
@@ -129,4 +125,9 @@ public class ProductreceiptRequestMainDO extends BaseDO {
      */
     private String directCreateRecord;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseprice/PurchasepriceDO.java

@@ -82,7 +82,8 @@ public class PurchasepriceDO 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/recordsetting/RecordsettingDO.java

@@ -66,7 +66,8 @@ public class RecordsettingDO 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/repleinshJob/RepleinshJobMainDO.java

@@ -57,10 +57,6 @@ public class RepleinshJobMainDO extends BaseDO {
      * 过期时间
      */
     private LocalDateTime expiredTime;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 状态
      *
@@ -233,4 +229,10 @@ public class RepleinshJobMainDO extends BaseDO {
      */
     private String outInventoryStatuses;
 
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestMainDO.java

@@ -87,7 +87,8 @@ public class RepleinshRequestMainDO 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/requestsetting/RequestsettingDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.requestsetting;
 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.*;
@@ -66,10 +67,6 @@ public class RequestsettingDO extends BaseDO {
      * 扩展属性
      */
     private String extraProperties;
-    /**
-     * 并发乐观锁
-     */
-    private String concurrencyStamp;
     /**
      * 地点ID
      */
@@ -98,5 +95,9 @@ public class RequestsettingDO extends BaseDO {
      * 是否软删除
      */
     private String isSoftDeleted;
-
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java

@@ -83,7 +83,8 @@ public class SalepriceDO 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/shift/ShiftDO.java

@@ -78,7 +78,8 @@ public class ShiftDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 地点ID
      */