Merge remote-tracking branch 'origin/master'

xuhy

5 天以前 79c1cc71dfcf2ac2a96433439507e582b7bf23e2

 ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpSupplierWarehousingController.java

@@ -1,6 +1,7 @@
package com.ruoyi.web.controller.api;


import com.lkl.laop.sdk.request.V3LabsTransPreorderRequest;
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysUser;
@@ -12,6 +13,7 @@
import com.ruoyi.system.service.TErpGoodsService;
import com.ruoyi.system.service.TErpSupplierWarehousingService;
import com.ruoyi.system.vo.*;
import com.ruoyi.web.core.config.LakalaAlipayConfig;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.poi.ss.formula.functions.T;
@@ -53,6 +55,11 @@
    @ApiOperation(value = "供应商获取库存分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) {
        V3LabsTransPreorderRequest request = new V3LabsTransPreorderRequest();
        request.setLklAppId(LakalaAlipayConfig.appId);
        request.setMerchantNo(LakalaAlipayConfig.MerchantNo);
        request.setTermNo(LakalaAlipayConfig.TermNo);

        SysUser user = tokenService.getLoginUser().getUser();
        return R.ok(erpSupplierWarehousingService.pageList(query,user));
    }