拉卡拉支付

liujie

10 小时以前 64c137c7d5bcdba2ff6be176f58e40e71d500aa5

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

@@ -26,6 +26,7 @@

import javax.validation.Valid;
import java.util.List;
import java.util.stream.Collectors;

/**
 * <p>
@@ -64,10 +65,6 @@
    @ApiOperation(value = "供应商获取库存分页列表")
    @PostMapping(value = "/pageList")
    public R<PageInfo<TErpGoodsVO>> pageList(@RequestBody TErpGoodsQuery query) {
        V3LabsTransPreorderRequest request = new V3LabsTransPreorderRequest();
        request.setLklAppId(LakalaConfig.appId);
        request.setMerchantNo(LakalaConfig.MerchantNo);
        request.setTermNo(LakalaConfig.TermNo);

        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
@@ -158,6 +155,16 @@
        SysUser user = tokenService.getLoginUser().getUser();
        return R.ok(erpGoodsService.pageInventoryGoodsPageList(query,user));
    }
    @ApiOperation(value = "有效期预警商品选择")
    @GetMapping(value = "/pageInventoryGoodsList")
    public R<List<TErpGoodsInventoryVO>> pageInventoryGoodsList(@RequestParam String warehouseId,@RequestParam(required = false)String batchId) {
        SysUser user = tokenService.getLoginUser().getUser();
        List<TErpGoodsInventoryVO> tErpGoodsInventoryVOS = erpGoodsService.pageInventoryGoodsList(warehouseId, user);
        if(batchId!=null && !"".equals(batchId)){
            tErpGoodsInventoryVOS = tErpGoodsInventoryVOS.stream().filter(e->e.getId().equals(batchId)).collect(Collectors.toList());
        }
        return R.ok(tErpGoodsInventoryVOS);
    }

    @ApiOperation(value = "供应商 确认盘点")
    @PostMapping(value = "/inventoryGoods")