From aac0390374dd148b4b7c338cc2a581c50385b0a8 Mon Sep 17 00:00:00 2001 From: chenfang Date: Thu, 21 Dec 2023 09:16:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B9=90=E8=A7=82=E9=94=81DO/VO=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../vo/CustomerreceiptRecordMainBaseVO.java | 3 +++ .../vo/CustomerreceiptRequestMainBaseVO.java | 3 +++ .../customerreturnJob/vo/CustomerreturnJobMainBaseVO.java | 2 ++ .../vo/CustomerreturnRecordMainBaseVO.java | 2 ++ .../vo/CustomerreturnRequestMainBaseVO.java | 3 +++ .../vo/CustomersettleRecordMainBaseVO.java | 2 ++ .../vo/CustomersettleRequestMainBaseVO.java | 2 ++ .../controller/deliverJob/vo/DeliverJobMainBaseVO.java | 2 ++ .../controller/deliverPlan/vo/DeliverPlanMainBaseVO.java | 2 ++ .../deliverRecord/vo/DeliverRecordMainBaseVO.java | 2 ++ .../deliverRequest/vo/DeliverRequestMainBaseVO.java | 3 +++ .../vo/InventorychangeRecordMainBaseVO.java | 3 +++ .../vo/InventorychangeRequestMainBaseVO.java | 2 ++ .../inventorymoveJob/vo/InventorymoveJobMainBaseVO.java | 2 ++ .../vo/InventorymoveRecordMainBaseVO.java | 2 ++ .../vo/InventorymoveRequestMainExcelVO.java | 3 +++ .../CustomerreceiptRecordMainDO.java | 6 +----- .../CustomerreceiptRequestMainDO.java | 2 +- .../customerreturnJob/CustomerreturnJobMainDO.java | 2 ++ .../CustomerreturnRequestMainDO.java | 1 + .../CustomersettleRequestMainDO.java | 1 + .../wms/dal/dataobject/deliverJob/DeliverJobMainDO.java | 1 + .../wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java | 1 + .../dal/dataobject/deliverRecord/DeliverRecordMainDO.java | 6 +----- .../dataobject/deliverRequest/DeliverRequestMainDO.java | 1 + .../InventorychangeRequestMainDO.java | 1 + .../inventorymoveJob/InventorymoveJobMainDO.java | 1 + .../inventorymoveRequest/InventorymoveRequestMainDO.java | 1 + .../CustomerreturnRecordMainServiceImpl.java | 5 +++++ .../CustomerreturnRequestMainServiceImpl.java | 1 + .../deliverRecord/DeliverRecordMainServiceImpl.java | 5 +++++ .../deliverRequest/DeliverRequestMainServiceImpl.java | 1 + .../InventorymoveRecordMainServiceImpl.java | 8 +++++++- .../InventorymoveRequestMainServiceImpl.java | 1 + 34 files changed, 71 insertions(+), 12 deletions(-) diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java index 683ce5c4..642f008f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRecord/vo/CustomerreceiptRecordMainBaseVO.java @@ -115,4 +115,7 @@ public class CustomerreceiptRecordMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; + } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java index b9ea404b..aa34f71f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreceiptRequest/vo/CustomerreceiptRequestMainBaseVO.java @@ -115,4 +115,7 @@ public class CustomerreceiptRequestMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatus; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java index b8ab8d16..9d44b7d1 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnJob/vo/CustomerreturnJobMainBaseVO.java @@ -169,4 +169,6 @@ public class CustomerreturnJobMainBaseVO { @Schema(description = "允许修改箱码") private String allowModifyPackingNumber; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java index 7de85ff2..b560b083 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRecord/vo/CustomerreturnRecordMainBaseVO.java @@ -123,4 +123,6 @@ public class CustomerreturnRecordMainBaseVO { @Schema(description = "从库区代码范围") private String fromAreaCodes; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java index 8a5d08d5..d58d8617 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customerreturnRequest/vo/CustomerreturnRequestMainBaseVO.java @@ -122,4 +122,7 @@ public class CustomerreturnRequestMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatus; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java index e94785b9..06897bf4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRecord/vo/CustomersettleRecordMainBaseVO.java @@ -94,4 +94,6 @@ public class CustomersettleRecordMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java index 0ef5575d..0ab2a35f 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/customersettleRequest/vo/CustomersettleRequestMainBaseVO.java @@ -91,4 +91,6 @@ public class CustomersettleRequestMainBaseVO { @Schema(description = "直接生成记录") private String directCreateRecord; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java index f42a1019..4c5851a4 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverJob/vo/DeliverJobMainBaseVO.java @@ -172,4 +172,6 @@ public class DeliverJobMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatuses; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java index 09835003..54f2d30b 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverPlan/vo/DeliverPlanMainBaseVO.java @@ -62,4 +62,6 @@ public class DeliverPlanMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java index 080fbc20..00bb5583 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRecord/vo/DeliverRecordMainBaseVO.java @@ -123,4 +123,6 @@ public class DeliverRecordMainBaseVO { @Schema(description = "是否可用") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java index f8f0d0e8..3e17fc76 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/deliverRequest/vo/DeliverRequestMainBaseVO.java @@ -120,4 +120,7 @@ public class DeliverRequestMainBaseVO { @Schema(description = "出库库存状态范围") private String outInventoryStatus; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java index 43c8d672..86660b5d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRecord/vo/InventorychangeRecordMainBaseVO.java @@ -90,4 +90,7 @@ public class InventorychangeRecordMainBaseVO { @Schema(description = "状态") private String status; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java index a1d653d2..11ab89be 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorychangeRequest/vo/InventorychangeRequestMainBaseVO.java @@ -78,4 +78,6 @@ public class InventorychangeRequestMainBaseVO { @NotNull(message = "直接生成记录不能为空") private String directCreateRecord; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java index e766e872..30fdeb85 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveJob/vo/InventorymoveJobMainBaseVO.java @@ -150,4 +150,6 @@ public class InventorymoveJobMainBaseVO { @Schema(description = "允许修改箱码") private String allowModifyPackingNumber; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java index c238286f..b83f5500 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRecord/vo/InventorymoveRecordMainBaseVO.java @@ -118,4 +118,6 @@ public class InventorymoveRecordMainBaseVO { @NotNull(message = "是否可用不能为空") private String available; + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java index d542badd..4eab7494 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/inventorymoveRequest/vo/InventorymoveRequestMainExcelVO.java @@ -174,4 +174,7 @@ public class InventorymoveRequestMainExcelVO { @ExcelProperty("物品代码") private String itemCode; + + @Schema(description = "乐观锁") + private Integer concurrencyStamp; } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java index 9776a1df..8d8f132c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRecord/CustomerreceiptRecordMainDO.java @@ -1,11 +1,7 @@ package com.win.module.wms.dal.dataobject.customerreceiptRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java index 2cf7535e..ef973584 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreceiptRequest/CustomerreceiptRequestMainDO.java @@ -114,6 +114,7 @@ public class CustomerreceiptRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 从库位类型范围 @@ -163,5 +164,4 @@ public class CustomerreceiptRequestMainDO extends BaseDO { * 出库库存状态范围 */ private String outInventoryStatuses; - } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java index 24b1f22e..5645a9ef 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnJob/CustomerreturnJobMainDO.java @@ -1,5 +1,6 @@ package com.win.module.wms.dal.dataobject.customerreturnJob; +import com.sun.xml.bind.v2.TODO; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -104,6 +105,7 @@ public class CustomerreturnJobMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java index f55023da..bd3c970e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customerreturnRequest/CustomerreturnRequestMainDO.java @@ -112,6 +112,7 @@ public class CustomerreturnRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java index 0956200b..2a4a2a33 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/customersettleRequest/CustomersettleRequestMainDO.java @@ -105,6 +105,7 @@ public class CustomersettleRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java index c69f1b5d..dffe76b8 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverJob/DeliverJobMainDO.java @@ -106,6 +106,7 @@ public class DeliverJobMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java index 65930868..cfdfe997 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverPlan/DeliverPlanMainDO.java @@ -79,6 +79,7 @@ public class DeliverPlanMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java index 42674df6..5259c9d9 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRecord/DeliverRecordMainDO.java @@ -1,11 +1,7 @@ package com.win.module.wms.dal.dataobject.deliverRecord; +import com.sun.xml.bind.v2.TODO; import lombok.*; -import java.util.*; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; -import java.time.LocalDateTime; import java.time.LocalDateTime; import com.baomidou.mybatisplus.annotation.*; import com.win.framework.mybatis.core.dataobject.BaseDO; diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java index 3ef5b41d..31e34436 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/deliverRequest/DeliverRequestMainDO.java @@ -128,6 +128,7 @@ public class DeliverRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 权限所属人员id diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java index 34b854e7..b38f1285 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorychangeRequest/InventorychangeRequestMainDO.java @@ -74,6 +74,7 @@ public class InventorychangeRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 自动提交 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java index d7cc7f49..5e37103a 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveJob/InventorymoveJobMainDO.java @@ -75,6 +75,7 @@ public class InventorymoveJobMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 状态 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java index 76282f5c..a8760228 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/inventorymoveRequest/InventorymoveRequestMainDO.java @@ -74,6 +74,7 @@ public class InventorymoveRequestMainDO extends BaseDO { /** * 并发乐观锁 */ + @Version private String concurrencyStamp; /** * 从仓库代码 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java index 16f7c22c..375b7870 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRecord/CustomerreturnRecordMainServiceImpl.java @@ -33,6 +33,7 @@ import javax.annotation.Resource; import org.springframework.transaction.annotation.Transactional; import org.springframework.validation.annotation.Validated; +import java.time.LocalDateTime; import java.util.*; import com.win.module.wms.dal.dataobject.customerreturnRecord.CustomerreturnRecordMainDO; @@ -85,6 +86,10 @@ public class CustomerreturnRecordMainServiceImpl implements CustomerreturnRecord mainDO.setNumber(number); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("CustomerreturnRecord"); mainDO.setBusinessType(businesstypeDO.getCode()); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + mainDO.setDepartmentCode(user.getDeptId().toString()); + mainDO.setExecuteTime(LocalDateTime.now()); + mainDO.setActiveDate(LocalDateTime.now()); mainDO.setAvailable("TRUE"); customerreturnRecordMainMapper.insert(mainDO); //库存事务 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java index 3e0b17eb..2c9b572e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/customerreturnRequest/CustomerreturnRequestMainServiceImpl.java @@ -336,6 +336,7 @@ public class CustomerreturnRequestMainServiceImpl implements CustomerreturnReque customerreturnJobMainDO.setCreateTime(null); customerreturnJobMainDO.setUpdater(null); customerreturnJobMainDO.setUpdateTime(null); + customerreturnJobMainDO.setConcurrencyStamp("1"); customerreturnJobMainDO.setInInventoryStatuses(mainDO.getInInventoryStatuses()); customerreturnJobMainDO.setOutInventoryStatuses(mainDO.getOutInventoryStatuses()); // 获取任务单据设置 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java index 650ce1ed..d1fcd239 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRecord/DeliverRecordMainServiceImpl.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.win.framework.common.pojo.CustomConditions; import com.win.module.infra.api.trends.TrendsApi; import com.win.module.infra.enums.TrendsTypeEnum; +import com.win.module.system.api.dept.DeptApi; import com.win.module.system.api.serialnumber.SerialNumberApi; import com.win.module.system.api.user.AdminUserApi; import com.win.module.system.api.user.dto.AdminUserRespDTO; @@ -75,6 +76,8 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { private RecordsettingService recordsettingService; @Resource private LocationService locationService; + @Resource + private DeptApi deptApi; @Override @Transactional @@ -85,6 +88,8 @@ public class DeliverRecordMainServiceImpl implements DeliverRecordMainService { List subDOList = DeliverRecordDetailConvert.INSTANCE.convertList03(createReqVO.getSubList()); String number = serialNumberApi.generateCode(RuleCodeEnum.DELIVER_RECORD.getCode()); mainDO.setNumber(number); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + mainDO.setDepartmentCode(user.getDeptId().toString()); mainDO.setExecuteTime(LocalDateTime.now()); mainDO.setActiveDate(LocalDateTime.now()); BusinesstypeDO businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("DeliverRecord"); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java index 72fc2d52..2b88f77d 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/deliverRequest/DeliverRequestMainServiceImpl.java @@ -581,6 +581,7 @@ public class DeliverRequestMainServiceImpl implements DeliverRequestMainService deliverJobMainDO.setUpdater(null); deliverJobMainDO.setUpdateTime(null); deliverJobMainDO.setStatus("1"); + deliverJobMainDO.setConcurrencyStamp("1"); // 获取任务单据设置 JobsettingDO jobsettingDO = jobsettingService.selectJobsettingExist("DeliverJob"); deliverJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java index 4372b27b..33bed38c 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRecord/InventorymoveRecordMainServiceImpl.java @@ -30,6 +30,7 @@ import org.springframework.stereotype.Service; import javax.annotation.Resource; import org.springframework.validation.annotation.Validated; +import java.time.LocalDateTime; import java.util.*; import com.win.module.wms.dal.dataobject.inventorymoveRecord.InventorymoveRecordMainDO; @@ -96,11 +97,16 @@ public class InventorymoveRecordMainServiceImpl implements InventorymoveRecordMa number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("OkToScrapRecord"); }else if("InventoryMoveRecord".equals(mainDO.getBusinessType())){ - number = serialNumberApi.generateCode(RuleCodeEnum.OK_TO_SCRAP_RECORD.getCode()); + number = serialNumberApi.generateCode(RuleCodeEnum.INVENTORY_MOVE_RECORD.getCode()); businesstypeDO = jobUtils.selectDocumentSettingFromBusinessType("InventoryMoveRecord"); } mainDO.setNumber(number); mainDO.setBusinessType(businesstypeDO.getCode()); + mainDO.setInterfaceType(recordsettingDO.getInterfaceType()); + AdminUserRespDTO user = userApi.getUser(Long.valueOf(mainDO.getCreator())); + mainDO.setDepartmentCode(user.getDeptId().toString()); + mainDO.setExecuteTime(LocalDateTime.now()); + mainDO.setActiveDate(LocalDateTime.now()); mainDO.setAvailable("TRUE"); inventorymoveRecordMainMapper.insert(mainDO); //库存事务 diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java index bd7b14b8..18be7b1e 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/inventorymoveRequest/InventorymoveRequestMainServiceImpl.java @@ -673,6 +673,7 @@ public class InventorymoveRequestMainServiceImpl implements InventorymoveRequest inventorymoveJobMainDO.setCreateTime(null); inventorymoveJobMainDO.setUpdater(null); inventorymoveJobMainDO.setUpdateTime(null); + inventorymoveJobMainDO.setConcurrencyStamp("1"); inventorymoveJobMainDO.setExpiredTime(inventorymoveJobMainDO.getRequestDueTime()); inventorymoveJobMainDO.setAutoComplete(jobsettingDO.getAutoComplete()); inventorymoveJobMainDO.setAllowModifyLocation(jobsettingDO.getAllowModifyLocation());