采购相关问题

liujie

1 天以前 77ad4788416a7e7a15dc15d0d2a01d304519262b

采购相关问题

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

@@ -101,6 +101,18 @@
    }


    /**
     * erp采购管理分页列表
     */
    @ApiOperation(value = "erp采购管理分页列表--仓库专用")
    @PostMapping(value = "/pageListWarehouse")
    public R<PageInfo<TErpProcurementVo>> pageListWarehouse(@RequestBody TErpProcurementQuery query) {
        SysUser user = tokenService.getLoginUser().getUser();
        return R.ok(erpProcurementService.pageListWarehouse(query,user));
    }




    @ApiOperation(value = "erp采购管理详情")
    @GetMapping(value = "/detail")
@@ -169,6 +181,27 @@

        return R.ok( erpProcurementService.detailProcurement(clinicSupplierId, user, id));
    }

    @ApiOperation(value = "采购详情--仓库角色专用")
    @GetMapping(value = "/detailProcurementWarehouse/{id}")
    public R<DetailProcurementVO> detailProcurementWarehouse(@PathVariable String id) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        String clinicSupplierId=null;
        if(roleType == 5){
            // 诊所
            TCrmClinic crmClinic = crmClinicService.getOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            clinicSupplierId = crmClinic.getId();
        }

        return R.ok( erpProcurementService.detailProcurementWarehouse(clinicSupplierId, user, id));
    }




    @ApiOperation(value = "采购草稿")
    @GetMapping(value = "/getProcurementDraft")
    public R<ArrayList<DetailProcurementNextVO>> getProcurementDraft() {

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/TErpProcurementMapper.java

@@ -28,4 +28,6 @@
    List<TErpGoodsVO> inventoryNotEnoughList(@Param("user") SysUser user);


    List<TErpProcurementVo> pageListWarehouse(@Param("query") TErpProcurementQuery query, @Param("pageInfo") PageInfo<TErpProcurementVo> pageInfo, @Param("user") SysUser user, @Param("sTime") String sTime, @Param("eTime") String eTime, @Param("supplierClinicId") String supplierClinicId);

}

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurement.java

@@ -48,6 +48,11 @@
    @TableField("pay_number")
    private String payNumber;


    @ApiModelProperty(value = "物流单号")
    @TableField("logistics_number")
    private String logisticsNumber;

    @ApiModelProperty(value = "支付流水号")
    @TableField("pay_transaction_id")
        private String payTransactionId;

 ruoyi-system/src/main/java/com/ruoyi/system/model/TErpProcurementGoods.java

@@ -58,7 +58,7 @@
    @TableField("purchase_price")
    private BigDecimal purchasePrice;

    @ApiModelProperty(value = "售价")
    @ApiModelProperty(value = "售价（诊所采购价）")
    @TableField("sales_amount")
    private BigDecimal salesAmount;


 ruoyi-system/src/main/java/com/ruoyi/system/query/TErpProcurementQuery.java

@@ -14,6 +14,9 @@
    @ApiModelProperty(value = "诊所名称")
    private String clinicName;

    @ApiModelProperty(value = "物流单号")
    private String logisticsNo;

    @ApiModelProperty(value = "时间 2022-02-02 - 2023-03-03")
    private String time;


 ruoyi-system/src/main/java/com/ruoyi/system/service/TErpProcurementService.java

@@ -28,6 +28,8 @@

    PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user);

    PageInfo<TErpProcurementVo> pageListWarehouse(TErpProcurementQuery query, SysUser user);


    TErpProcurementDetailVo detail(String id, SysUser user, String goodsName);


 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java

@@ -67,10 +67,10 @@
    private TSysCommissionMapper sysCommissionMapper;

    @Resource
    private  TCrmClinicMapper crmClinicMapper;
    private TCrmClinicMapper crmClinicMapper;

    @Resource
    private  TCrmSupplierMapper crmSupplierMapper;
    private TCrmSupplierMapper crmSupplierMapper;

    @Resource
    private SysUserMapper sysUserMapper;
