海政通
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
xuhy
2026-02-04 07a08efc3bd17142a81c2128be99abb34c498577 
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TErpProcurementServiceImpl.java


@@ -11,6 +11,7 @@


import com.ruoyi.system.dto.AddProcurementDto;


import com.ruoyi.system.export.PlatformLedgerReportExport;


import com.ruoyi.system.export.ProcurementReportClinicExport;


import com.ruoyi.system.export.ProcurementReportDetailExport;


import com.ruoyi.system.export.ProcurementReportPlatformExport;


import com.ruoyi.system.export.ProcurementReportSupplierExport;


import com.ruoyi.system.mapper.*;


@@ -20,22 +21,10 @@


import com.ruoyi.system.query.TErpGoodsQuery;


import com.ruoyi.system.query.TErpProcurementQuery;


import com.ruoyi.system.service.ISysUserService;


import com.ruoyi.system.service.TErpGoodsService;


import com.ruoyi.system.service.TErpProcurementGoodsService;


import com.ruoyi.system.service.TErpProcurementService;


import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;


import com.ruoyi.system.vo.*;


import lombok.SneakyThrows;


import org.apache.commons.io.IOUtils;


import org.apache.http.HttpResponse;


import org.apache.http.client.HttpClient;


import org.apache.http.client.methods.HttpPost;


import org.apache.http.conn.ClientConnectionManager;


import org.apache.http.conn.scheme.Scheme;


import org.apache.http.conn.scheme.SchemeRegistry;


import org.apache.http.conn.ssl.SSLSocketFactory;


import org.apache.http.entity.StringEntity;


import org.apache.http.impl.client.DefaultHttpClient;


import org.springframework.beans.BeanUtils;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.stereotype.Service;


@@ -44,20 +33,11 @@


import org.springframework.util.CollectionUtils;




import javax.annotation.Resource;


import javax.net.ssl.SSLContext;


import javax.net.ssl.TrustManager;


import javax.net.ssl.X509TrustManager;


import java.io.File;


import java.io.FileInputStream;


import java.io.IOException;


import java.math.BigDecimal;


import java.math.RoundingMode;


import java.security.PrivateKey;


import java.security.cert.X509Certificate;


import java.text.SimpleDateFormat;


import java.time.LocalDateTime;


import java.util.ArrayList;


import java.util.Collections;


import java.util.List;


import java.util.Map;


import java.util.Objects;


@@ -363,9 +343,16 @@


        if(suppliers.isEmpty()){


            return pageInfo;


        }






        PageInfo<TErpGoods> p = erpGoodsMapper.selectPage(pageInfo, new LambdaQueryWrapper<TErpGoods>().eq(TErpGoods::getState,1).eq(TErpGoods::getGoodsSource, 1).in(TErpGoods::getSupplierClinicId, suppliers.stream().map(TCrmSupplier::getId).collect(Collectors.toList())).isNotNull(TErpGoods::getClinicPurchasePrice).orderByDesc(BaseModel::getCreateTime));


        PageInfo<TErpGoods> p = erpGoodsMapper.selectPage(pageInfo, new LambdaQueryWrapper<TErpGoods>()


                .like(StringUtils.isNotBlank(query.getGoodsName()), TErpGoods::getGoodsName, query.getGoodsName())


                .like(StringUtils.isNotBlank(query.getGoodsIdCode()), TErpGoods::getGoodsIdCode, query.getGoodsIdCode())


                .like(StringUtils.isNotBlank(query.getQuasiNumber()), TErpGoods::getQuasiNumber, query.getQuasiNumber())


                .eq(StringUtils.isNotBlank(query.getTypeId()),TErpGoods::getTypeId, query.getTypeId())


                .eq(TErpGoods::getState,1)


                .eq(TErpGoods::getGoodsSource, 1)


                .in(TErpGoods::getSupplierClinicId, suppliers.stream().map(TCrmSupplier::getId).collect(Collectors.toList()))


                .isNotNull(TErpGoods::getClinicPurchasePrice)


                .orderByDesc(BaseModel::getCreateTime));


        List<TErpGoods> list = p.getRecords();




        List<String> typeIds = list.stream().map(TErpGoods::getTypeId).collect(Collectors.toList());


@@ -389,7 +376,14 @@




    @Override


    public List<TErpGoodsVO> inventoryNotEnoughList(SysUser user) {


        List<TErpGoodsVO> list = this.baseMapper.inventoryNotEnoughList(user);


        // 查询诊所


        TCrmClinic crmClinic = crmClinicMapper.selectOne(new LambdaQueryWrapper<TCrmClinic>().eq(TCrmClinic::getUserId, user.getUserId())


                .last("limit 1"));


        if (Objects.isNull(crmClinic)) {


            SysUser sysUser = sysUserService.selectUserById(user.getUserId());


            crmClinic = crmClinicMapper.selectById(sysUser.getObjectId());


        }


        List<TErpGoodsVO> list = this.baseMapper.inventoryNotEnoughList(user,crmClinic.getId());


        List<String> typeIds = list.stream().map(TErpGoodsVO::getTypeId).collect(Collectors.toList());


        if (!typeIds.isEmpty()) {


            List<TErpGoodsType> typeList = erpGoodsTypeMapper.selectBatchIds(typeIds);


@@ -1219,4 +1213,14 @@


        return list;


    }




    @Override


    public List<ClinicProcurementReportDetailVO> clinicProcurementReportDetail(String id) {


        return this.baseMapper.clinicProcurementReportDetail(id);


    }




    @Override


    public List<ProcurementReportDetailExport> exportProcurementReportDetail(List<String> procurementIds) {


        return this.baseMapper.exportProcurementReportDetail(procurementIds);


    }




}