ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TErpGoodsController.java
@@ -164,6 +164,9 @@ return R.ok(); } @ApiOperation(value = "供应商提交商品内容") @PostMapping(value = "/supplierSubmitContent") @Log(title = "商品管理-供应商提交商品内容", businessType = BusinessType.UPDATE) @@ -462,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("操作失败，请先完善商品信息"); @@ -471,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/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
@@ -244,5 +244,12 @@ @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/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/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
