Merge remote-tracking branch 'origin/master'

xuhy

4 天以前 1ec94c00e5c312818c9e1e3742ca838e60b7e5e7

Merge remote-tracking branch 'origin/master'

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

@@ -329,7 +329,7 @@
    @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::getState,1).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());

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

@@ -25,7 +25,7 @@
    <!-- 通用查询结果列 -->
    <sql id="Base_Column_List">
        id, user_id, supplier_name, is_add_points_goods, supplier_contact, phone, account, remarks,
          qualification_picture, status, warehouse_id,create_time, update_time, create_by, update_by, disabled
          qualification_picture, status, warehouse_id,create_time, update_time, create_by, update_by, disabled,recv_merchant_no,term_no
    </sql>
    <select id="pageList" resultType="com.ruoyi.system.vo.TCrmSupplierVO">
        select