Merge remote-tracking branch 'origin/master'

xuhy

2025-11-04 e3a44174eaa6209ecf79cfcd9f10aa02ebf787ff

Merge remote-tracking branch 'origin/master'

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

@@ -128,6 +128,7 @@
            }
            query.setSupplierClinicId(crmClinic.getId());
        }

        return R.ok(erpGoodsService.pageList(query,user));
    }

@@ -142,6 +143,41 @@
        if(roleType == 1){
            // 平台
            return R.ok(erpGoodsService.pageAdminList(query));
        }
        return R.ok();
    }


    @ApiOperation(value = "平台审核商品内容")
    @PostMapping(value = "/adminAudit")
    @Log(title = "商品管理-平台审核商品内容", businessType = BusinessType.UPDATE)
    public R<?> adminAudit(@RequestBody  AdminAuditDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        List<TErpGoods> tErpGoods = erpGoodsService.listByIds(dto.getIds());
        if(roleType == 1){
            tErpGoods.stream().forEach(e->e.setContentState(dto.getContentState()));
            erpGoodsService.updateBatchById(tErpGoods);
            // 平台
            return R.ok();
        }
        return R.ok();
    }




    @ApiOperation(value = "供应商提交商品内容")
    @PostMapping(value = "/supplierSubmitContent")
    @Log(title = "商品管理-供应商提交商品内容", businessType = BusinessType.UPDATE)
    public R<?> adminAudit(@RequestBody  SupplierSubmitContentDto dto) {
        SysUser user = tokenService.getLoginUser().getUser();
        Integer roleType = user.getRoleType();
        TErpGoods erpGoods = erpGoodsService.getById(dto.getId());
        if(roleType == 4){
            erpGoods.setContent(dto.getContent());
            erpGoodsService.updateById(erpGoods);
            return R.ok();
        }
        return R.ok();
    }
@@ -429,8 +465,10 @@
     */
    @ApiOperation(value = "供应商启用 停用商品")
    @PostMapping(value = "/updateStatus")
    @Log(title = "商品管理-供应商启用/停用商品", businessType = BusinessType.UPDATE)
    @Log(title = "商品管理-启用/停用商品", businessType = BusinessType.UPDATE)
    public R<Boolean> updateStatus(@RequestBody TErpGoodsUpdateStatusDto dto) {

        SysUser user = tokenService.getLoginUser().getUser();
        TErpGoods goods = erpGoodsService.getById(dto.getId());
        if(dto.getState()==1 && goods.getTypeId()==null){
            return R.fail("操作失败，请先完善商品信息");
@@ -438,6 +476,15 @@
        if(dto.getState()==1 && goods.getClinicPurchasePrice()==null){
            return R.fail("操作失败，请设置供应商分佣比例后再启用");
        }
        if(dto.getState()==1 && goods.getStateUser()==1 && user.getRoleType()==5){
            return R.fail("操作失败，平台禁用商品不可启用");
        }
        if(user.getRoleType()==1){
            goods.setStateUser(1);
        }else if(user.getRoleType()==5){
            goods.setStateUser(2);
        }
        goods.setStateRemark(dto.getStateRemark());
        goods.setState(dto.getState());
        boolean b = erpGoodsService.updateById(goods);
        return R.ok(b);

 ruoyi-system/src/main/java/com/ruoyi/system/dto/AdminAuditDto.java

New file
@@ -0,0 +1,17 @@
package com.ruoyi.system.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

import java.util.List;

@Data
@ApiModel("平台审核商品内容Dto")
public class AdminAuditDto {

    private List<String> ids;

    @ApiModelProperty("审核状态 1通过 2拒绝")
    private Integer contentState;
}

 ruoyi-system/src/main/java/com/ruoyi/system/dto/SupplierSubmitContentDto.java

New file
@@ -0,0 +1,14 @@
package com.ruoyi.system.dto;

import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("供应商提交内容Dto")
public class SupplierSubmitContentDto {
    private String id;

    @ApiModelProperty("内容")
    private String content;
}

 ruoyi-system/src/main/java/com/ruoyi/system/dto/TErpGoodsUpdateStatusDto.java

@@ -17,4 +17,7 @@
    @ApiModelProperty(value = "1启用 2禁用")
    @NotNull(message = "状态不能为空")
    private Integer state;

    @ApiModelProperty(value = "状态备注")
    private String stateRemark;
}

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

@@ -236,4 +236,20 @@
    private String clinicIds;


    @ApiModelProperty(value = "内容")
    @TableField("content")
    private String content;

    @ApiModelProperty(value = "内容状态0待审核 1通过 2拒绝")
    @TableField("content_state")
    private Integer contentState;

    @ApiModelProperty(value = "下架备注")
    @TableField("state_remark")
    private String stateRemark;

    @ApiModelProperty(value = "下架 1平台操作 2供应商操作")
    @TableField("state_user")
    private Integer stateUser;

}

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

@@ -125,6 +125,10 @@
            if(tErpGoodsVO.getIsPrescriptionDrug()!=null && tErpGoodsVO.getIsPrescriptionDrug()==3){
                tErpGoodsVO.setIsPrescriptionDrug(null);
            }

            if(user.getRoleType()==5 && (tErpGoodsVO.getContentState()==null || tErpGoodsVO.getContentState()!=1)){
                tErpGoodsVO.setContent(null);
            }
        }

        pageInfo.setRecords(list);

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

@@ -353,7 +353,15 @@
    @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::getState,1).eq(TErpGoods::getGoodsSource, 1).isNotNull(TErpGoods::getClinicPurchasePrice).orderByDesc(BaseModel::getCreateTime));

        // 获取未禁用的供应商
        List<TCrmSupplier> suppliers = crmSupplierMapper.selectList(new LambdaQueryWrapper<TCrmSupplier>().eq(TCrmSupplier::getStatus, 1));
        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));
        List<TErpGoods> list = p.getRecords();

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

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

@@ -283,6 +283,7 @@
        where (o.warehousing_number -o.outbound_count) >0
        order by o.create_time desc
    </select>

    <select id="pageInventoryGoodsList1" resultType="com.ruoyi.system.vo.TErpGoodsInventoryVO">
        select * from (
        SELECT t1.id,t2.warehouse_no,
@@ -318,9 +319,11 @@
        where o.num >0
        order by o.create_time desc
    </select>

    <select id="getGoodsById" resultType="com.ruoyi.system.model.TErpGoods">
        select <include refid="Base_Column_List"/> from t_erp_goods where id = #{goodsId}
    </select>

    <select id="pageAdminList" resultType="com.ruoyi.system.vo.TErpGoodsVO">
        select
        t1.id
@@ -339,6 +342,7 @@
        t1.taboo,
        t1.precautions,
        t1.interaction,
        t1.content,t1.content_state,
        t1.storage,
        t2.supplier_name
        from t_erp_goods t1 left join t_crm_supplier t2 on t1.supplier_clinic_id = t2.id and t1.goods_source =1

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

@@ -80,6 +80,7 @@
        COALESCE(sum(t3.outbound_count), 0) as outNum
        from t_erp_goods t1  left join  t_erp_supplier_warehousing t2  on t1.id = t2.goods_id
        left join  t_erp_supplier_outbound_goods t3 on t2.id = t3.warehousing_id
        left join t_crm_supplier t4 on t1.supplier_clinic_id = t4.id and t1.goods_source =1 and t4.status =1
        where t1.disabled = 0 and t2.id is not null and t1.goods_source =1 and t1.clinic_purchase_price is not null
        GROUP BY t1.id
        ) o where 1=1