@@ -88,45 +88,44 @@
    private TErpProcurementGoodsService erpProcurementGoodsService;



    @Override
    public PageInfo<TErpProcurementVo> pageList(TErpProcurementQuery query, SysUser user) {


        Integer roleType = user.getRoleType();
        String supplierClinicId = null;
        if(roleType == 4){
        if (roleType == 4) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            supplierClinicId =crmSupplier.getId();
            supplierClinicId = crmSupplier.getId();
        }
        if(roleType == 5){
        if (roleType == 5) {
            // 诊所
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            supplierClinicId =crmClinic.getId();
            supplierClinicId = crmClinic.getId();
        }

        String sTime=null;
        String eTime =null;
        if(query.getTime()!=null && !query.getTime().isEmpty()){
        String sTime = null;
        String eTime = null;
        if (query.getTime() != null && !query.getTime().isEmpty()) {
            String[] split = query.getTime().split(" - ");
            sTime = split[0] + " 00:00:00";
            eTime = split[1] + " 23:59:59";
        }
        PageInfo<TErpProcurementVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        List<TErpProcurementVo> list = this.baseMapper.pageList(query,pageInfo,user,sTime,eTime,supplierClinicId);
        if(list.isEmpty()){
        List<TErpProcurementVo> list = this.baseMapper.pageList(query, pageInfo, user, sTime, eTime, supplierClinicId);
        if (list.isEmpty()) {
            return pageInfo;
        }
        List<String> ids = list.stream().map(TErpProcurementVo::getId).collect(Collectors.toList());
        List<TErpProcurementGoods> tErpProcurementGoods = erpProcurementGoodsMapper.selectList
                (new LambdaQueryWrapper<TErpProcurementGoods>().in(TErpProcurementGoods::getProcurementId, ids));
        List<TSysCommission> tSysCommissions =new ArrayList<>();
        if(!tErpProcurementGoods.isEmpty()){
        List<TSysCommission> tSysCommissions = new ArrayList<>();
        if (!tErpProcurementGoods.isEmpty()) {
            List<String> collect = tErpProcurementGoods.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
            tSysCommissions = sysCommissionMapper.selectList(new LambdaQueryWrapper<TSysCommission>().in(TSysCommission::getTErpProcurementGoodsId, collect));
        }
@@ -136,11 +135,11 @@
            tErpProcurementVo.setTypeNum(size);
            BigDecimal reduce = collect.stream().map(TErpProcurementGoods::getTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
            tErpProcurementVo.setTotalPrice(reduce);
            if(!collect.isEmpty()){
            if (!collect.isEmpty()) {
                List<String> collect1 = collect.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
                List<TSysCommission> collect2 = tSysCommissions.stream().filter(e -> collect1.contains(e.getTErpProcurementGoodsId())).collect(Collectors.toList());
                BigDecimal reduce1 = collect2.stream().filter(e->e.getType()==1).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal reduce2 = collect2.stream().filter(e->e.getType()==2).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal reduce1 = collect2.stream().filter(e -> e.getType() == 1).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                BigDecimal reduce2 = collect2.stream().filter(e -> e.getType() == 2).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                tErpProcurementVo.setPlatformMoney(reduce1);
                tErpProcurementVo.setSupplierMoney(reduce2);
            }
@@ -153,23 +152,81 @@
    }

    @Override
    public TErpProcurementDetailVo detail(String id, SysUser user, String goodsName) {
    public PageInfo<TErpProcurementVo> pageListWarehouse(TErpProcurementQuery query, SysUser user) {


        Integer roleType = user.getRoleType();
        String supplierClinicId = null;
        if(roleType == 4){
        if (roleType == 6) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            supplierClinicId =crmSupplier.getId();
            supplierClinicId = crmSupplier.getId();


            String sTime = null;
            String eTime = null;
            if (query.getTime() != null && !query.getTime().isEmpty()) {
                String[] split = query.getTime().split(" - ");
                sTime = split[0] + " 00:00:00";
                eTime = split[1] + " 23:59:59";
            }
            PageInfo<TErpProcurementVo> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
            List<TErpProcurementVo> list = this.baseMapper.pageListWarehouse(query, pageInfo, user, sTime, eTime, supplierClinicId);
//            if (list.isEmpty()) {
//                return pageInfo;
//            }
//            List<String> ids = list.stream().map(TErpProcurementVo::getId).collect(Collectors.toList());
//            List<TErpProcurementGoods> tErpProcurementGoods = erpProcurementGoodsMapper.selectList
//                    (new LambdaQueryWrapper<TErpProcurementGoods>().in(TErpProcurementGoods::getProcurementId, ids));
//            List<TSysCommission> tSysCommissions = new ArrayList<>();
//            if (!tErpProcurementGoods.isEmpty()) {
//                List<String> collect = tErpProcurementGoods.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
//                tSysCommissions = sysCommissionMapper.selectList(new LambdaQueryWrapper<TSysCommission>().in(TSysCommission::getTErpProcurementGoodsId, collect));
//            }
//            for (TErpProcurementVo tErpProcurementVo : list) {
//                List<TErpProcurementGoods> collect = tErpProcurementGoods.stream().filter(e -> e.getProcurementId().equals(tErpProcurementVo.getId())).collect(Collectors.toList());
//                int size = collect.stream().map(TErpProcurementGoods::getGoodsId).collect(Collectors.toSet()).size();
//                tErpProcurementVo.setTypeNum(size);
//                BigDecimal reduce = collect.stream().map(TErpProcurementGoods::getTotalPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
//                tErpProcurementVo.setTotalPrice(reduce);
//                if (!collect.isEmpty()) {
//                    List<String> collect1 = collect.stream().map(TErpProcurementGoods::getId).collect(Collectors.toList());
//                    List<TSysCommission> collect2 = tSysCommissions.stream().filter(e -> collect1.contains(e.getTErpProcurementGoodsId())).collect(Collectors.toList());
//                    BigDecimal reduce1 = collect2.stream().filter(e -> e.getType() == 1).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
//                    BigDecimal reduce2 = collect2.stream().filter(e -> e.getType() == 2).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
//                    tErpProcurementVo.setPlatformMoney(reduce1);
//                    tErpProcurementVo.setSupplierMoney(reduce2);
//                }
//
//            }


            pageInfo.setRecords(list);
            return pageInfo;
        }
        if(roleType == 5){
        return null;
    }

    @Override
    public TErpProcurementDetailVo detail(String id, SysUser user, String goodsName) {

        Integer roleType = user.getRoleType();
        String supplierClinicId = null;
        if (roleType == 4) {
            // 供应商
            TCrmSupplier crmSupplier = crmSupplierMapper.selectOne(Wrappers.lambdaQuery(TCrmSupplier.class)
                    .eq(TCrmSupplier::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            supplierClinicId = crmSupplier.getId();
        }
        if (roleType == 5) {
            // 诊所
            TCrmClinic crmClinic = crmClinicMapper.selectOne(Wrappers.lambdaQuery(TCrmClinic.class)
                    .eq(TCrmClinic::getUserId, user.getUserId())
                    .last("LIMIT 1"));
            supplierClinicId =crmClinic.getId();
            supplierClinicId = crmClinic.getId();
        }

        TErpProcurementDetailVo tErpProcurementVo = new TErpProcurementDetailVo();
@@ -187,7 +244,7 @@
        tErpProcurementVo.setUserName(sysUser.getNickName());
        tErpProcurementVo.setCreateTime(tErpProcurement.getCreateTime());
        tErpProcurementVo.setUpdateTime(tErpProcurement.getUpdateTime());
        if(tErpProcurement.getWarehousingUserId()!=null){
        if (tErpProcurement.getWarehousingUserId() != null) {
            SysUser sysUser1 = sysUserMapper.selectUserById(Long.valueOf(tErpProcurement.getWarehousingUserId()));
            tErpProcurementVo.setOperName(sysUser1.getNickName());
        }
@@ -201,7 +258,7 @@
                (new LambdaQueryWrapper<TErpProcurementGoods>().eq(TErpProcurementGoods::getProcurementId, id)
                        .like(goodsName != null && !goodsName.isEmpty(), TErpProcurementGoods::getGoodsName, goodsName)
                        .eq(TErpProcurementGoods::getSupplierId, supplierClinicId));
        if(tErpProcurementGoods.isEmpty()){
        if (tErpProcurementGoods.isEmpty()) {
            return tErpProcurementVo;
        }

@@ -213,11 +270,11 @@
            tErpProcurementDetailNextVo.setNum(tErpProcurementGood.getPurchaseCount());
            tErpProcurementDetailNextVo.setTotalPrice(tErpProcurementGood.getTotalPrice());
            tErpProcurementDetailNextVo.setQuasiNumber(tErpProcurementGood.getQuasiNumber());
            tErpProcurementDetailNextVo.setPurchasePrice(tErpProcurementGood.getPurchasePrice());
            tErpProcurementDetailNextVo.setPurchasePrice(tErpProcurementGood.getSalesAmount());


            List<TSysCommission> tSysCommissions = sysCommissionMapper.selectList(new LambdaQueryWrapper<TSysCommission>().eq(TSysCommission::getTErpProcurementGoodsId, tErpProcurementGood.getId()));
            if(!tSysCommissions.isEmpty()){
            if (!tSysCommissions.isEmpty()) {
                BigDecimal reduce = tSysCommissions.stream().filter(e -> e.getType() == 1).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
                tErpProcurementDetailNextVo.setPlatformMoney(reduce);
                BigDecimal reduce1 = tSysCommissions.stream().filter(e -> e.getType() == 2).map(TSysCommission::getMoney).reduce(BigDecimal.ZERO, BigDecimal::add);
@@ -233,40 +290,40 @@
    @Override
    public PageInfo<TErpGoods> pageGoodsPageList(TErpGoodsQuery query, SysUser user) {
        PageInfo<TErpGoods> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
        PageInfo<TErpGoods> p =erpGoodsMapper.selectPage(pageInfo,new LambdaQueryWrapper<TErpGoods>().eq(TErpGoods::getGoodsSource,1).isNotNull(TErpGoods::getClinicPurchasePrice).orderByDesc(BaseModel::getCreateTime));
        PageInfo<TErpGoods> p = erpGoodsMapper.selectPage(pageInfo, new LambdaQueryWrapper<TErpGoods>().eq(TErpGoods::getGoodsSource, 1).isNotNull(TErpGoods::getClinicPurchasePrice).orderByDesc(BaseModel::getCreateTime));
        List<TErpGoods> list = p.getRecords();

        List<String> typeIds = list.stream().map(TErpGoods::getTypeId).collect(Collectors.toList());
        if(!typeIds.isEmpty()){
        if (!typeIds.isEmpty()) {
            List<TErpGoodsType> typeList = erpGoodsTypeMapper.selectBatchIds(typeIds);
            for (TErpGoods tErpGoodsVO : list) {
                typeList.stream().filter(t -> t.getId().equals(tErpGoodsVO.getTypeId())).findFirst().ifPresent(t -> tErpGoodsVO.setTypeName(t.getTypeName()));
                tErpGoodsVO.setTypeName(tErpGoodsVO.getTypeName());
            }
        }
        List<String> supplierClinicId = list.stream().filter(e->e.getGoodsSource()==1).map(TErpGoods::getSupplierClinicId).collect(Collectors.toList());
        if(!supplierClinicId.isEmpty()){
        List<String> supplierClinicId = list.stream().filter(e -> e.getGoodsSource() == 1).map(TErpGoods::getSupplierClinicId).collect(Collectors.toList());
        if (!supplierClinicId.isEmpty()) {
            List<TCrmSupplier> crmClinics = crmSupplierMapper.selectBatchIds(supplierClinicId);
            for (TErpGoods tErpGoodsVO : list) {
                crmClinics.stream().filter(t -> t.getId().equals(tErpGoodsVO.getSupplierClinicId())).findFirst().ifPresent(t -> tErpGoodsVO.setSupplierName(t.getSupplierName()));
            }
        }
        pageInfo.setRecords( list);
        pageInfo.setRecords(list);
        return pageInfo;
    }

    @Override
    public List<TErpGoodsVO> inventoryNotEnoughList(SysUser user) {
        List<TErpGoodsVO> list =  this.baseMapper.inventoryNotEnoughList(user);
        List<TErpGoodsVO> list = this.baseMapper.inventoryNotEnoughList(user);
        List<String> typeIds = list.stream().map(TErpGoodsVO::getTypeId).collect(Collectors.toList());
        if(!typeIds.isEmpty()){
        if (!typeIds.isEmpty()) {
            List<TErpGoodsType> typeList = erpGoodsTypeMapper.selectBatchIds(typeIds);
            for (TErpGoodsVO tErpGoodsVO : list) {
                typeList.stream().filter(t -> t.getId().equals(tErpGoodsVO.getTypeId())).findFirst().ifPresent(t -> tErpGoodsVO.setTypeName(t.getTypeName()));
            }
        }
        List<String> supplierClinicId = list.stream().filter(e->e.getGoodsSource()==1).map(TErpGoodsVO::getSupplierClinicId).collect(Collectors.toList());
        if(!supplierClinicId.isEmpty()){
        List<String> supplierClinicId = list.stream().filter(e -> e.getGoodsSource() == 1).map(TErpGoodsVO::getSupplierClinicId).collect(Collectors.toList());
        if (!supplierClinicId.isEmpty()) {
            List<TCrmSupplier> crmSuppliers = crmSupplierMapper.selectBatchIds(supplierClinicId);
            for (TErpGoodsVO tErpGoodsVO : list) {
                crmSuppliers.stream().filter(t -> t.getId().equals(tErpGoodsVO.getSupplierClinicId())).findFirst().ifPresent(t -> tErpGoodsVO.setSupplierName(t.getSupplierName()));
@@ -286,7 +343,7 @@
            dto.setPlatformCommissionPrice(tErpGoodsVO.getPlatformCommissionPrice());
            dto.setSupplierId(tErpGoodsVO.getSupplierClinicId());
            dto.setGoodsSalesAmount(tErpGoodsVO.getClinicPurchasePrice());
            if(dto.getSalesAmount()==null){
            if (dto.getSalesAmount() == null) {
                dto.setSalesAmount(tErpGoodsVO.getClinicPurchasePrice());
            }
        }
@@ -298,7 +355,7 @@
            List<AddProcurementDto> value = entry.getValue();
            TErpProcurement tErpProcurement = new TErpProcurement();
            tErpProcurement.setClinicId(clinicSupplierId);
            tErpProcurement.setProcurementCode("C"+DateUtils.dateTimeNow());
            tErpProcurement.setProcurementCode("C" + DateUtils.dateTimeNow());
            tErpProcurement.setSupplierId(supplierClinicId);

            tErpProcurement.setTermNo(supplier.getTermNo());
@@ -313,14 +370,14 @@
            }
            tErpProcurement.setPayMoney(all);
            AddProcurementDto addProcurementDto = value.get(0);
            if(addProcurementDto.getState()!=null && addProcurementDto.getState()==1){
            if (addProcurementDto.getState() != null && addProcurementDto.getState() == 1) {
                tErpProcurement.setStatus(1);
            }else {
            } else {
                tErpProcurement.setStatus(2);
            }
            ArrayList<TErpProcurementGoods> tErpProcurementGoods1 = new ArrayList<>();

            BigDecimal add =BigDecimal.ZERO;
            BigDecimal add = BigDecimal.ZERO;

            for (AddProcurementDto dto : value) {
                TErpProcurementGoods tErpProcurementGoods = new TErpProcurementGoods();
@@ -335,13 +392,13 @@
                tErpProcurementGoods.setUnitName(tErpGoodsUnit.getUnitName());
                tErpProcurementGoods.setPurchasePrice(dto.getGoodsSalesAmount());
                tErpProcurementGoods.setSalesAmount(dto.getSalesAmount());
                tErpProcurementGoods.setTotalPrice(dto.getSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));
                tErpProcurementGoods.setTotalPrice(dto.getGoodsSalesAmount().multiply(new BigDecimal(dto.getPurchaseCount())));

                tErpProcurementGoods.setPurchaseCount(dto.getPurchaseCount());
                tErpProcurementGoods.setSupplierId(supplierClinicId);
                tErpProcurementGoods.setRecvMerchantNo(supplier.getRecvMerchantNo());
                tErpProcurementGoods.setSupplierMoney(dto.getSalesAmount().subtract(dto.getPlatformCommissionPrice()));
                if(tErpProcurementGoods.getSupplierMoney().doubleValue()<0){
                if (tErpProcurementGoods.getSupplierMoney().doubleValue() < 0) {
                    throw new RuntimeException("平台抽成不能大于售卖价格");
                }
                add = add.add(dto.getPlatformCommissionPrice().multiply(BigDecimal.valueOf(dto.getPurchaseCount())));
@@ -350,11 +407,11 @@
            BigDecimal bigDecimal = tErpProcurement.getPayMoney().multiply(BigDecimal.valueOf(0.0038)).setScale(2, RoundingMode.HALF_UP);

            tErpProcurement.setMoney(add.subtract(bigDecimal));
            if(tErpProcurement.getMoney().doubleValue()<0){
            if (tErpProcurement.getMoney().doubleValue() < 0) {
                throw new RuntimeException("金额设置错误，请联系平台管理员");
            }
            this.save(tErpProcurement);
            tErpProcurementGoods1.forEach(e->e.setProcurementId(tErpProcurement.getId()));
            tErpProcurementGoods1.forEach(e -> e.setProcurementId(tErpProcurement.getId()));
            erpProcurementGoodsService.saveBatch(tErpProcurementGoods1);
        }

@@ -370,6 +427,10 @@
        TCrmSupplier supplier = crmSupplierMapper.selectById(tErpProcurement.getSupplierId());
        detailProcurementVO.setSupplierName(supplier.getSupplierName());
        detailProcurementVO.setUserName(sysUserMapper.selectUserById(Long.valueOf(tErpProcurement.getCreateId())).getUserName());
        TCrmClinic tCrmClinic = crmClinicMapper.selectById(tErpProcurement.getClinicId());
        detailProcurementVO.setClinicName(tCrmClinic.getClinicName());
        detailProcurementVO.setClinicAddress(tCrmClinic.getClinicAddress());
        detailProcurementVO.setLogisticsNumber(tErpProcurement.getLogisticsNumber());
        List<TErpProcurementGoods> list = erpProcurementGoodsService.list(new QueryWrapper<TErpProcurementGoods>().eq("procurement_id", id));
        ArrayList<DetailProcurementNextVO> detailProcurementNextVOS = new ArrayList<>();
        for (TErpProcurementGoods tErpProcurementGoods : list) {
@@ -381,6 +442,7 @@
            detailProcurementNextVO.setNum(tErpProcurementGoods.getPurchaseCount());
            detailProcurementNextVO.setTotalPrice(tErpProcurement.getPayMoney());
            detailProcurementNextVO.setId(tErpProcurementGoods.getId());
            detailProcurementNextVO.setPurchasePrice(tErpProcurementGoods.getPurchasePrice());
            detailProcurementNextVOS.add(detailProcurementNextVO);
        }
        detailProcurementVO.setList(detailProcurementNextVOS);

 ruoyi-system/src/main/java/com/ruoyi/system/vo/DetailProcurementVO.java

@@ -27,6 +27,17 @@
    @ApiModelProperty(value = "发货时间")
    private LocalDateTime sendTime;

    @ApiModelProperty(value = "诊所名称")
    private String clinicName;

    @ApiModelProperty(value = "诊所地址")
    private String clinicAddress;

    @ApiModelProperty(value = "物流单号")
    private String logisticsNumber;



    @ApiModelProperty(value = "采购二级详情")
    private List<DetailProcurementNextVO> list;


 ruoyi-system/src/main/java/com/ruoyi/system/vo/TErpProcurementVo.java

@@ -26,6 +26,17 @@
    @ApiModelProperty(value = "诊所名称")
    private String clinicName;


    @ApiModelProperty(value = "诊所地址")
    private String clinicAddress;

    @ApiModelProperty(value = "物流单号")
    private String logisticsNo;

    @ApiModelProperty(value = "发货时间")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
    private LocalDateTime sendTime;

    @ApiModelProperty(value = "供应商名称")
    private String supplierName;


 ruoyi-system/src/main/resources/mapper/system/TErpProcurementMapper.xml

@@ -77,5 +77,35 @@
        and  o.warning_inventory  > (o.allNum-o.outNum)
        order by o.create_time desc
    </select>
    <select id="pageListWarehouse" resultType="com.ruoyi.system.vo.TErpProcurementVo">
        select t1.id,
               t1.procurement_code,
               t2.clinic_name,
               t2.clinic_address,
               t1.logistics_no,
                t1.send_time,
               t1.clinic_id,
               t1.status
               from t_erp_procurement t1
               left JOIN t_crm_clinic t2 on t1.clinic_id = t2.id
        where t1.disabled = 0 and t1.status in(3,4,5) and t1.supplier_id =#{supplierClinicId}
        <if test="query.procurementCode != null and query.procurementCode != ''">
            and t1.procurement_code = #{query.procurementCode}
        </if>
        <if test="query.clinicName != null and query.clinicName != ''">
            and t2.clinic_name like concat('%',#{query.clinicName},'%')
        </if>
        <if test="query.logisticsNo != null and query.logisticsNo != ''">
            and t1.logistics_no = #{query.logisticsNo}
        </if>
        <if test="sTime != null and eTime != ''">
            and t1.create_time between #{sTime} and #{eTime}
        </if>
        <if test="query.status != null">
            and t1.status = #{query.status}
        </if>


    </select>

</mapper>