文档新增

liujie

2025-11-04 d188e9f2907e20851194507b723c836dcf66a608

文档新增

 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));
    }

@@ -147,6 +148,38 @@
    }


    @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();
    }



    /**
     * 获取erp问题上报管理列表

 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/model/TErpGoods.java

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


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

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


}

 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/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