BUG修改

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/purchase/vo/PurchaseDetailBaseVO.java

@@ -114,8 +114,8 @@ public class PurchaseDetailBaseVO {
     @Schema(description = "最后更新者用户名")
     private String updater;
 
-    @Schema(description = "并发乐观锁")
+    @Schema(description = "乐观锁")
-    private String concurrencyStamp;
+    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("备注")
+    @ExcelProperty(value = "状态", converter = DictConvert.class)
-    private String remark;
+    @DictFormat("purchase_plan_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
-
+    private String status;
-    @ExcelProperty("创建时间")
-    private LocalDateTime createTime;
-
-    @ExcelProperty("创建者用户名")
-    private String creator;
 
     @ExcelProperty("开始时间")
     private String beginTime;
@@ -49,9 +43,11 @@ public class PurchasePlanMainExcelVO {
     @ExcelProperty("结束时间")
     private String endTime;
 
-    @ExcelProperty(value = "状态", converter = DictConvert.class)
+    @ExcelProperty("创建时间")
-    @DictFormat("plan_status") // TODO 代码优化：建议设置到对应的 XXXDictTypeConstants 枚举类中
+    private LocalDateTime createTime;
-    private String status;
+
+    @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/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/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/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/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;
+    }
+
+
 }