Merge remote-tracking branch 'origin/master'

win-module-system/win-module-system-biz/src/main/java/com/win/module/system/service/dict/DictDataServiceImpl.java

@@ -1,8 +1,8 @@
 package com.win.module.system.service.dict;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.exceptions.UtilException;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.google.common.annotations.VisibleForTesting;
 import com.win.framework.common.enums.CommonStatusEnum;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.common.util.collection.CollectionUtils;
@@ -14,7 +14,6 @@ import com.win.module.system.convert.dict.DictDataConvert;
 import com.win.module.system.dal.dataobject.dict.DictDataDO;
 import com.win.module.system.dal.dataobject.dict.DictTypeDO;
 import com.win.module.system.dal.mysql.dict.DictDataMapper;
-import com.google.common.annotations.VisibleForTesting;
 import com.win.module.system.dal.mysql.dict.DictTypeMapper;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -189,11 +188,11 @@ public class DictDataServiceImpl implements DictDataService {
     //调用公共方法   查询字典项
     @Override
     public DictDataDO selectDictTypeAndLabel(String ptype,String plabel) {
-        QueryWrapper queryWrapper = new QueryWrapper();
+        QueryWrapper<DictTypeDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("type",ptype);
         DictTypeDO dictTypeDO = dictTypeMapper.selectOne(queryWrapper);
         if(dictTypeDO != null && 0 == dictTypeDO.getStatus()){
-            QueryWrapper queryWrapper1 = new QueryWrapper();
+            QueryWrapper<DictDataDO> queryWrapper1 = new QueryWrapper<>();
             queryWrapper1.eq("dict_type",ptype);
             queryWrapper1.eq("label",plabel);
             DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1);
@@ -209,7 +208,7 @@ public class DictDataServiceImpl implements DictDataService {
 
     @Override
     public DictDataDO selectDictLabel(String plabel){
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<DictDataDO> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("label",plabel);
         DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1);
         if(dictDataDO != null && 0 == dictDataDO.getStatus()){
@@ -220,7 +219,7 @@ public class DictDataServiceImpl implements DictDataService {
     }
     @Override
     public DictDataDO selectDictValue(String value){
-        QueryWrapper queryWrapper1 = new QueryWrapper();
+        QueryWrapper<DictDataDO> queryWrapper1 = new QueryWrapper<>();
         queryWrapper1.eq("value",value);
         DictDataDO dictDataDO = dictDataMapper.selectOne(queryWrapper1);
         if(dictDataDO != null && 0 == dictDataDO.getStatus()){

win-module-wms/win-module-wms-api/src/main/java/com/win/module/wms/enums/DictTypeConstants.java

@@ -68,6 +68,7 @@ public interface DictTypeConstants {
     String INVENTORY_STATUS = "inventory_status";//库存状态
     String REQUEST_STATUS = "request_status";//请求状态
     String PLAN_STATUS = "plan_status";//计划状态
+    String PURCHASE_PLAN_STATUS = "purchase_plan_status";//计划状态
     String PURCHASE_ORDER_TYPE = "purchase_order_type";//采购订单类型
     String PURCHASE_RETURN_REASON = "purchase_return_reason";//原因
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/balance/vo/BalanceBaseVO.java

@@ -101,4 +101,7 @@ public class BalanceBaseVO {
     @Schema(description = "体积")
     private BigDecimal volume;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/container/vo/ContainerDetailBaseVO.java

@@ -1,10 +1,10 @@
 package com.win.module.wms.controller.container.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import javax.validation.constraints.*;
 
 /**
  * 器具子 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -38,4 +38,7 @@ public class ContainerDetailBaseVO {
     @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/container/vo/ContainerMainBaseVO.java

@@ -1,10 +1,10 @@
 package com.win.module.wms.controller.container.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import javax.validation.constraints.*;
 
 /**
  * 器具主 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -35,4 +35,7 @@ public class ContainerMainBaseVO {
     @NotNull(message = "货主代码不能为空")
     private String ownerCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

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/expectin/vo/ExpectinBaseVO.java

@@ -53,4 +53,7 @@ public class ExpectinBaseVO {
     @Schema(description = "货主代码")
     private String ownerCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/expectout/vo/ExpectoutBaseVO.java

@@ -1,10 +1,10 @@
 package com.win.module.wms.controller.expectout.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import javax.validation.constraints.*;
 
 /**
  * 预计出库存 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -56,4 +56,7 @@ public class ExpectoutBaseVO {
     @Schema(description = "货主代码")
     private String ownerCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/index/IndexController.java

@@ -1,6 +1,7 @@
 package com.win.module.wms.controller.index;
 
 import com.win.framework.common.pojo.CommonResult;
+import com.win.module.wms.service.balance.BalanceService;
 import com.win.module.wms.service.deliverPlan.DeliverPlanMainService;
 import com.win.module.wms.service.issueRequest.IssueRequestMainService;
 import com.win.module.wms.service.location.LocationService;
@@ -59,6 +60,8 @@ public class IndexController {
     private ProductputawayJobDetailService productputawayJobDetailService;
     @Resource
     private DeliverPlanMainService deliverPlanMainService;
+    @Resource
+    private BalanceService balanceService;
 
     @GetMapping("/indexSupplier")
     @Operation(summary = "供应商首页")
@@ -86,6 +89,8 @@ public class IndexController {
         dataMap.put("issueRequestTodayCount", issueRequestMainService.getIssueRequestToday());//今日叫料请求(已发料)
         dataMap.put("freeLocationCount", locationService.getFreeLocationCount());//空闲库位数
         dataMap.put("totalLocationCount", locationService.getTotalLocationCount());//总库位数
+        dataMap.put("stagnantBalanceList", balanceService.getStagnantBalanceList());//呆滞库存预警
+        dataMap.put("overdueBalanceList", balanceService.getOverdueBalanceList());//超期库存预警
         return success(dataMap);
     }
 
@@ -94,6 +99,8 @@ public class IndexController {
     public CommonResult<Map<String, Object>> indexProduct() {
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("deliverPlanTodayCount", deliverPlanMainService.getDeliverPlanToday());//今日发货计划(未发货)
+        dataMap.put("stagnantBalanceList", balanceService.getStagnantBalanceList());//呆滞库存预警
+        dataMap.put("overdueBalanceList", balanceService.getOverdueBalanceList());//超期库存预警
         return success(dataMap);
     }
 

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/InventorymoveRequestMainBaseVO.java

@@ -98,4 +98,6 @@ public class InventorymoveRequestMainBaseVO {
     @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/locationcapacity/vo/LocationcapacityBaseVO.java

@@ -1,12 +1,10 @@
 package com.win.module.wms.controller.locationcapacity.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
-import javax.validation.constraints.*;
 
 /**
  * 库位容量 Base VO，提供给添加、修改、详细的子 VO 使用
@@ -41,4 +39,7 @@ public class LocationcapacityBaseVO {
     @NotNull(message = "是否无限容量不能为空")
     private String isInfinity;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/packageMassage/vo/PackageBaseVO.java

@@ -156,4 +156,7 @@ public class PackageBaseVO {
     @Schema(description = "生产线")
     private String productionLineCodePackage;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/productionreturnRecord/vo/ProductionreturnRecordMainBaseVO.java

@@ -24,7 +24,6 @@ public class ProductionreturnRecordMainBaseVO {
     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/purchase/vo/PurchaseDetailBaseVO.java

@@ -114,8 +114,8 @@ public class PurchaseDetailBaseVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "并发乐观锁")
-    private String concurrencyStamp;
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
 
     @Schema(description = "明细状态", requiredMode = Schema.RequiredMode.REQUIRED)
     @NotNull(message = "明细状态不能为空")

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/purchasePlan/vo/PurchasePlanMainExcelVO.java

@@ -16,6 +16,8 @@ import java.time.LocalDateTime;
 @Data
 public class PurchasePlanMainExcelVO {
 
+    @ExcelProperty("单据号")
+    private String number;
     @ExcelProperty("供应商代码")
     private String supplierCode;
 
@@ -28,20 +30,12 @@ public class PurchasePlanMainExcelVO {
     @ExcelProperty("月台代码")
     private String dockCode;
 
-    @ExcelProperty("单据号")
-    private String number;
-
     @ExcelProperty("业务类型")
     private String businessType;
 
-    @ExcelProperty("备注")
-    private String remark;
-
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ExcelProperty("创建者用户名")
-    private String creator;
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @DictFormat("purchase_plan_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private String status;
 
     @ExcelProperty("开始时间")
     private String beginTime;
@@ -49,9 +43,11 @@ public class PurchasePlanMainExcelVO {
     @ExcelProperty("结束时间")
     private String endTime;
 
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    @DictFormat("plan_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-    private String status;
+    @ExcelProperty("创建时间")
+    private LocalDateTime createTime;
+
+    @ExcelProperty("创建者用户名")
+    private String creator;
 
     @ExcelProperty("最后更新时间")
     private LocalDateTime updateTime;
@@ -63,4 +59,7 @@ public class PurchasePlanMainExcelVO {
     @DictFormat("true_false") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
     private String available;
 
+    @ExcelProperty("备注")
+    private String remark;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/strategy/vo/StrategyBaseVO.java

@@ -40,4 +40,7 @@ public class StrategyBaseVO {
     @NotNull(message = "是否生效不能为空")
     private String isActive;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestDetailController.java

@@ -4,6 +4,8 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.system.api.user.dto.AdminUserRespDTO;
 import com.win.module.wms.controller.supplierinvoiceRequest.vo.*;
+import com.win.module.wms.convert.supplierinvoiceRequest.SupplierinvoiceRequestMainConvert;
+import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestMainDO;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
 import org.springframework.validation.annotation.Validated;
@@ -121,4 +123,6 @@ public class SupplierinvoiceRequestDetailController {
         ExcelUtils.write(response, "供应商发票申请子.xls", "数据", SupplierinvoiceRequestDetailExcelVO.class, datas);
     }
 
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/SupplierinvoiceRequestMainController.java

@@ -39,7 +39,6 @@ public class SupplierinvoiceRequestMainController {
 
     @Resource
     private SupplierinvoiceRequestMainService supplierinvoiceRequestMainService;
-
     @Resource
     private AdminUserApi userApi;
 
@@ -92,6 +91,7 @@ public class SupplierinvoiceRequestMainController {
         PageResult<SupplierinvoiceRequestMainDO> pageResult = supplierinvoiceRequestMainService.getSupplierinvoiceRequestMainPage(pageVO);
         return success(SupplierinvoiceRequestMainConvert.INSTANCE.convertPage(pageResult));
     }
+
     @PostMapping("/senior")
     @Operation(summary = "高级搜索获得供应商发票申请主信息分页")
     @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:query')")
@@ -105,6 +105,7 @@ public class SupplierinvoiceRequestMainController {
         }
         return success(result);
     }
+
     @GetMapping("/export-excel")
     @Operation(summary = "导出供应商发票申请主 Excel")
     @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:export')")
@@ -122,4 +123,12 @@ public class SupplierinvoiceRequestMainController {
         ExcelUtils.write(response, "供应商发票申请主.xls", "数据", SupplierinvoiceRequestMainExcelVO.class, datas);
     }
 
+    @GetMapping("/getNumber")
+    @Operation(summary = "获得供应商发票子单据号分页")
+    @PreAuthorize("@ss.hasPermission('wms:supplierinvoice-request-main:getNumber')")
+    public CommonResult<List<SupplierinvoiceRequestMainDO>> getNumber(@Valid SupplierinvoiceRequestMainPageReqVO pageVO) {
+        List<SupplierinvoiceRequestMainDO> supplierinvoiceRequestMainDOList = supplierinvoiceRequestMainService.getNumber(pageVO);
+        return success(supplierinvoiceRequestMainDOList) ;
+    }
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/supplierinvoiceRequest/vo/SupplierinvoiceRequestMainPageReqVO.java

@@ -72,4 +72,7 @@ public class SupplierinvoiceRequestMainPageReqVO extends PageParam {
     @Schema(description = "直接生成记录")
     private String directCreateRecord;
 
+    private String recordType;
+
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transaction/vo/TransactionBaseVO.java

@@ -111,4 +111,7 @@ public class TransactionBaseVO {
     @Schema(description = "货主代码")
     private String ownerCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/controller/transferlog/vo/TransferlogBaseVO.java

@@ -1,15 +1,12 @@
 package com.win.module.wms.controller.transferlog.vo;
 
 import io.swagger.v3.oas.annotations.media.Schema;
-import lombok.*;
-import java.util.*;
-import java.time.LocalDateTime;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import javax.validation.constraints.NotNull;
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import javax.validation.constraints.*;
-import org.springframework.format.annotation.DateTimeFormat;
 
 import static com.win.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
@@ -160,4 +157,7 @@ public class TransferlogBaseVO {
     @NotNull(message = "到货主代码不能为空")
     private String toOwnerCode;
 
+    @Schema(description = "乐观锁")
+    private Integer concurrencyStamp;
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/balance/BalanceDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.balance;
 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.*;
@@ -125,6 +126,11 @@ public class BalanceDO extends BaseDO {
      * 枚举 {@link TODO frozen_reason 对应的类}
      */
     private String frozenReason;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 最后事务号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerDetailDO.java

@@ -1,10 +1,14 @@
 package com.win.module.wms.dal.dataobject.container;
 
+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.*;
-import java.util.*;
+
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 器具子 DO
@@ -63,5 +67,10 @@ public class ContainerDetailDO extends BaseDO {
      * 数量
      */
     private BigDecimal qty;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/container/ContainerMainDO.java

@@ -1,10 +1,14 @@
 package com.win.module.wms.dal.dataobject.container;
 
+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.*;
-import java.util.*;
+
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 器具主 DO
@@ -53,5 +57,10 @@ public class ContainerMainDO extends BaseDO {
      * 货主代码
      */
     private String ownerCode;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    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/expectin/ExpectinDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.expectin;
 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.*;
@@ -72,5 +73,10 @@ public class ExpectinDO extends BaseDO {
      * 货主代码
      */
     private String ownerCode;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/expectout/ExpectoutDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.expectout;
 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.*;
@@ -76,5 +77,10 @@ public class ExpectoutDO extends BaseDO {
      * 货主代码
      */
     private String ownerCode;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

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/dal/dataobject/locationcapacity/LocationcapacityDO.java

@@ -1,12 +1,13 @@
 package com.win.module.wms.dal.dataobject.locationcapacity;
 
+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.win.framework.mybatis.core.dataobject.BaseDO;
 import lombok.*;
-import java.util.*;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
+
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
 
 /**
  * 库位容量 DO
@@ -51,5 +52,10 @@ public class LocationcapacityDO extends BaseDO {
      * 是否无限容量
      */
     private String isInfinity;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/packageMassage/PackageDO.java

@@ -1,16 +1,14 @@
 package com.win.module.wms.dal.dataobject.packageMassage;
 
+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.*;
-import java.util.*;
-import java.time.LocalDateTime;
-import java.time.LocalDateTime;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
-import java.math.BigDecimal;
+
 import java.math.BigDecimal;
-import com.baomidou.mybatisplus.annotation.*;
-import com.win.framework.mybatis.core.dataobject.BaseDO;
+import java.time.LocalDateTime;
 
 /**
  * 包装 DO
@@ -201,5 +199,10 @@ public class PackageDO extends BaseDO {
      * 体积
      */
     private String volume;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseDetailDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchase;
 
 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.*;
@@ -128,7 +129,8 @@ public class PurchaseDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 明细状态
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchase/PurchaseMainDO.java

@@ -102,7 +102,8 @@ public class PurchaseMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 明细
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanDetailDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchasePlan;
 
 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.*;
@@ -72,7 +73,8 @@ public class PurchasePlanDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 是否可用
      *

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchasePlan/PurchasePlanMainDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.purchasePlan;
 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.*;
@@ -79,7 +80,8 @@ public class PurchasePlanMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 工作流流水号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestDetailDO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/purchaseclaimRequest/PurchaseclaimRequestMainDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.purchaseclaimRequest;
 
 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,7 +85,8 @@ public class PurchaseclaimRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 权限所属人员id
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/strategy/StrategyDO.java

@@ -2,6 +2,7 @@ package com.win.module.wms.dal.dataobject.strategy;
 
 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.*;
@@ -78,7 +79,8 @@ public class StrategyDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 地点ID
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestDetailDO.java

@@ -135,7 +135,8 @@ public class SupplierdeliverRequestDetailDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 从货主代码
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierdeliverRequest/SupplierdeliverRequestMainDO.java

@@ -130,7 +130,8 @@ public class SupplierdeliverRequestMainDO extends BaseDO {
     /**
      * 并发乐观锁
      */
-    private String concurrencyStamp;
+    @Version
+    private Integer concurrencyStamp;
     /**
      * 工作流流水号
      */

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/supplierinvoiceRequest/SupplierinvoiceRequestMainDO.java

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transaction/TransactionDO.java

@@ -3,6 +3,7 @@ package com.win.module.wms.dal.dataobject.transaction;
 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.*;
@@ -139,5 +140,10 @@ public class TransactionDO extends BaseDO {
      * 货主代码
      */
     private String ownerCode;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/dataobject/transferlog/TransferlogDO.java

@@ -1,14 +1,15 @@
 package com.win.module.wms.dal.dataobject.transferlog;
 
+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.*;
-import java.util.*;
-import java.time.LocalDateTime;
+
 import java.math.BigDecimal;
 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;
 
 /**
  * 库存转移日志 DO
@@ -179,5 +180,10 @@ public class TransferlogDO extends BaseDO {
      * 到货主代码
      */
     private String toOwnerCode;
+    /**
+     * 并发乐观锁
+     */
+    @Version
+    private Integer concurrencyStamp;
 
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceService.java

@@ -4,6 +4,7 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.module.wms.controller.balance.vo.BalanceExportReqVO;
 import com.win.module.wms.controller.balance.vo.BalancePageReqVO;
+import com.win.module.wms.controller.balance.vo.BalanceRespVO;
 import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
 
@@ -49,7 +50,7 @@ public interface BalanceService {
      * @param locationCode 库位code
      * @return
      */
-    public List<BalanceDO> selectNumber(String itemCode, List<String> inventoryStatus, String locationCode);
+    List<BalanceDO> selectNumber(String itemCode, List<String> inventoryStatus, String locationCode);
     /**
      * TB2----BY_BATCH
      * 跟据管理模式查询批次
@@ -60,7 +61,7 @@ public interface BalanceService {
      * @param locationCode 库位code
      * @return
      */
-    public List<BalanceDO> selectBatch(String itemCode, String batch, List<String> inventoryStatus, String locationCode);
+    List<BalanceDO> selectBatch(String itemCode, String batch, List<String> inventoryStatus, String locationCode);
     /**
      * TB2----BY_PACKAGING
      * 跟据管理模式查询包装号
@@ -72,7 +73,7 @@ public interface BalanceService {
      * @param locationCode 库位code
      * @return
      */
-    public List<BalanceDO> selectPackaging(String itemCode, String packingNumber, String batch, List<String> inventoryStatus, String locationCode);
+    List<BalanceDO> selectPackaging(String itemCode, String packingNumber, String batch, List<String> inventoryStatus, String locationCode);
     /**
      * TB2----BY_UNIQUE_ID
      * 跟据管理模式查询唯一码
@@ -82,7 +83,7 @@ public interface BalanceService {
      * @param locationCode 库位code
      * @return
      */
-    public List<BalanceDO> selectUniqueId(String packingNumber, String locationCode, List<String> inventoryStatus);
+    List<BalanceDO> selectUniqueId(String packingNumber, String locationCode, List<String> inventoryStatus);
 
     void updateBalance(BalanceUpdateReqVO updateReqVO);
     /**
@@ -93,4 +94,15 @@ public interface BalanceService {
     PageResult<BalanceDO> getBalanceItemsPage(BalancePageReqVO pageVO);
 
     PageResult<BalanceDO> getSeniroBalanceItemsPage(CustomConditions conditions);
+
+    /**
+     * 呆滞库存预警
+     * @return 呆滞库存
+     */
+    List<BalanceRespVO> getStagnantBalanceList();
+    /**
+     * 超期库存预警
+     * @return 超期库存
+     */
+    List<BalanceRespVO> getOverdueBalanceList();
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java

@@ -6,14 +6,18 @@ import com.win.framework.common.pojo.CustomConditions;
 import com.win.framework.common.pojo.PageResult;
 import com.win.framework.mybatis.core.util.MyBatisUtils;
 import com.win.framework.mybatis.core.util.QueryWrapperUtils;
+import com.win.module.system.api.dict.DictDataApi;
+import com.win.module.system.api.dict.dto.DictDataRespDTO;
 import com.win.module.system.api.user.AdminUserApi;
 import com.win.module.wms.controller.balance.vo.BalanceExportReqVO;
 import com.win.module.wms.controller.balance.vo.BalancePageReqVO;
+import com.win.module.wms.controller.balance.vo.BalanceRespVO;
 import com.win.module.wms.controller.balance.vo.BalanceUpdateReqVO;
 import com.win.module.wms.controller.packageMassage.vo.PackageUpdateReqVO;
 import com.win.module.wms.controller.transaction.vo.TransactionCreateReqVO;
 import com.win.module.wms.convert.balance.BalanceConvert;
 import com.win.module.wms.dal.dataobject.balance.BalanceDO;
+import com.win.module.wms.dal.dataobject.packageMassage.PackageDO;
 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.packageMassage.PackageMapper;
@@ -54,6 +58,8 @@ public class BalanceServiceImpl implements BalanceService {
     private JobUtils jobUtils;
     @Resource
     private BalanceMapper balanceMapper;
+    @Resource
+    private DictDataApi dictDataApi;
 
     @Override
     public PageResult<BalanceDO> getBalancePage(BalancePageReqVO pageReqVO) {
@@ -109,7 +115,7 @@ public class BalanceServiceImpl implements BalanceService {
     public List<BalanceDO> selectBatch(String itemCode, String batch, List<String> inventoryStatus, String locationCode) {
         QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("item_code", itemCode);
-        if (batch == null || batch.equals("")) {
+        if (batch == null || batch.isEmpty()) {
             queryWrapper.eq("batch", "");
         }
         queryWrapper.in("inventory_status", inventoryStatus);
@@ -238,7 +244,7 @@ public class BalanceServiceImpl implements BalanceService {
         transactionCreateReqVOList.add(transactionCreateReqVOOut);
         // 更新包装信息
         PackageUpdateReqVO packageUpdateReqVO = new PackageUpdateReqVO();
-        QueryWrapper queryWrapper = new QueryWrapper<>();
+        QueryWrapper<PackageDO> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("number",balanceDO.getPackingNumber());
         packageUpdateReqVO.setId(packageMapper.selectOne(queryWrapper).getId());
         packageUpdateReqVO.setNumber(balanceDO.getPackingNumber());
@@ -268,4 +274,23 @@ public class BalanceServiceImpl implements BalanceService {
         mpPage.setRecords(list);
         return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
     }
+
+    @Override
+    public List<BalanceRespVO> getStagnantBalanceList() {
+        DictDataRespDTO dictDataRespDTO = dictDataApi.selectDictTypeAndLabel("stagnant_time", "默认时间(天)");
+        QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.apply(" DATEDIFF(NOW(), arrive_date) > {0}", dictDataRespDTO.getValue());
+        queryWrapper.last("LIMIT 10");
+        List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
+        return BalanceConvert.INSTANCE.convertList(balanceDOList);
+    }
+
+    @Override
+    public List<BalanceRespVO> getOverdueBalanceList() {
+        QueryWrapper<BalanceDO> queryWrapper = new QueryWrapper<>();
+        queryWrapper.apply("expire_date>NOW()");
+        queryWrapper.last("LIMIT 10");
+        List<BalanceDO> balanceDOList = balanceMapper.selectList(queryWrapper);
+        return BalanceConvert.INSTANCE.convertList(balanceDOList);
+    }
 }

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

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/productionreturnRecord/ProductionreturnRecordMainServiceImpl.java

@@ -124,13 +124,13 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe
         for (ProductionreturnRecordDetailDO detailDO : subDOList) {
             detailDO.setMasterId(mainDO.getId());
             detailDO.setNumber(number);
-            LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode());
-            if(locationDOFrom != null) {
-                detailDO.setFromAreaCode(locationDOFrom.getAreaCode());
-                detailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode());
-            } else {
-                throw exception(LOCATION_NOT_EXISTS);
-            }
+//            LocationDO locationDOFrom = locationService.selectLocation(detailDO.getFromLocationCode());
+//            if(locationDOFrom != null) {
+//                detailDO.setFromAreaCode(locationDOFrom.getAreaCode());
+//                detailDO.setFromLocationGroupCode(locationDOFrom.getLocationGroupCode());
+//            } else {
+//                throw exception(LOCATION_NOT_EXISTS);
+//            }
             LocationDO locationDOTo = locationService.selectLocation(detailDO.getToLocationCode());
             if(locationDOTo != null) {
                 detailDO.setToAreaCode(locationDOTo.getAreaCode());
@@ -149,7 +149,7 @@ public class ProductionreturnRecordMainServiceImpl implements ProductionreturnRe
                 throw exception(ITEMBASIC_NOT_EXISTS);
             }
             //查询库存余额
-            BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getFromLocationCode());
+            BalanceDO balanceDO = balanceMapper.getBalanceQty(detailDO.getFromPackingNumber(), detailDO.getItemCode(), detailDO.getFromBatch(), detailDO.getInventoryStatus(), detailDO.getToLocationCode());
             if (balanceDO == null) {
                 throw exception(UNPLANNEDISSUE_REQUEST_DETAIL_BALANCE_NOT_EXISTS);
             }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchase/PurchaseMainServiceImpl.java

@@ -113,8 +113,6 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
     @Resource
     private DictDataApi dictDataApi;
 
-
-
     @Override
     public Long createPurchaseMain(PurchaseMainCreateReqVO createReqVO) {
         // 插入主表
@@ -348,6 +346,7 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
         purchaseMainDO.setCreateTime(null);
         purchaseMainDO.setUpdater(null);
         purchaseMainDO.setUpdateTime(null);
+        purchaseMainDO.setConcurrencyStamp(1);
         purchaseMainMapper.insert(purchaseMainDO);
         for (PurchaseDetailDO purchaseDetailDO : subDOList) {
             validatorDetailMethod(purchaseDetailDO, purchaseMainDO);
@@ -359,7 +358,6 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
             purchaseDetailDO.setReturnedQty(BigDecimal.ZERO);
             purchaseDetailDO.setPutawayQty(BigDecimal.ZERO);
             purchaseDetailDO.setErpLocationCode(null);
-            purchaseDetailDO.setAvailable("TRUE");
             purchaseDetailDO.setStatus(OrderStatusEnum.READY.getCode());
             purchaseDetailDO.setId(null);
             purchaseDetailDO.setCreator(null);
@@ -381,7 +379,9 @@ public class PurchaseMainServiceImpl implements PurchaseMainService {
             validatorDetailMethod(purchaseDetailDO, purchaseMainDO);
         }
         purchaseMainMapper.updateById(purchaseMainDO);
-        purchaseDetailMapper.updateBatch(subDOList);
+        if (subDOList != null && !subDOList.isEmpty()) {
+            purchaseDetailMapper.updateBatch(subDOList);
+        }
         return purchaseMainDO;
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/purchasePlan/PurchasePlanMainServiceImpl.java

@@ -2,6 +2,8 @@ package com.win.module.wms.service.purchasePlan;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.exceptions.UtilException;
+import cn.hutool.json.JSONObject;
+import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.exception.ServiceException;
 import com.win.framework.common.pojo.CustomConditions;
@@ -14,6 +16,7 @@ import com.win.module.system.api.dict.dto.DictDataRespDTO;
 import com.win.module.system.api.serialnumber.SerialNumberApi;
 import com.win.module.system.enums.serialNumber.RuleCodeEnum;
 import com.win.module.wms.controller.purchasePlan.vo.*;
+import com.win.module.wms.controller.rule.vo.RuleRespVO;
 import com.win.module.wms.convert.purchasePlan.PurchasePlanDetailConvert;
 import com.win.module.wms.convert.purchasePlan.PurchasePlanMainConvert;
 import com.win.module.wms.dal.dataobject.businesstype.BusinesstypeDO;
@@ -37,6 +40,7 @@ import com.win.module.wms.enums.request.RequestStatusEnum;
 import com.win.module.wms.service.itembasic.ItembasicService;
 import com.win.module.wms.service.purchase.PurchaseMainService;
 import com.win.module.wms.service.requestsetting.RequestsettingService;
+import com.win.module.wms.service.rule.RuleService;
 import com.win.module.wms.service.shift.ShiftService;
 import com.win.module.wms.service.supplier.SupplierService;
 import com.win.module.wms.service.supplieritem.SupplieritemService;
@@ -88,7 +92,8 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
     private DictDataApi dictDataApi;
     @Resource
     private PurchaseMainService purchaseMainService;
-
+    @Resource
+    private RuleService ruleService;
     @Resource
     private PurchaseMainMapper purchaseMainMapper;
     @Resource
@@ -198,6 +203,11 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
         return supplierService.selectSupplier(supplierCode);
     }
 
+    //主表校验 校验供应商送货策略
+    private RuleRespVO validatorDeliverGoods(String supplierCode) {
+        return ruleService.deliverGoods(supplierCode, null);
+    }
+
     //子表校验 校验供应商基础信息
     private void validatorItembasic(String itemCode) {
         itembasicService.selectItembasic(itemCode);
@@ -215,6 +225,17 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
         if (supplierDO == null) {
             throw exception(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
         }
+        RuleRespVO ruleRespVO = this.validatorDeliverGoods(mainDo.getSupplierCode());
+        if (ruleRespVO == null) {
+            throw new ServiceException(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
+        } else {
+            JSONObject conditionObject = JSONUtil.parseObj(ruleRespVO.getConfiguration());
+            mainDo.setWarehouseCode(String.valueOf(conditionObject.get("WarehouseCode")));
+            mainDo.setDockCode(String.valueOf(conditionObject.get("DockCode")));
+            mainDo.setBeginTime(String.valueOf(conditionObject.get("BeginTime")));
+            mainDo.setEndTime(String.valueOf(conditionObject.get("EndTime")));
+            mainDo.setTimeWindow(mainDo.getBeginTime() + "-" + mainDo.getEndTime());
+        }
         mainDo.setStatus(DictFrameworkUtils.parseDictDataValue(DictTypeConstants.REQUEST_STATUS, "新增"));
         return mainDo;
     }
@@ -311,6 +332,22 @@ public class PurchasePlanMainServiceImpl implements PurchasePlanMainService {
         } catch (ServiceException ex) {
             messageMain += ex.getMessage() + ",";
         }
+        //校验供应商发货策略
+        try {
+            RuleRespVO ruleRespVO = this.validatorDeliverGoods(mainDo.getSupplierCode());
+            if (ruleRespVO == null) {
+                throw new ServiceException(STDCOSTPRICE_SUPPLIER_CODE_NOT_EXISTS);
+            } else {
+                JSONObject conditionObject = JSONUtil.parseObj(ruleRespVO.getConfiguration());
+                mainDo.setWarehouseCode(String.valueOf(conditionObject.get("WarehouseCode")));
+                mainDo.setDockCode(String.valueOf(conditionObject.get("DockCode")));
+                mainDo.setBeginTime(String.valueOf(conditionObject.get("BeginTime")));
+                mainDo.setEndTime(String.valueOf(conditionObject.get("EndTime")));
+                mainDo.setTimeWindow(mainDo.getBeginTime() + "-" + mainDo.getEndTime());
+            }
+        } catch (ServiceException ex) {
+            messageMain += ex.getMessage() + ",";
+        }
         return messageMain;
     }
 

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierdeliverRequest/SupplierdeliverRequestMainServiceImpl.java

@@ -737,11 +737,19 @@ public class SupplierdeliverRequestMainServiceImpl implements SupplierdeliverReq
                 PurchasereceiptRequestDetailCreateReqVO purchasereceiptRequestDetailCreateReqVO = new PurchasereceiptRequestDetailCreateReqVO();
                 //供应商子表
                 BeanUtils.copyProperties(detailDO, purchasereceiptRequestDetailCreateReqVO);
+                purchasereceiptRequestDetailCreateReqVO.setQty(packageDO.getQty());
                 purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getBatch());
+                purchasereceiptRequestDetailCreateReqVO.setBatch(packageDO.getUom());
+                purchasereceiptRequestDetailCreateReqVO.setItemCode(packageDO.getItemCode());
+                purchasereceiptRequestDetailCreateReqVO.setStdPackQty(packageDO.getStdPackQty());
+                purchasereceiptRequestDetailCreateReqVO.setStdPackUnit(packageDO.getStdPackUnit());
+                purchasereceiptRequestDetailCreateReqVO.setItemName(packageDO.getItemName());
+                purchasereceiptRequestDetailCreateReqVO.setItemDesc1(packageDO.getItemDesc1());
+                purchasereceiptRequestDetailCreateReqVO.setItemDesc2(packageDO.getItemDesc2());
                 purchasereceiptRequestDetailCreateReqVO.setAltBatch(packageDO.getAltBatch());
-                purchasereceiptRequestDetailCreateReqVO.setArriveDate(detailDO.getArriveDate());
                 purchasereceiptRequestDetailCreateReqVO.setProduceDate(packageDO.getProduceDate());
                 purchasereceiptRequestDetailCreateReqVO.setExpireDate(packageDO.getExpireDate());
+                purchasereceiptRequestDetailCreateReqVO.setArriveDate(detailDO.getArriveDate());
                 purchasereceiptRequestDetailCreateReqVO.setPackingNumber(packageDO.getNumber());
                 purchasereceiptRequestDetailCreateReqVO.setInventoryStatus("INSP");
                 SupplieritemDO supplieritemDO = supplieritemService.selectSupplierItemExist(mainDO.getSupplierCode(), detailDO.getItemCode());

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainService.java

@@ -79,4 +79,12 @@ public interface SupplierinvoiceRequestMainService {
      */
     List<SupplierinvoiceRequestMainDO> getSupplierinvoiceRequestMainList(SupplierinvoiceRequestMainExportReqVO exportReqVO);
 
+    /**
+     * 获得供应商发票申请主分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 供应商发票申请主分页
+     */
+    List<SupplierinvoiceRequestMainDO> getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO);
+
 }

win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/supplierinvoiceRequest/SupplierinvoiceRequestMainServiceImpl.java

@@ -1,12 +1,33 @@
 package com.win.module.wms.service.supplierinvoiceRequest;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.win.framework.common.pojo.CustomConditions;
+import com.win.module.wms.controller.purchaseclaimRecord.vo.PurchaseclaimRecordMainPageReqVO;
+import com.win.module.wms.controller.purchasereceiptRecord.vo.PurchasereceiptRecordMainPageReqVO;
+import com.win.module.wms.controller.purchasereturnRecord.vo.PurchasereturnRecordMainPageReqVO;
 import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainCreateReqVO;
 import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainExportReqVO;
 import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainPageReqVO;
 import com.win.module.wms.controller.supplierinvoiceRequest.vo.SupplierinvoiceRequestMainUpdateReqVO;
+import com.win.module.wms.dal.dataobject.purchase.PurchaseDetailDO;
+import com.win.module.wms.dal.dataobject.purchaseclaimRecord.PurchaseclaimRecordMainDO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordDetailDO;
+import com.win.module.wms.dal.dataobject.purchasereceiptRecord.PurchasereceiptRecordMainDO;
+import com.win.module.wms.dal.dataobject.purchasereturnRecord.PurchasereturnRecordMainDO;
+import com.win.module.wms.dal.dataobject.supplier.SupplierDO;
+import com.win.module.wms.dal.dataobject.supplierinvoiceRequest.SupplierinvoiceRequestDetailDO;
+import com.win.module.wms.dal.dataobject.supplieritem.SupplieritemDO;
+import com.win.module.wms.dal.mysql.purchaseclaimRecord.PurchaseclaimRecordMainMapper;
+import com.win.module.wms.dal.mysql.purchasereceiptRecord.PurchasereceiptRecordMainMapper;
+import com.win.module.wms.dal.mysql.purchasereturnRecord.PurchasereturnRecordMainMapper;
+import com.win.module.wms.service.purchasereceiptRecord.PurchasereceiptRecordMainService;
+import com.win.module.wms.service.supplier.SupplierService;
+import com.win.module.wms.service.supplieritem.SupplieritemService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
+
 import javax.annotation.Resource;
+
 import org.springframework.validation.annotation.Validated;
 
 import java.util.*;
@@ -31,6 +52,17 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq
 
     @Resource
     private SupplierinvoiceRequestMainMapper supplierinvoiceRequestMainMapper;
+    @Resource
+    private PurchasereceiptRecordMainMapper purchasereceiptRecordMainMapper;
+    @Resource
+    private PurchasereturnRecordMainMapper purchasereturnRecordMainMapper;
+    @Resource
+    private PurchaseclaimRecordMainMapper purchaseclaimRecordMainMapper;
+    @Resource
+    private SupplierService supplierService;
+    @Resource
+    private PurchasereceiptRecordMainService purchasereceiptRecordMainService;
+
 
     @Override
     public Long createSupplierinvoiceRequestMain(SupplierinvoiceRequestMainCreateReqVO createReqVO) {
@@ -49,6 +81,7 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq
         SupplierinvoiceRequestMainDO updateObj = SupplierinvoiceRequestMainConvert.INSTANCE.convert(updateReqVO);
         supplierinvoiceRequestMainMapper.updateById(updateObj);
     }
+
     @Override
     public PageResult<SupplierinvoiceRequestMainDO> getSupplierinvoiceRequestMainSenior(CustomConditions conditions) {
         return supplierinvoiceRequestMainMapper.selectSenior(conditions);
@@ -88,4 +121,50 @@ public class SupplierinvoiceRequestMainServiceImpl implements SupplierinvoiceReq
         return supplierinvoiceRequestMainMapper.selectList(exportReqVO);
     }
 
+    //主表校验客户代码
+    private SupplierDO validatorSupplier(String supplierCode) {
+        return supplierService.selectSupplier(supplierCode);
+    }
+
+
+    @Override
+    public  List<SupplierinvoiceRequestMainDO> getNumber(SupplierinvoiceRequestMainPageReqVO pageReqVO) {
+        List<SupplierinvoiceRequestMainDO> supplierinvoiceRequestMainDOList=new ArrayList<>();
+        // 收货单号 purchasereceiptRecordMainMapper
+        if ("1".equals(pageReqVO.getRecordType())) {
+            QueryWrapper<PurchasereceiptRecordMainDO> purchasereceiptRecordMainDOQueryWrapper = new QueryWrapper<>();
+            purchasereceiptRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode());
+            List<PurchasereceiptRecordMainDO> purchasereceiptRecordMainDOList = purchasereceiptRecordMainMapper.selectList(purchasereceiptRecordMainDOQueryWrapper);
+            for (PurchasereceiptRecordMainDO purchasereceiptRecordMainDO : purchasereceiptRecordMainDOList) {
+                SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO();
+                BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO);
+                supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO);
+            }
+        }
+        // 退货单号 purchasereturnRecordMainMapper
+        else if ("2".equals(pageReqVO.getRecordType())) {
+            QueryWrapper<PurchasereturnRecordMainDO> purchasereturnRecordMainDOQueryWrapper = new QueryWrapper<>();
+            purchasereturnRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode());
+            List<PurchasereturnRecordMainDO> purchasereturnRecordMainDOList = purchasereturnRecordMainMapper.selectList(purchasereturnRecordMainDOQueryWrapper);
+            for (PurchasereturnRecordMainDO purchasereceiptRecordMainDO : purchasereturnRecordMainDOList) {
+                SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO();
+                BeanUtils.copyProperties(purchasereceiptRecordMainDO, supplierinvoiceRequestMainDO);
+                supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO);
+            }
+        }
+        // 索赔单号 purchaseclaimRecordMainMapper
+        else if ("3".equals(pageReqVO.getRecordType())) {
+            QueryWrapper<PurchaseclaimRecordMainDO> purchaseclaimRecordMainDOQueryWrapper = new QueryWrapper<>();
+            purchaseclaimRecordMainDOQueryWrapper.eq("supplier_code", pageReqVO.getSupplierCode());
+            List<PurchaseclaimRecordMainDO> purchasereturnRecordMainDOList = purchaseclaimRecordMainMapper.selectList(purchaseclaimRecordMainDOQueryWrapper);
+            for (PurchaseclaimRecordMainDO purchaseclaimRecordMainDO : purchasereturnRecordMainDOList) {
+                SupplierinvoiceRequestMainDO supplierinvoiceRequestMainDO = new SupplierinvoiceRequestMainDO();
+                BeanUtils.copyProperties(purchaseclaimRecordMainDO, supplierinvoiceRequestMainDO);
+                supplierinvoiceRequestMainDOList.add(supplierinvoiceRequestMainDO);
+            }
+        }
+        return supplierinvoiceRequestMainDOList;
+    }
+
+
 }