乐观锁DO/VO添加

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;
+
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;
 }

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;

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;
-
 }

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;
     /**
      * 状态

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

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

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;
     /**
      * 状态

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

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;

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

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;
     /**
      * 自动提交

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;
     /**
      * 状态

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;
     /**
      * 从仓库代码

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);
         //库存事务

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());
         // 获取任务单据设置

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<DeliverRecordDetailDO> 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");

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());

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);
         //库存事务

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());