From 2f36132a16b7b0fe7f5cdb6fe4cf6a6002792762 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Dec 2023 10:35:35 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E5=AE=9E=E4=BD=93=E7=B1=BB=E6=B7=BB=E5=8A=A0masterId?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/DeliverRecordDetailBaseVO.java | 3 +++ .../vo/InventorymoveRecordMainBaseVO.java | 15 --------------- .../InventorymoveRequestMainServiceImpl.java | 5 ----- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java index 034f71b8..d32a080e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordDetailBaseVO.java +++ b/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; } 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 b83f5500..b06b1bd5 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 @@ -24,7 +24,6 @@ public class InventorymoveRecordMainBaseVO { private Long id; @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED) - @NotNull(message = "申请单号不能为空") private String requestNumber; @Schema(description = "任务单号") @@ -42,12 +41,10 @@ public class InventorymoveRecordMainBaseVO { 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 +57,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 +67,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 = "乐观锁") 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 18be7b1e..3eff6830 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 @@ -1,13 +1,10 @@ package com.win.module.wms.service.inventorymoveRequest; import cn.hutool.core.collection.CollUtil; -import cn.hutool.core.exceptions.UtilException; -import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.exception.ServiceException; import com.win.framework.common.pojo.CustomConditions; import com.win.framework.common.pojo.PageResult; import com.win.framework.common.util.validation.ValidationUtils; -import com.win.framework.dict.core.util.DictFrameworkUtils; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; import com.win.module.system.api.serialnumber.SerialNumberApi; @@ -30,7 +27,6 @@ import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveReque import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobDetailDO; import com.win.module.wms.dal.dataobject.inventorymoveJob.InventorymoveJobMainDO; import com.win.module.wms.dal.dataobject.inventorymoveRequest.InventorymoveRequestDetailDO; -import com.win.module.wms.dal.dataobject.issueRequest.IssueRequestMainDO; import com.win.module.wms.dal.dataobject.itembasic.ItembasicDO; import com.win.module.wms.dal.dataobject.jobsetting.JobsettingDO; import com.win.module.wms.dal.dataobject.location.LocationDO; @@ -42,7 +38,6 @@ import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordDetai import com.win.module.wms.dal.mysql.inventorymoveRecord.InventorymoveRecordMainMapper; import com.win.module.wms.dal.mysql.inventorymoveRequest.InventorymoveRequestDetailMapper; import com.win.module.wms.dal.mysql.inventorymoveRequest.InventorymoveRequestMainMapper; -import com.win.module.wms.enums.DictTypeConstants; import com.win.module.wms.enums.job.JobStatusEnum; import com.win.module.wms.enums.request.RequestStatusEnum; import com.win.module.wms.enums.request.RequestStatusState; From 8fd5735663cae51ca0f3226d0f084f7df2bd966d Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Dec 2023 10:39:09 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=A2=E6=88=B7=E9=80=80=E8=B4=A7?= =?UTF-8?q?=E7=94=9F=E6=88=90=E8=AE=B0=E5=BD=95=E6=97=B6=E5=8D=95=E6=8D=AE?= =?UTF-8?q?=E5=8F=B7=E6=A0=BC=E5=BC=8F=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java | 2 -- .../customerreturnJob/CustomerreturnJobMainServiceImpl.java | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) 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 b06b1bd5..40daa23a 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 @@ -33,11 +33,9 @@ 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) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java index 5502e03e..7a991de7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnJob/CustomerreturnJobMainServiceImpl.java @@ -254,11 +254,11 @@ public class CustomerreturnJobMainServiceImpl implements CustomerreturnJobMainSe //创建客户收货记录主表 CustomerreturnRecordMainDO customerreturnRecordMainDO = new CustomerreturnRecordMainDO(); BeanUtils.copyProperties(customerreturnJobMainDO, customerreturnRecordMainDO); - String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_REJECT_JOB.getCode()); + String number = serialNumberApi.generateCode(RuleCodeEnum.CUSTOMER_REJECT_RECORD.getCode()); customerreturnRecordMainDO.setNumber(number); customerreturnRecordMainDO.setJobNumber(customerreturnJobMainDO.getNumber()); customerreturnRecordMainDO.setId(null); - BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectJob"); + BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerRejectRecord"); customerreturnRecordMainDO.setBusinessType(businesstypeDO.getCode()); customerreturnRecordMainMapper.insert(customerreturnRecordMainDO); List customerreturnJobDetailUpdateReqVOList = customerreturnJobMainUpdateReqVO.getSubList(); From 3b1b939da7f8012c124dfe1d3ad2f038fdb237f3 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 11:11:50 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20=E5=8F=91=E6=96=99=E7=AE=A1=E7=90=86=20=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E7=AE=A1=E7=90=86=20=E5=9F=BA=E7=A1=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=20=E5=8D=95=E6=8D=AE=E8=AE=BE=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../accountcalendar/vo/AccountcalendarBaseVO.java | 3 +++ .../wms/controller/areabasic/vo/AreabasicBaseVO.java | 3 +++ .../win/module/wms/controller/bom/vo/BomBaseVO.java | 4 ++++ .../businesstype/vo/BusinesstypeBaseVO.java | 2 ++ .../wms/controller/carrier/vo/CarrierBaseVO.java | 3 +++ .../currencyexchange/vo/CurrencyexchangeBaseVO.java | 3 +++ .../wms/controller/customer/vo/CustomerBaseVO.java | 3 +++ .../customerdock/vo/CustomerdockBaseVO.java | 3 +++ .../customeritem/vo/CustomeritemBaseVO.java | 3 +++ .../module/wms/controller/dock/vo/DockBaseVO.java | 3 +++ .../documentsetting/vo/DocumentsettingBaseVO.java | 2 ++ .../controller/issueJob/vo/IssueJobMainBaseVO.java | 3 +++ .../issueRequest/vo/IssueRequestDetailBaseVO.java | 2 ++ .../issueRequest/vo/IssueRequestMainBaseVO.java | 3 +++ .../wms/controller/itembasic/vo/ItembasicBaseVO.java | 3 +++ .../itempackaging/vo/ItempackagingBaseVO.java | 3 +++ .../controller/jobsetting/vo/JobsettingBaseVO.java | 3 +++ .../wms/controller/location/vo/LocationBaseVO.java | 3 +++ .../locationgroup/vo/LocationgroupBaseVO.java | 3 +++ .../module/wms/controller/owner/vo/OwnerBaseVO.java | 3 +++ .../vo/PreparetoissueDetailBaseVO.java | 3 +++ .../preparetoissue/vo/PreparetoissueMainBaseVO.java | 3 +++ .../wms/controller/process/vo/ProcessBaseVO.java | 3 +++ .../vo/ProductdismantleJobMainBaseVO.java | 3 +++ .../vo/ProductdismantleRequestDetailaBaseVO.java | 3 +++ .../vo/ProductdismantleRequestMainBaseVO.java | 3 +++ .../production/vo/ProductionDetailBaseVO.java | 2 ++ .../production/vo/ProductionMainBaseVO.java | 2 ++ .../productionline/vo/ProductionlineBaseVO.java | 3 +++ .../vo/ProductionlineitemBaseVO.java | 2 ++ .../vo/ProductionreceiptJobMainBaseVO.java | 4 ++++ .../vo/ProductionreturnJobMainBaseVO.java | 2 ++ .../vo/ProductionreturnRequestDetailBaseVO.java | 3 +++ .../vo/ProductionreturnRequestMainBaseVO.java | 3 +++ .../vo/ProductputawayJobMainBaseVO.java | 2 ++ .../vo/ProductputawayRequestDetailBaseVO.java | 3 +++ .../vo/ProductputawayRequestMainBaseVO.java | 3 +++ .../vo/ProductreceiptJobMainBaseVO.java | 3 +++ .../vo/ProductreceiptJobMainRespVO.java | 5 +---- .../vo/ProductreceiptRequestDetailBaseVO.java | 3 +++ .../vo/ProductreceiptRequestMainBaseVO.java | 3 +++ .../purchaseprice/vo/PurchasepriceBaseVO.java | 2 ++ .../recordsetting/vo/RecordsettingBaseVO.java | 3 +++ .../repleinshJob/vo/RepleinshJobMainBaseVO.java | 3 +++ .../vo/RepleinshRequestDetailBaseVO.java | 3 +++ .../vo/RepleinshRequestMainBaseVO.java | 3 +++ .../requestsetting/vo/RequestsettingBaseVO.java | 2 ++ .../wms/controller/saleprice/vo/SalepriceBaseVO.java | 3 +++ .../module/wms/controller/shift/vo/ShiftBaseVO.java | 3 +++ .../stdcostprice/vo/StdcostpriceBaseVO.java | 3 +++ .../wms/controller/supplier/vo/SupplierBaseVO.java | 3 +++ .../supplieritem/vo/SupplieritemBaseVO.java | 3 +++ .../systemcalendar/vo/SystemcalendarBaseVO.java | 3 +++ .../module/wms/controller/team/vo/TeamBaseVO.java | 3 +++ .../transactiontype/vo/TransactiontypeBaseVO.java | 4 ++++ .../wms/controller/warehouse/vo/WarehouseBaseVO.java | 3 +++ .../wms/controller/workshop/vo/WorkshopBaseVO.java | 4 ++++ .../controller/workstation/vo/WorkstationBaseVO.java | 3 +++ .../accountcalendar/AccountcalendarDO.java | 10 ++++++---- .../wms/dal/dataobject/areabasic/AreabasicDO.java | 11 +++++++---- .../com/win/module/wms/dal/dataobject/bom/BomDO.java | 10 ++++++---- .../dal/dataobject/businesstype/BusinesstypeDO.java | 9 +++++---- .../module/wms/dal/dataobject/carrier/CarrierDO.java | 9 +++++---- .../currencyexchange/CurrencyexchangeDO.java | 9 +++++---- .../wms/dal/dataobject/customer/CustomerDO.java | 9 +++++---- .../dal/dataobject/customerdock/CustomerdockDO.java | 3 ++- .../dal/dataobject/customeritem/CustomeritemDO.java | 9 +++++---- .../win/module/wms/dal/dataobject/dock/DockDO.java | 3 ++- .../documentsetting/DocumentsettingDO.java | 10 +++++----- .../wms/dal/dataobject/enterprise/EnterpriseDO.java | 3 ++- .../wms/dal/dataobject/issueJob/IssueJobMainDO.java | 10 ++++++---- .../dataobject/issueRequest/IssueRequestMainDO.java | 9 +++++---- .../wms/dal/dataobject/itembasic/ItembasicDO.java | 4 +++- .../dataobject/itempackaging/ItempackagingDO.java | 3 ++- .../wms/dal/dataobject/jobsetting/JobsettingDO.java | 12 +++++++----- .../wms/dal/dataobject/location/LocationDO.java | 3 ++- .../dataobject/locationgroup/LocationgroupDO.java | 3 ++- .../win/module/wms/dal/dataobject/owner/OwnerDO.java | 3 ++- .../preparetoissue/PreparetoissueMainDO.java | 7 ++----- .../module/wms/dal/dataobject/process/ProcessDO.java | 3 ++- .../ProductdismantleJobMainDO.java | 9 +++++---- .../ProductdismantleRequestMainDO.java | 9 +++++---- .../dal/dataobject/production/ProductionMainDO.java | 10 ++++++---- .../dataobject/productionline/ProductionlineDO.java | 3 ++- .../productionlineitem/ProductionlineitemDO.java | 3 ++- .../ProductionreceiptJobMainDO.java | 9 +++++---- .../ProductionreturnJobMainDO.java | 10 ++++++---- .../ProductionreturnRequestMainDO.java | 10 +++++----- .../productputawayJob/ProductputawayJobMainDO.java | 10 +++++----- .../productreceiptJob/ProductreceiptJobMainDO.java | 9 +++++---- .../ProductreceiptRequestMainDO.java | 9 +++++---- .../dataobject/purchaseprice/PurchasepriceDO.java | 3 ++- .../dataobject/recordsetting/RecordsettingDO.java | 3 ++- .../dataobject/repleinshJob/RepleinshJobMainDO.java | 10 ++++++---- .../repleinshRequest/RepleinshRequestMainDO.java | 3 ++- .../dataobject/requestsetting/RequestsettingDO.java | 11 ++++++----- .../wms/dal/dataobject/saleprice/SalepriceDO.java | 3 ++- .../win/module/wms/dal/dataobject/shift/ShiftDO.java | 3 ++- .../dal/dataobject/stdcostprice/StdcostpriceDO.java | 3 ++- .../wms/dal/dataobject/supplier/SupplierDO.java | 3 ++- .../dal/dataobject/supplieritem/SupplieritemDO.java | 3 ++- .../dataobject/systemcalendar/SystemcalendarDO.java | 3 ++- .../win/module/wms/dal/dataobject/team/TeamDO.java | 3 ++- .../transactiontype/TransactiontypeDO.java | 10 +++++----- .../wms/dal/dataobject/warehouse/WarehouseDO.java | 3 ++- .../wms/dal/dataobject/workshop/WorkshopDO.java | 3 ++- .../dal/dataobject/workstation/WorkstationDO.java | 3 ++- 107 files changed, 348 insertions(+), 135 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarBaseVO.java index 3c48557d..a82d2e34 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/accountcalendar/vo/AccountcalendarBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicBaseVO.java index a4d6b463..f29b7266 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/areabasic/vo/AreabasicBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomBaseVO.java index 1f5fc959..36353010 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/bom/vo/BomBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java index a73af08f..8e4640d4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/businesstype/vo/BusinesstypeBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierBaseVO.java index 980a1c99..fcca821a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/carrier/vo/CarrierBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeBaseVO.java index bc638b7d..3c0a65b7 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/currencyexchange/vo/CurrencyexchangeBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerBaseVO.java index 4d7af232..949db8b0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customer/vo/CustomerBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockBaseVO.java index 9e37a477..dc531f39 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerdock/vo/CustomerdockBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java index e4c6c4d1..158ddb27 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customeritem/vo/CustomeritemBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockBaseVO.java index 255b29f0..405c25fe 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/dock/vo/DockBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingBaseVO.java index 60736ffd..25506243 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/documentsetting/vo/DocumentsettingBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java index 9f894bc5..19803992 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueJob/vo/IssueJobMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java index 425b3be1..5c0a8d46 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestDetailBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java index 75006122..1e70177d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/issueRequest/vo/IssueRequestMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java index 0be28114..a5179649 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itembasic/vo/ItembasicBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java index 3281dfdb..3e33d5a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/itempackaging/vo/ItempackagingBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/vo/JobsettingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/vo/JobsettingBaseVO.java index 33722380..5fd8c880 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/jobsetting/vo/JobsettingBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationBaseVO.java index 1166efce..3f998cc0 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/location/vo/LocationBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/vo/LocationgroupBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/vo/LocationgroupBaseVO.java index de98dec4..aa4164ed 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/locationgroup/vo/LocationgroupBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerBaseVO.java index af9e9342..1c621541 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/owner/vo/OwnerBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java index e3cb357e..83eee2ca 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueDetailBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueMainBaseVO.java index ff934da9..8f6283a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/preparetoissue/vo/PreparetoissueMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessBaseVO.java index 6851c6fe..3348deeb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/process/vo/ProcessBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainBaseVO.java index de532f9b..12bf89c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleJob/vo/ProductdismantleJobMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java index 5c9c8e73..e1115487 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestDetailaBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainBaseVO.java index adb96c29..f337b885 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productdismantleRequest/vo/ProductdismantleRequestMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java index a19d46c0..410c16d6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionDetailBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java index f431479f..6d232536 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/production/vo/ProductionMainBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineBaseVO.java index 0d0f7181..13075434 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionline/vo/ProductionlineBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java index 50a4777d..fbde721b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionlineitem/vo/ProductionlineitemBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainBaseVO.java index c3e75fdc..806ea13b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreceiptJob/vo/ProductionreceiptJobMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainBaseVO.java index a6a1a898..d5dd5eae 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnJob/vo/ProductionreturnJobMainBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java index 33f0d2d7..c4f8ca81 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestDetailBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainBaseVO.java index 55ec90eb..c0ad4f99 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRequest/vo/ProductionreturnRequestMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainBaseVO.java index 66b57d2d..91379be2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayJob/vo/ProductputawayJobMainBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java index 85e20040..003a8b13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestDetailBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainBaseVO.java index 4815f185..ebbb2f57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productputawayRequest/vo/ProductputawayRequestMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainBaseVO.java index 2ef6ac5a..10d82bf2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainRespVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainRespVO.java index 307d222f..077c82ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptJob/vo/ProductreceiptJobMainRespVO.java +++ b/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; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java index 086865d9..26f63331 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestDetailBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainBaseVO.java index b90229d8..ce073f57 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productreceiptRequest/vo/ProductreceiptRequestMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/vo/PurchasepriceBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/vo/PurchasepriceBaseVO.java index 62ab4aaa..249e35de 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchaseprice/vo/PurchasepriceBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingBaseVO.java index d16c0154..e694d024 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/recordsetting/vo/RecordsettingBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainBaseVO.java index f1bbe7f3..1bc261a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshJob/vo/RepleinshJobMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java index cd9612ab..06bae664 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestDetailBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainBaseVO.java index 617605df..7c20e705 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/repleinshRequest/vo/RepleinshRequestMainBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/vo/RequestsettingBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/vo/RequestsettingBaseVO.java index ef8ee274..1003f594 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/requestsetting/vo/RequestsettingBaseVO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java index 6a8d2205..4024195a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/saleprice/vo/SalepriceBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftBaseVO.java index c25c300d..4d7f6cfa 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/shift/vo/ShiftBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceBaseVO.java index e416609d..380c583d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/stdcostprice/vo/StdcostpriceBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/vo/SupplierBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/vo/SupplierBaseVO.java index 4ded83a1..09ca27b4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplier/vo/SupplierBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java index 32c77904..e34efe60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplieritem/vo/SupplieritemBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/vo/SystemcalendarBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/vo/SystemcalendarBaseVO.java index ecf046fc..71793c1a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/systemcalendar/vo/SystemcalendarBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/vo/TeamBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/vo/TeamBaseVO.java index abba537d..a356c2c8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/team/vo/TeamBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/vo/TransactiontypeBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/vo/TransactiontypeBaseVO.java index b2b0dda6..fda8d033 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transactiontype/vo/TransactiontypeBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/vo/WarehouseBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/vo/WarehouseBaseVO.java index cbdb0fd2..74df7222 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/warehouse/vo/WarehouseBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/vo/WorkshopBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/vo/WorkshopBaseVO.java index 700f5089..d735fafd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workshop/vo/WorkshopBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationBaseVO.java index ea33e952..82ac1515 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/workstation/vo/WorkstationBaseVO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/accountcalendar/AccountcalendarDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/accountcalendar/AccountcalendarDO.java index 4e03251b..707dab0c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/accountcalendar/AccountcalendarDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/areabasic/AreabasicDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/areabasic/AreabasicDO.java index 2c98580b..8b002c54 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/areabasic/AreabasicDO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/bom/BomDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/bom/BomDO.java index 597e5e8c..e950d5a1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/bom/BomDO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java index ae8bcf8a..3fbfe94e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/businesstype/BusinesstypeDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/carrier/CarrierDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/carrier/CarrierDO.java index b7316d5b..fb5ce99f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/carrier/CarrierDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/currencyexchange/CurrencyexchangeDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/currencyexchange/CurrencyexchangeDO.java index e9735419..cce83f95 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/currencyexchange/CurrencyexchangeDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customer/CustomerDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customer/CustomerDO.java index 9e78c91d..01fb7890 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customer/CustomerDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerdock/CustomerdockDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerdock/CustomerdockDO.java index 4cc25232..0ba2a728 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerdock/CustomerdockDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java index 8ed6ecca..36aa0c13 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customeritem/CustomeritemDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dock/DockDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dock/DockDO.java index e94fa0d7..7a399e17 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/dock/DockDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/documentsetting/DocumentsettingDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/documentsetting/DocumentsettingDO.java index 32da937c..82b4b6a5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/documentsetting/DocumentsettingDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/enterprise/EnterpriseDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/enterprise/EnterpriseDO.java index 56d3f0ab..7c8d9644 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/enterprise/EnterpriseDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java index 19a93ede..612868b6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueJob/IssueJobMainDO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java index 30a69b44..ff4ab6f1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/issueRequest/IssueRequestMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java index 061aade8..e9cbef27 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itembasic/ItembasicDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itempackaging/ItempackagingDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itempackaging/ItempackagingDO.java index 2f04daa4..76687d35 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/itempackaging/ItempackagingDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java index 82e96857..f8e81953 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/jobsetting/JobsettingDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java index c4ad28a1..da6de9a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/location/LocationDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/locationgroup/LocationgroupDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/locationgroup/LocationgroupDO.java index a90bdd79..71c3d1b9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/locationgroup/LocationgroupDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/owner/OwnerDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/owner/OwnerDO.java index 97341890..e3b92675 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/owner/OwnerDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/preparetoissue/PreparetoissueMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/preparetoissue/PreparetoissueMainDO.java index e56eab3c..d8489c32 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/preparetoissue/PreparetoissueMainDO.java +++ b/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; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/process/ProcessDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/process/ProcessDO.java index eef80241..652aae27 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/process/ProcessDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleJob/ProductdismantleJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleJob/ProductdismantleJobMainDO.java index 97380d35..3e59c657 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleJob/ProductdismantleJobMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestMainDO.java index 5f5d831e..61a699c1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productdismantleRequest/ProductdismantleRequestMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java index 73475635..0769ca60 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/production/ProductionMainDO.java +++ b/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; + // /** // * 订单号 // */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionline/ProductionlineDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionline/ProductionlineDO.java index fa5c6c55..705429fb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionline/ProductionlineDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java index d4bf4d35..eeff7087 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionlineitem/ProductionlineitemDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobMainDO.java index efcc99a6..370aa19f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreceiptJob/ProductionreceiptJobMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobMainDO.java index b80e8655..ffe013ce 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnJob/ProductionreturnJobMainDO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestMainDO.java index a1a16047..dc213c3d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productionreturnRequest/ProductionreturnRequestMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobMainDO.java index ea11927a..821ed8c5 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productputawayJob/ProductputawayJobMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobMainDO.java index 0a095bb6..90434629 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptJob/ProductreceiptJobMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestMainDO.java index 362ac91a..6328cbbd 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productreceiptRequest/ProductreceiptRequestMainDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseprice/PurchasepriceDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseprice/PurchasepriceDO.java index d904c0a3..666b36cc 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseprice/PurchasepriceDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/recordsetting/RecordsettingDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/recordsetting/RecordsettingDO.java index fbc3a9b8..2cabf00c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/recordsetting/RecordsettingDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobMainDO.java index 0e29aee1..5180e508 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshJob/RepleinshJobMainDO.java +++ b/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; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestMainDO.java index ae2284eb..ea01a896 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/repleinshRequest/RepleinshRequestMainDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/requestsetting/RequestsettingDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/requestsetting/RequestsettingDO.java index 831cadee..d4fd7dfb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/requestsetting/RequestsettingDO.java +++ b/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; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java index bad6c32d..85022356 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/saleprice/SalepriceDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/shift/ShiftDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/shift/ShiftDO.java index 156d51aa..bd15f202 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/shift/ShiftDO.java +++ b/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 */ diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/stdcostprice/StdcostpriceDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/stdcostprice/StdcostpriceDO.java index a28e943a..a2d41f89 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/stdcostprice/StdcostpriceDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/stdcostprice/StdcostpriceDO.java @@ -82,7 +82,8 @@ public class StdcostpriceDO 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/supplier/SupplierDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplier/SupplierDO.java index c5a4fabf..117e9cfb 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplier/SupplierDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplier/SupplierDO.java @@ -124,7 +124,8 @@ public class SupplierDO 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/supplieritem/SupplieritemDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplieritem/SupplieritemDO.java index 4953436c..3fc19de6 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplieritem/SupplieritemDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplieritem/SupplieritemDO.java @@ -126,7 +126,8 @@ public class SupplieritemDO 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/systemcalendar/SystemcalendarDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/systemcalendar/SystemcalendarDO.java index 571e8abe..dac37a7e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/systemcalendar/SystemcalendarDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/systemcalendar/SystemcalendarDO.java @@ -77,7 +77,8 @@ public class SystemcalendarDO 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/team/TeamDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/team/TeamDO.java index 944bfff4..41d0d281 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/team/TeamDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/team/TeamDO.java @@ -72,7 +72,8 @@ public class TeamDO 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/transactiontype/TransactiontypeDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transactiontype/TransactiontypeDO.java index ecd1c349..858b9e4b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transactiontype/TransactiontypeDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transactiontype/TransactiontypeDO.java @@ -75,10 +75,6 @@ public class TransactiontypeDO extends BaseDO { * 扩展属性 */ private String extraProperties; - /** - * 并发乐观锁 - */ - private String concurrencyStamp; /** * 地点ID */ @@ -95,5 +91,9 @@ public class TransactiontypeDO extends BaseDO { * 是否软删除 */ private String isSoftDeleted; - + /** + * 并发乐观锁 + */ + @Version + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/warehouse/WarehouseDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/warehouse/WarehouseDO.java index 5a2f556d..9e66ee59 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/warehouse/WarehouseDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/warehouse/WarehouseDO.java @@ -81,7 +81,8 @@ public class WarehouseDO 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/workshop/WorkshopDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/workshop/WorkshopDO.java index f8acc0fd..016347df 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/workshop/WorkshopDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/workshop/WorkshopDO.java @@ -81,7 +81,8 @@ public class WorkshopDO 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/workstation/WorkstationDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/workstation/WorkstationDO.java index 75a97825..a41a044b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/workstation/WorkstationDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/workstation/WorkstationDO.java @@ -97,7 +97,8 @@ public class WorkstationDO extends BaseDO { /** * 并发乐观锁 */ - private String concurrencyStamp; + @Version + private Integer concurrencyStamp; /** * 地点ID */