Merge remote-tracking branch 'origin/master'

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailaBaseVO.java

@@ -103,4 +103,6 @@ public class ProductrepairRequestDetailaBaseVO {
     @Schema(description = "成品库位代码")
     private String fgFromLocationCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestDetailbBaseVO.java

@@ -78,4 +78,7 @@ public class ProductrepairRequestDetailbBaseVO {
 
     @Schema(description = "数量")
     private BigDecimal qty;
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productrepairRequest/vo/ProductrepairRequestMainBaseVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestDetailBaseVO.java

@@ -95,4 +95,7 @@ public class ProductscrapRequestDetailBaseVO {
 
     @Schema(description = "主键ID")
     private Long masterId;
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/ProductscrapRequestMainBaseVO.java

@@ -97,4 +97,7 @@ public class ProductscrapRequestMainBaseVO {
 
     @Schema(description = "主键ID")
     private Long masterId;
+
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productscrapRequest/vo/RawscrapRequestDetailBaseVO.java

@@ -65,4 +65,5 @@ public class RawscrapRequestDetailBaseVO {
     @Schema(description = "数量")
     private BigDecimal qty;
 
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapJob/vo/ScrapJobMainBaseVO.java

@@ -134,4 +134,7 @@ public class ScrapJobMainBaseVO {
     @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/scrapRecord/ScrapRecordMainController.java

@@ -43,7 +43,7 @@ public class ScrapRecordMainController {
     @PostMapping("/create")
     @Operation(summary = "创建报废出库记录主")
     @PreAuthorize("@ss.hasPermission('wms:scrap-record-main:create')")
-    public CommonResult<Long> createScrapRecordMain(@Valid @RequestBody ScrapRecordMainCreateReqVO createReqVO) {
+    public CommonResult<String> createScrapRecordMain(@Valid @RequestBody ScrapRecordMainCreateReqVO createReqVO) {
         return success(scrapRecordMainService.createScrapRecordMain(createReqVO));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestDetailBaseVO.java

@@ -86,6 +86,7 @@ public class ScrapRequestDetailBaseVO {
     @Schema(description = "master_id", example = "master_id")
     private Long masterId;
 
-
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/scrapRequest/vo/ScrapRequestMainBaseVO.java

@@ -82,4 +82,6 @@ public class ScrapRequestMainBaseVO {
     @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/transferissueJob/vo/TransferissueJobMainBaseVO.java

@@ -155,4 +155,7 @@ public class TransferissueJobMainBaseVO {
     @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/transferissueRequest/vo/TransferissueRequestDetailBaseVO.java

@@ -92,4 +92,7 @@ public class TransferissueRequestDetailBaseVO {
     @NotNull(message = "来源库位不能为空")
     private String fromLocationCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferissueRequest/vo/TransferissueRequestMainBaseVO.java

@@ -107,4 +107,6 @@ public class TransferissueRequestMainBaseVO {
     @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/transferreceiptJob/vo/TransferreceiptJobMainBaseVO.java

@@ -156,4 +156,7 @@ public class TransferreceiptJobMainBaseVO {
     @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/transferreceiptRequest/vo/TransferreceiptRequestDetailBaseVO.java

@@ -96,4 +96,7 @@ public class TransferreceiptRequestDetailBaseVO {
     @Schema(description = "到包装号")
     private String toPackingNumber;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferreceiptRequest/vo/TransferreceiptRequestMainBaseVO.java

@@ -113,4 +113,7 @@ public class TransferreceiptRequestMainBaseVO {
     @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/unplannedissueJob/vo/UnplannedissueJobMainBaseVO.java

@@ -136,4 +136,7 @@ public class UnplannedissueJobMainBaseVO {
     @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/unplannedissueRecord/UnplannedissueRecordMainController.java

@@ -43,7 +43,7 @@ public class UnplannedissueRecordMainController {
     @PostMapping("/create")
     @Operation(summary = "创建计划外出库记录主")
     @PreAuthorize("@ss.hasPermission('wms:unplannedissue-record-main:create')")
-    public CommonResult<Long> createUnplannedissueRecordMain(@Valid @RequestBody UnplannedissueRecordMainCreateReqVO createReqVO) {
+    public CommonResult<String> createUnplannedissueRecordMain(@Valid @RequestBody UnplannedissueRecordMainCreateReqVO createReqVO) {
         return success(unplannedissueRecordMainService.createUnplannedissueRecordMain(createReqVO));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailBaseVO.java

@@ -26,18 +26,15 @@ public class UnplannedissueRecordDetailBaseVO {
     private String ownerCode;
 
     @Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "包装号不能为空")
     private String packingNumber;
 
     @Schema(description = "器具号")
     private String containerNumber;
 
     @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "批次不能为空")
     private String batch;
 
     @Schema(description = "从库位代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "从库位代码不能为空")
     private String fromLocationCode;
 
     @Schema(description = "从库位组代码")
@@ -47,7 +44,6 @@ public class UnplannedissueRecordDetailBaseVO {
     private String fromAreaCode;
 
     @Schema(description = "库存状态", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "库存状态不能为空")
     private String inventoryStatus;
 
     @Schema(description = "原因")
@@ -87,19 +83,16 @@ public class UnplannedissueRecordDetailBaseVO {
     private String number;
 
     @Schema(description = "物品代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "物品代码不能为空")
     private String itemCode;
 
     @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 = "任务明细ID")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRecord/vo/UnplannedissueRecordDetailCreateReqVO.java

@@ -9,4 +9,23 @@ import io.swagger.v3.oas.annotations.media.Schema;
 @ToString(callSuper = true)
 public class UnplannedissueRecordDetailCreateReqVO extends UnplannedissueRecordDetailBaseVO {
 
+    @Schema(description = "到包装号")
+    private String toPackingNumber;
+
+    @Schema(description = "到批次")
+    private String toBatch;
+
+    @Schema(description = "到库位代码")
+    private String toLocationCode;
+
+    @Schema(description = "从包装号")
+    private String fromPackingNumber;
+
+    @Schema(description = "从批次")
+    private String fromBatch;
+
+    @Schema(description = "从库位代码")
+    private String fromLocationCode;
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedissueRequest/vo/UnplannedissueRequestMainBaseVO.java

@@ -52,7 +52,6 @@ public class UnplannedissueRequestMainBaseVO {
     private LocalDateTime dueTime;
 
     @Schema(description = "部门", requiredMode = Schema.RequiredMode.REQUIRED)
-    // @NotNull(message = "部门不能为空")
     private String departmentCode;
 
     @Schema(description = "状态")
@@ -75,19 +74,16 @@ public class UnplannedissueRequestMainBaseVO {
     private String fromAreaCodes;
 
     @Schema(description = "自动提交", requiredMode = Schema.RequiredMode.REQUIRED)
-    // @NotNull(message = "自动提交不能为空")
     private String autoCommit;
 
     @Schema(description = "自动通过", requiredMode = Schema.RequiredMode.REQUIRED)
-    // @NotNull(message = "自动通过不能为空")
     private String autoAgree;
 
     @Schema(description = "自动执行", requiredMode = Schema.RequiredMode.REQUIRED)
-    // @NotNull(message = "自动执行不能为空")
     private String autoExecute;
 
     @Schema(description = "直接生成记录", requiredMode = Schema.RequiredMode.REQUIRED)
-    // @NotNull(message = "直接生成记录不能为空")
     private String directCreateRecord;
 
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptJob/vo/UnplannedreceiptJobMainBaseVO.java

@@ -136,4 +136,7 @@ public class UnplannedreceiptJobMainBaseVO {
     @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/unplannedreceiptRecord/UnplannedreceiptRecordMainController.java

@@ -43,7 +43,7 @@ public class UnplannedreceiptRecordMainController {
     @PostMapping("/create")
     @Operation(summary = "创建计划外入库记录主")
     @PreAuthorize("@ss.hasPermission('wms:unplannedreceipt-record-main:create')")
-    public CommonResult<Long> createUnplannedreceiptRecordMain(@Valid @RequestBody UnplannedreceiptRecordMainCreateReqVO createReqVO) {
+    public CommonResult<String> createUnplannedreceiptRecordMain(@Valid @RequestBody UnplannedreceiptRecordMainCreateReqVO createReqVO) {
         return success(unplannedreceiptRecordMainService.createUnplannedreceiptRecordMain(createReqVO));
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailBaseVO.java

@@ -1,15 +1,11 @@
 package com.win.module.wms.controller.unplannedreceiptRecord.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
+import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
+import java.time.LocalDateTime;
+
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
@@ -26,36 +22,30 @@ public class UnplannedreceiptRecordDetailBaseVO {
     private String ownerCode;
 
     @Schema(description = "包装号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "包装号不能为空")
     private String packingNumber;
 
     @Schema(description = "器具号")
     private String containerNumber;
 
     @Schema(description = "批次", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "批次不能为空")
     private String batch;
 
     @Schema(description = "替代批次")
     private String altBatch;
 
     @Schema(description = "到货日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到货日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime arriveDate;
 
     @Schema(description = "生产日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "生产日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime produceDate;
 
     @Schema(description = "过期日期", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "过期日期不能为空")
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private LocalDateTime expireDate;
 
     @Schema(description = "到库位代码", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "到库位代码不能为空")
     private String toLocationCode;
 
     @Schema(description = "到库位组代码")
@@ -65,7 +55,6 @@ public class UnplannedreceiptRecordDetailBaseVO {
     private String toAreaCode;
 
     @Schema(description = "库存状态", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "库存状态不能为空")
     private String inventoryStatus;
 
     @Schema(description = "原因")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordDetailCreateReqVO.java

@@ -9,4 +9,21 @@ import io.swagger.v3.oas.annotations.media.Schema;
 @ToString(callSuper = true)
 public class UnplannedreceiptRecordDetailCreateReqVO extends UnplannedreceiptRecordDetailBaseVO {
 
+    @Schema(description = "到包装号")
+    private String toPackingNumber;
+
+    @Schema(description = "到批次")
+    private String toBatch;
+
+    @Schema(description = "到库位代码")
+    private String toLocationCode;
+
+    @Schema(description = "从包装号")
+    private String fromPackingNumber;
+
+    @Schema(description = "从批次")
+    private String fromBatch;
+
+    @Schema(description = "从库位代码")
+    private String fromLocationCode;
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRecord/vo/UnplannedreceiptRecordMainBaseVO.java

@@ -24,7 +24,6 @@ public class UnplannedreceiptRecordMainBaseVO {
     private Long id;
 
     @Schema(description = "申请单号", requiredMode = Schema.RequiredMode.REQUIRED)
-    @NotNull(message = "申请单号不能为空")
     private String requestNumber;
 
     @Schema(description = "任务单号")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestDetailBaseVO.java

@@ -104,4 +104,7 @@ public class UnplannedreceiptRequestDetailBaseVO {
     @Schema(description = "master_id", example = "master_id")
     private Long masterId;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/unplannedreceiptRequest/vo/UnplannedreceiptRequestMainBaseVO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailaDO.java

@@ -118,6 +118,7 @@ public class ProductrepairRequestDetailaDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
 
     /**

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestDetailbDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.productrepairRequest;
 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.*;
@@ -89,6 +90,7 @@ public class ProductrepairRequestDetailbDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 数量

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productrepairRequest/ProductrepairRequestMainDO.java

@@ -89,6 +89,7 @@ public class ProductrepairRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 权限所属人员id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/ProductscrapRequestDetailDO.java

@@ -114,6 +114,7 @@ public class ProductscrapRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 生产线代码

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/ProductscrapRequestMainDO.java

@@ -80,6 +80,7 @@ public class ProductscrapRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 权限所属人员id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/productscrapRequest/RawscrapRequestDetailDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.productscrapRequest;
 
 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.*;
 
@@ -85,6 +86,7 @@ public class RawscrapRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 数量

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapJob/ScrapJobMainDO.java

@@ -64,6 +64,7 @@ public class ScrapJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 状态

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRequest/ScrapRequestDetailDO.java

@@ -108,6 +108,7 @@ public class ScrapRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/scrapRequest/ScrapRequestMainDO.java

@@ -77,6 +77,7 @@ public class ScrapRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 权限所属人员id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueJob/TransferissueJobMainDO.java

@@ -108,6 +108,7 @@ public class TransferissueJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 状态

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRequest/TransferissueRequestDetailDO.java

@@ -102,6 +102,7 @@ public class TransferissueRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 从货主代码

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferissueRequest/TransferissueRequestMainDO.java

@@ -89,6 +89,7 @@ public class TransferissueRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 权限所属人员id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptJob/TransferreceiptJobMainDO.java

@@ -88,6 +88,7 @@ public class TransferreceiptJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 状态

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRequest/TransferreceiptRequestDetailDO.java

@@ -102,6 +102,7 @@ public class TransferreceiptRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 到货主代码

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferreceiptRequest/TransferreceiptRequestMainDO.java

@@ -89,6 +89,7 @@ public class TransferreceiptRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 权限所属人员id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueJob/UnplannedissueJobMainDO.java

@@ -64,6 +64,7 @@ public class UnplannedissueJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 状态

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedissueRequest/UnplannedissueRequestMainDO.java

@@ -77,6 +77,7 @@ public class UnplannedissueRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 权限所属人员id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptJob/UnplannedreceiptJobMainDO.java

@@ -64,6 +64,7 @@ public class UnplannedreceiptJobMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 状态

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestDetailDO.java

@@ -122,6 +122,7 @@ public class UnplannedreceiptRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/unplannedreceiptRequest/UnplannedreceiptRequestMainDO.java

@@ -77,6 +77,7 @@ public class UnplannedreceiptRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
+    @Version
     private String concurrencyStamp;
     /**
      * 权限所属人员id

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainService.java

@@ -21,7 +21,7 @@ public interface ScrapRecordMainService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createScrapRecordMain(@Valid ScrapRecordMainCreateReqVO createReqVO);
+    String createScrapRecordMain(@Valid ScrapRecordMainCreateReqVO createReqVO);
     /**
      * 获得用高级搜索报废出库记录主分页列表
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/scrapRecord/ScrapRecordMainServiceImpl.java

@@ -11,10 +11,12 @@ import com.win.module.wms.controller.scrapRecord.vo.*;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.convert.scrapRecord.ScrapRecordDetailConvert;
 import com.win.module.wms.convert.scrapRecord.ScrapRecordMainConvert;
+import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordDetailDO;
 import com.win.module.wms.dal.dataobject.scrapRecord.ScrapRecordMainDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
+import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordDetailMapper;
 import com.win.module.wms.dal.mysql.scrapRecord.ScrapRecordMainMapper;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -60,10 +62,13 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService {
     private TransactionService transactionService;
     @Resource
     private TrendsApi trendsApi;
+    @Resource
+    private BalanceMapper balanceMapper;
+
 
     @Transactional
     @Override
-    public Long createScrapRecordMain(ScrapRecordMainCreateReqVO createReqVO) {
+    public String createScrapRecordMain(ScrapRecordMainCreateReqVO createReqVO) {
         ScrapRecordMainDO scrapRecordMainDO = ScrapRecordMainConvert.INSTANCE.convert(createReqVO);
         String number = serialNumberApi.generateCode(RuleCodeEnum.SCRAP_RECORD.getCode());
         scrapRecordMainDO.setNumber(number);
@@ -92,6 +97,9 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService {
             recordDetailDO.setId(null);
             scrapRecordDetailMapper.insert(recordDetailDO);
 
+            //查询库存余额
+            BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getFromLocationCode());
+
             //添加库存事务list
             TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
             BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO);
@@ -108,13 +116,17 @@ public class ScrapRecordMainServiceImpl implements ScrapRecordMainService {
             transactionCreateReqVO.setBatch(recordDetailDO.getBatch());
             transactionCreateReqVO.setWarehouseCode(scrapRecordMainDO.getFromWarehouseCode());
             transactionCreateReqVO.setRecordNumber(number);
+            transactionCreateReqVO.setAmount(balanceDO.getAmount());
+            transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate());
+            transactionCreateReqVO.setProduceDate(balanceDO.getProduceDate());
+            transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
             transactionCreateReqVO.setId(null);
             transactionCreateReqVOList.add(transactionCreateReqVO);
         }
         //增加库存事务
         transactionService.createTransaction(transactionCreateReqVOList);
         trendsApi.createTrends(scrapRecordMainDO.getId(), "ScrapRecord", "增加了报废出库记录", TrendsTypeEnum.CREATE);
-        return scrapRecordMainDO.getId();
+        return number;
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainService.java

@@ -22,7 +22,7 @@ public interface UnplannedissueRecordMainService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createUnplannedissueRecordMain(@Valid UnplannedissueRecordMainCreateReqVO createReqVO);
+    String createUnplannedissueRecordMain(@Valid UnplannedissueRecordMainCreateReqVO createReqVO);
     /**
      * 获得用高级搜索户分页列表
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedissueRecord/UnplannedissueRecordMainServiceImpl.java

@@ -11,10 +11,12 @@ import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.controller.unplannedissueRecord.vo.*;
 import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordDetailConvert;
 import com.win.module.wms.convert.unplannedissueRecord.UnplannedissueRecordMainConvert;
+import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedissueRecord.UnplannedissueRecordMainDO;
+import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordDetailMapper;
 import com.win.module.wms.dal.mysql.unplannedissueRecord.UnplannedissueRecordMainMapper;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -60,10 +62,13 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord
     private TransactionService transactionService;
     @Resource
     private TrendsApi trendsApi;
+    @Resource
+    private BalanceMapper balanceMapper;
+
 
     @Transactional
     @Override
-    public Long createUnplannedissueRecordMain(UnplannedissueRecordMainCreateReqVO createReqVO) {
+    public String createUnplannedissueRecordMain(UnplannedissueRecordMainCreateReqVO createReqVO) {
         UnplannedissueRecordMainDO unplannedissueRecordMainDO = UnplannedissueRecordMainConvert.INSTANCE.convert(createReqVO);
         String number = serialNumberApi.generateCode(RuleCodeEnum.UNPLANNED_DELIVER_RECORD.getCode());
         unplannedissueRecordMainDO.setNumber(number);
@@ -81,6 +86,7 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord
         unplannedissueRecordMainDO.setId(null);
         unplannedissueRecordMainDO.setCreator(null);
         unplannedissueRecordMainDO.setCreateTime(LocalDateTime.now());
+        unplannedissueRecordMainDO.setDepartmentCode(userApi.getUser(getLoginUserId()).getDeptId().toString());
         unplannedissueRecordMainMapper.insert(unplannedissueRecordMainDO);
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
@@ -90,8 +96,14 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord
             recordDetailDO.setNumber(number);
             recordDetailDO.setMasterId(unplannedissueRecordMainDO.getId());
             recordDetailDO.setId(null);
+            recordDetailDO.setPackingNumber(unplannedissueRecordDetailCreateReqVO.getFromPackingNumber());
+            recordDetailDO.setBatch(unplannedissueRecordDetailCreateReqVO.getFromBatch());
+            recordDetailDO.setFromLocationCode(unplannedissueRecordDetailCreateReqVO.getFromLocationCode());
             unplannedissueRecordDetailMapper.insert(recordDetailDO);
 
+            //查询库存余额
+            BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getFromLocationCode());
+
             //添加库存事务list
             TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
             BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO);
@@ -108,13 +120,17 @@ public class UnplannedissueRecordMainServiceImpl implements UnplannedissueRecord
             transactionCreateReqVO.setBatch(recordDetailDO.getBatch());
             transactionCreateReqVO.setWarehouseCode(unplannedissueRecordMainDO.getFromWarehouseCode());
             transactionCreateReqVO.setRecordNumber(number);
+            transactionCreateReqVO.setAmount(balanceDO.getAmount());
+            transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate());
+            transactionCreateReqVO.setProduceDate(balanceDO.getProduceDate());
+            transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
             transactionCreateReqVO.setId(null);
             transactionCreateReqVOList.add(transactionCreateReqVO);
         }
         //增加库存事务
         transactionService.createTransaction(transactionCreateReqVOList);
         trendsApi.createTrends(unplannedissueRecordMainDO.getId(), "UnplannedDeliverRecord", "增加了计划外出库申请记录", TrendsTypeEnum.CREATE);
-        return unplannedissueRecordMainDO.getId();
+        return number;
     }
 
     @Override

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainService.java

@@ -21,7 +21,7 @@ public interface UnplannedreceiptRecordMainService {
      * @param createReqVO 创建信息
      * @return 编号
      */
-    Long createUnplannedreceiptRecordMain(@Valid UnplannedreceiptRecordMainCreateReqVO createReqVO);
+    String createUnplannedreceiptRecordMain(@Valid UnplannedreceiptRecordMainCreateReqVO createReqVO);
 
     /**
      * 获得用高级搜索户分页列表

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/unplannedreceiptRecord/UnplannedreceiptRecordMainServiceImpl.java

@@ -11,10 +11,12 @@ import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.controller.unplannedreceiptRecord.vo.*;
 import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordDetailConvert;
 import com.win.module.wms.convert.unplannedreceiptRecord.UnplannedreceiptRecordMainConvert;
+import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
 import com.win.module.wms.dal.dataobject.transactiontype.TransactiontypeDO;
 import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordDetailDO;
 import com.win.module.wms.dal.dataobject.unplannedreceiptRecord.UnplannedreceiptRecordMainDO;
+import com.win.module.wms.dal.mysql.balance.BalanceMapper;
 import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordDetailMapper;
 import com.win.module.wms.dal.mysql.unplannedreceiptRecord.UnplannedreceiptRecordMainMapper;
 import com.win.module.wms.service.recordsetting.RecordsettingService;
@@ -60,6 +62,8 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe
     private TransactionService transactionService;
     @Resource
     private TrendsApi trendsApi;
+    @Resource
+    private BalanceMapper balanceMapper;
 
     @Override
     public PageResult<UnplannedreceiptRecordMainDO> getUnplannedreceiptRecordMainSenior(CustomConditions conditions) {
@@ -68,7 +72,7 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe
 
     @Transactional
     @Override
-    public Long createUnplannedreceiptRecordMain(UnplannedreceiptRecordMainCreateReqVO createReqVO) {
+    public String createUnplannedreceiptRecordMain(UnplannedreceiptRecordMainCreateReqVO createReqVO) {
         UnplannedreceiptRecordMainDO unplannedreceiptRecordMainDO = UnplannedreceiptRecordMainConvert.INSTANCE.convert(createReqVO);
         String number = serialNumberApi.generateCode(RuleCodeEnum.UNPLANNED_RECEIPT_RECORD.getCode());
         unplannedreceiptRecordMainDO.setNumber(number);
@@ -86,6 +90,7 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe
         unplannedreceiptRecordMainDO.setId(null);
         unplannedreceiptRecordMainDO.setCreator(null);
         unplannedreceiptRecordMainDO.setCreateTime(LocalDateTime.now());
+        unplannedreceiptRecordMainDO.setDepartmentCode(userApi.getUser(getLoginUserId()).getDeptId().toString());
         unplannedreceiptRecordMainMapper.insert(unplannedreceiptRecordMainDO);
         //库存事务
         List<TransactionCreateReqVO> transactionCreateReqVOList = new ArrayList<>();
@@ -94,9 +99,15 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe
             UnplannedreceiptRecordDetailDO recordDetailDO = UnplannedreceiptRecordDetailConvert.INSTANCE.convert(unplannedreceiptRecordDetailCreateReqVO);
             recordDetailDO.setNumber(number);
             recordDetailDO.setMasterId(unplannedreceiptRecordMainDO.getId());
+            recordDetailDO.setPackingNumber(unplannedreceiptRecordDetailCreateReqVO.getToPackingNumber());
+            recordDetailDO.setToLocationCode(unplannedreceiptRecordDetailCreateReqVO.getToLocationCode());
+            recordDetailDO.setBatch(unplannedreceiptRecordDetailCreateReqVO.getToBatch());
             recordDetailDO.setId(null);
             unplannedreceiptRecordDetailMapper.insert(recordDetailDO);
 
+            //查询库存余额
+            BalanceDO balanceDO = balanceMapper.getBalanceQty(recordDetailDO.getPackingNumber(), recordDetailDO.getItemCode(), recordDetailDO.getBatch(), recordDetailDO.getInventoryStatus(), recordDetailDO.getToLocationCode());
+
             //添加库存事务list
             TransactionCreateReqVO transactionCreateReqVO = new TransactionCreateReqVO();
             BeanUtils.copyProperties(recordDetailDO, transactionCreateReqVO);
@@ -113,13 +124,17 @@ public class UnplannedreceiptRecordMainServiceImpl implements UnplannedreceiptRe
             transactionCreateReqVO.setBatch(recordDetailDO.getBatch());
             transactionCreateReqVO.setWarehouseCode(unplannedreceiptRecordMainDO.getToWarehouseCode());
             transactionCreateReqVO.setRecordNumber(number);
+            transactionCreateReqVO.setAmount(balanceDO.getAmount());
+            transactionCreateReqVO.setArriveDate(balanceDO.getArriveDate());
+            transactionCreateReqVO.setProduceDate(balanceDO.getProduceDate());
+            transactionCreateReqVO.setExpireDate(balanceDO.getExpireDate());
             transactionCreateReqVO.setId(null);
             transactionCreateReqVOList.add(transactionCreateReqVO);
         }
         //增加库存事务
         transactionService.createTransaction(transactionCreateReqVOList);
         trendsApi.createTrends(unplannedreceiptRecordMainDO.getId(), "UnplannedReceiptRecord", "增加了计划外入库申请记录", TrendsTypeEnum.CREATE);
-        return unplannedreceiptRecordMainDO.getId();
+        return number;
     }
 
     @Override