ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditController.java
@@ -1,10 +1,24 @@ package com.ruoyi.management.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.dto.AuditRecordListQuery; import com.ruoyi.management.domain.dto.SlAuditDTO; import com.ruoyi.management.domain.dto.SlEquipmentDTO; import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO; import com.ruoyi.management.domain.vo.SlAuditVO; import com.ruoyi.management.service.SlAuditRecordService; import com.ruoyi.management.service.SlAuditService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * <p> @@ -16,7 +30,23 @@ */ @RestController @RequestMapping("/sl-audit") @Api(value = "审核记录接口", tags = "审核记录接口", description = "审核记录接口") @Api(value = "审核管理接口", tags = "审核管理接口", description = "审核管理接口") public class SlAuditController { @Resource private SlAuditService slAuditService; @PostMapping("/getslAuditList") @ApiOperation(value = "分页获审核管理") public R<PageDTO<SlAuditVO>> getslAuditList(@RequestBody AuditRecordListQuery auditRecordListQuery) { return R.ok(slAuditService.getslAuditList(auditRecordListQuery)); } @PostMapping("/addslAudit") @ApiOperation(value = "添加审核管理") public R addslAudit(@RequestBody SlAuditDTO slAuditDTO) { slAuditService.addslAudit(slAuditDTO); return R.ok(); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlAuditRecordController.java
@@ -1,10 +1,20 @@ package com.ruoyi.management.controller; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.dto.InventoriesSuppliesInfoQuery; import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO; import com.ruoyi.management.service.SlAuditRecordService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; /** * <p> @@ -16,7 +26,11 @@ */ @RestController @RequestMapping("/sl-audit-record") @Api(value = "审核管理接口", tags = "审核管理接口", description = "审核管理接口") @Api(value = "审核详情记录接口", tags = "审核管理接口", description = "审核管理接口") public class SlAuditRecordController { } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAudit.java
@@ -63,5 +63,22 @@ @TableField("cause") private Integer cause; @ApiModelProperty("审核人id") @TableField("shenh_id") private String shenhId; @ApiModelProperty("申请人id") @TableField("sys_id") private Long sysId; @ApiModelProperty("仓库id") @TableField("management_id") private Long managementId; @ApiModelProperty("被转移仓库id") @TableField("zymanagement_id") private Long zymanagementId; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlAuditRecord.java
@@ -33,7 +33,7 @@ @ApiModelProperty("审核人id") @TableField("shenh_id") private Long shenhId; private String shenhId; @ApiModelProperty("1 是管理员审核，2 主管审核，3 是主任审核") @TableField("type") @@ -41,7 +41,7 @@ @ApiModelProperty("1 待审核，2 是通过，3 是拒绝") @TableField("state") private String state; private Integer state; @ApiModelProperty("删除标志（0代表存在 2代表删除）") @TableField("del_flag") ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
@@ -91,5 +91,11 @@ @TableField("authorization") private String authorization; @ApiModelProperty("拒绝理由") @TableField("reasons_refusal") private String reasonsRefusal; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/AuditRecordListQuery.java
New file @@ -0,0 +1,29 @@ package com.ruoyi.management.domain.dto; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.ruoyi.common.core.web.page.BasePage; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data @ApiModel("审核管理查询传输对象") public class AuditRecordListQuery extends BasePage { private Long id; @ApiModelProperty("发起人名称") private String sysName; @ApiModelProperty("发起人电话") private String sysPhone; @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 已通过，5 已拒绝") private Integer state; @ApiModelProperty("1 入库审核，2 出库审核，3 是转移审核") private Integer type; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlAuditDTO.java
New file @@ -0,0 +1,20 @@ package com.ruoyi.management.domain.dto; import com.baomidou.mybatisplus.annotation.TableField; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data @ApiModel("审核管理传输对象") public class SlAuditDTO { @ApiModelProperty("入库id/出库id/转移id") @TableField("rk_id") private Long rkId; @ApiModelProperty("1 入库审核，2 出库审核，3 是转移审核") @TableField("type") private Integer type; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlAuditService.java
@@ -1,7 +1,13 @@ package com.ruoyi.management.service; import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlAudit; import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.management.domain.dto.AuditRecordListQuery; import com.ruoyi.management.domain.dto.SlAuditDTO; import com.ruoyi.management.domain.vo.SlAuditVO; import org.springframework.web.bind.annotation.RequestBody; /** * <p> @@ -13,4 +19,8 @@ */ public interface SlAuditService extends IService<SlAudit> { PageDTO<SlAuditVO> getslAuditList(@RequestBody AuditRecordListQuery auditRecordListQuery); void addslAudit(@RequestBody SlAuditDTO slAuditDTO); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlAuditServiceImpl.java
@@ -1,10 +1,29 @@ package com.ruoyi.management.service.impl; import com.ruoyi.management.domain.SlAudit; import com.ruoyi.management.mapper.SlAuditMapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.management.domain.*; import com.ruoyi.management.domain.dto.AuditRecordListQuery; import com.ruoyi.management.domain.dto.SlAuditDTO; import com.ruoyi.management.domain.vo.SlAuditVO; import com.ruoyi.management.domain.vo.SlEquipmentVO; import com.ruoyi.management.mapper.*; import com.ruoyi.management.service.SlAuditService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.management.service.SlStoreManagementService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.domain.getVolumeProductionRkQuery; import com.ruoyi.system.api.feignClient.SysUserClient; import org.springframework.stereotype.Service; import javax.annotation.Resource; import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.stream.Collectors; /** * <p> @@ -16,5 +35,164 @@ */ @Service public class SlAuditServiceImpl extends ServiceImpl<SlAuditMapper, SlAudit> implements SlAuditService { @Resource private SysUserClient sysUserClient; @Resource private SlStoreManagementService slStoreManagementService; @Resource private SlVolumeProductionRkglMapper slVolumeProductionRkglMapper; @Resource private SlVolumeProductionCkglMapper slVolumeProductionCKglMapper; @Resource private SlVolumeProductionZyglMapper slVolumeProductionZyglMapper; @Resource private SlAuditRecordMapper slAuditRecordMapper; @Override public PageDTO<SlAuditVO> getslAuditList(AuditRecordListQuery auditRecordListQuery) { Long userid = SecurityUtils.getUserId(); SysUser data = sysUserClient.getSysUser(userid).getData(); getVolumeProductionRkQuery getVolumeProductionRkQuer=new getVolumeProductionRkQuery(); getVolumeProductionRkQuer.setSupplierName(auditRecordListQuery.getSysName()); getVolumeProductionRkQuer.setSupplierPhone(auditRecordListQuery.getSysPhone()); List<SysUser> data1 = sysUserClient.getUserSupplierList(getVolumeProductionRkQuer).getData(); Set<Long> goodsSkuIdList = null; goodsSkuIdList = data1.stream().map(SysUser::getUserId) .collect(Collectors.toSet()); Page<SlAudit> page = new Page<>(auditRecordListQuery.getPageCurr(), auditRecordListQuery.getPageSize()); LambdaQueryWrapper< SlAudit> wrapper= Wrappers.lambdaQuery(); if (goodsSkuIdList.size()>0){ wrapper.in(SlAudit::getSysId,goodsSkuIdList); }else{ Set<Long> goodsSkuIdList1 =new HashSet<>(); goodsSkuIdList1.add(0L); wrapper.in(SlAudit::getSysId,goodsSkuIdList1); } if (!data.getUserType().equals(00)){ wrapper.in(SlAudit::getShenhId,userid); } wrapper.eq(SlAudit::getType,auditRecordListQuery.getType()); wrapper.eq( SlAudit::getDelFlag,0); wrapper.orderByDesc(SlAudit::getCreateTime); Page<SlAudit> page1 = this.page(page, wrapper); PageDTO<SlAuditVO> slEquipmentVOPageDTO = PageDTO.of(page1, SlAuditVO.class); List<SlAuditVO> list = slEquipmentVOPageDTO.getList(); for (SlAuditVO sl:list){ SlAuditVO slAuditVO=new SlAuditVO(); SysUser data2 = sysUserClient.getSysUser(sl.getSysId()).getData(); slAuditVO.setSysPhone(data2.getPhonenumber()); slAuditVO.setSysName(data2.getNickName()); SlStoreManagement byId = slStoreManagementService.getById(sl.getManagementId()); slAuditVO.setStoreManagementName(byId.getStoreManagementName()); slAuditVO.setStoreManagementNo(byId.getStoreManagementNo()); if (sl.getZymanagementId()!=null){ SlStoreManagement byId1 = slStoreManagementService.getById(sl.getZymanagementId()); slAuditVO.setBstoreManagementName(byId1.getStoreManagementName()); slAuditVO.setBstoreManagementNo(byId1.getStoreManagementNo()); } } return slEquipmentVOPageDTO; } @Override public void addslAudit(SlAuditDTO slAuditDTO) { SlAudit slAudit=new SlAudit(); slAudit.setType(slAuditDTO.getType()); slAudit.setState(1); slAudit.setRkId(slAuditDTO.getRkId()); if (slAudit.getType()==1){ SlVolumeProductionRkgl slVolumeProductionRkgl = slVolumeProductionRkglMapper.selectById(slAuditDTO.getRkId()); slAudit.setSysId(slVolumeProductionRkgl.getSysId()); slAudit.setManagementId(slVolumeProductionRkgl.getManagementId()); SlStoreManagement byId = slStoreManagementService.getById(slVolumeProductionRkgl.getManagementId()); slAudit.setShenhId(byId.getAdministratorId()); this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord1=new SlAuditRecord(); slAuditRecord1.setAuditId(slAudit.getId()); slAuditRecord1.setShenhId(byId.getCompetentId()); slAuditRecord1.setType(2); slAuditRecord1.setState(1); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getDirectorId()); slAuditRecord2.setType(3); slAuditRecord2.setState(1); slAuditRecordMapper.insert(slAuditRecord); } if (slAudit.getType()==2){ SlVolumeProductionCkgl slVolumeProductionCkgl = slVolumeProductionCKglMapper.selectById(slAuditDTO.getRkId()); slAudit.setSysId(slVolumeProductionCkgl.getSysId()); slAudit.setManagementId(slVolumeProductionCkgl.getManagementId()); SlStoreManagement byId = slStoreManagementService.getById(slVolumeProductionCkgl.getManagementId()); slAudit.setShenhId(byId.getAdministratorId()); this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord1=new SlAuditRecord(); slAuditRecord1.setAuditId(slAudit.getId()); slAuditRecord1.setShenhId(byId.getCompetentId()); slAuditRecord1.setType(2); slAuditRecord1.setState(1); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getDirectorId()); slAuditRecord2.setType(3); slAuditRecord2.setState(1); slAuditRecordMapper.insert(slAuditRecord); } if (slAudit.getType()==3){ SlVolumeProductionZygl slVolumeProductionZygl = slVolumeProductionZyglMapper.selectById(slAuditDTO.getRkId()); slAudit.setSysId(slVolumeProductionZygl.getSysId()); slAudit.setManagementId(slVolumeProductionZygl.getManagementId()); slAudit.setZymanagementId(slVolumeProductionZygl.getBmanagementId()); SlStoreManagement byId = slStoreManagementService.getById(slVolumeProductionZygl.getManagementId()); slAudit.setShenhId(byId.getAdministratorId()); this.save(slAudit); SlAuditRecord slAuditRecord=new SlAuditRecord(); slAuditRecord.setAuditId(slAudit.getId()); slAuditRecord.setShenhId(byId.getAdministratorId()); slAuditRecord.setType(1); slAuditRecord.setState(1); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord1=new SlAuditRecord(); slAuditRecord1.setAuditId(slAudit.getId()); slAuditRecord1.setShenhId(byId.getCompetentId()); slAuditRecord1.setType(2); slAuditRecord1.setState(1); slAuditRecordMapper.insert(slAuditRecord); SlAuditRecord slAuditRecord2=new SlAuditRecord(); slAuditRecord2.setAuditId(slAudit.getId()); slAuditRecord2.setShenhId(byId.getDirectorId()); slAuditRecord2.setType(3); slAuditRecord2.setState(1); slAuditRecordMapper.insert(slAuditRecord); } } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.common.security.utils.SecurityUtils; import com.ruoyi.management.domain.SlGoodsShelf; import com.ruoyi.management.domain.SlStoreManagement; import com.ruoyi.management.domain.dto.GoodsShelfDTO; @@ -15,6 +16,8 @@ import com.ruoyi.management.service.SlGoodsShelfService; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.ruoyi.management.service.SlStoreManagementService; import com.ruoyi.system.api.domain.SysUser; import com.ruoyi.system.api.feignClient.SysUserClient; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -35,14 +38,24 @@ @Resource private SlStoreManagementService SlStoreManagementService; @Resource private SysUserClient sysUserClient; @Override public PageDTO<SlGoodsShelfVO> getGoodsShelfList(SlGoodsShelfQuery slGoodsShelfQuery) { Long userid = SecurityUtils.getUserId(); SysUser data = sysUserClient.getSysUser(userid).getData(); LambdaQueryWrapper<SlStoreManagement> wrapper= Wrappers.lambdaQuery(); wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName()); if(slGoodsShelfQuery.getStoreManagementName()!=null){ wrapper.eq(SlStoreManagement::getStoreManagementName,slGoodsShelfQuery.getStoreManagementName()); } if (slGoodsShelfQuery.getStoreManagementNumber()!=0 && slGoodsShelfQuery.getStoreManagementNumber()!=null){ wrapper.eq(SlStoreManagement::getStoreManagementGrade,slGoodsShelfQuery.getStoreManagementNumber()); } wrapper.eq(SlStoreManagement::getStoreManagementGrade,data.getRoleType()); wrapper.eq(SlStoreManagement::getDelFlag,0); List<SlStoreManagement> page1 = SlStoreManagementService.list(wrapper); Set<Long> slStoreManagementIdList = null; ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/ManagementGoodsMaterialsMapper.xml
@@ -3,7 +3,7 @@ <mapper namespace="com.rouyi.management.mapper.ManagementGoodsMaterialsMapper"> <!-- 通用查询映射结果 --> <resultMap id="BaseResultMap" type="com.rouyi.management.domain.ManagementGoodsMaterials"> <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.ManagementGoodsMaterials"> <id column="id" property="id" /> <result column="repertory_sum" property="repertorySum" /> <result column="repertory_zhai" property="repertoryZhai" />
