ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
@@ -8,13 +8,11 @@ import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery; import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO; import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO; import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO; import com.ruoyi.management.service.SlVolumeProductionRkglService; 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 io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -40,4 +38,10 @@ return R.ok(slVolumeProductionRkglService.getSupplierVolumeProductionRkglList(supplierVolumeProductionRkglQuery)); } @PostMapping("/getVolumeProductionRkgInfo") @ApiOperation(value = "获取入库管理详情") public R<VolumeProductionRkgInfoVO> getVolumeProductionRkgInfo(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) { return R.ok(slVolumeProductionRkglService.getVolumeProductionRkgInfo(id)); } } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionRkgl.java
@@ -77,7 +77,7 @@ @ApiModelProperty("附件") @TableField("attachment") private String attachment; private String attachmentUrl; @ApiModelProperty("来源") @TableField("source") @@ -87,5 +87,9 @@ @TableField("remark") private String remark; @ApiModelProperty("审批单") @TableField("authorization") private String authorization; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
New file @@ -0,0 +1,48 @@ package com.ruoyi.management.domain.vo; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.util.Date; @Data public class VolumeProductionRkgInfoVO { @TableId(value = "id", type = IdType.AUTO) private Long id; @ApiModelProperty("发起人名称") private String sysName; @ApiModelProperty("仓库名称") private String storeManagementName; @ApiModelProperty("发起时间") private Date startiTime; @ApiModelProperty("结束时间") private Date endTime; @ApiModelProperty("1.待审核,2 已拒绝,3 审核通过") private Integer presentState; @ApiModelProperty("1 待管理员审核,2 待主管审核,3 待主任审核,4 已通过,5 已拒绝") private Integer auditStatus; @ApiModelProperty("供应商名称") private String supplierName; @ApiModelProperty("附件") private String attachmentUrl; @ApiModelProperty("来源") private String source; @ApiModelProperty("备注") private String remark; @ApiModelProperty("审批单") private String authorization; } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
@@ -5,6 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery; import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO; import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO; import io.swagger.annotations.ApiParam; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; /** @@ -17,5 +20,5 @@ */ public interface SlVolumeProductionRkglService extends IService<SlVolumeProductionRkgl> { PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(@RequestBody SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery); VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Integer id); } ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -3,6 +3,7 @@ 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.BeanUtils; import com.ruoyi.common.core.utils.page.PageDTO; import com.ruoyi.management.domain.SlGoodsShelf; import com.ruoyi.management.domain.SlStoreManagement; @@ -10,6 +11,7 @@ import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery; import com.ruoyi.management.domain.vo.SlGoodsShelfVO; import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO; import com.ruoyi.management.domain.vo.VolumeProductionRkgInfoVO; import com.ruoyi.management.mapper.SlStoreManagementMapper; import com.ruoyi.management.mapper.SlVolumeProductionRkglMapper; import com.ruoyi.management.service.SlVolumeProductionRkglService; @@ -59,4 +61,17 @@ } return SlGoodsShelfDTO; } @Override public VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Integer id) { SlVolumeProductionRkgl byId = this.getById(id); VolumeProductionRkgInfoVO v=BeanUtils.copyBean(byId, VolumeProductionRkgInfoVO.class); SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId()); v.setStoreManagementName(slStoreManagement.getStoreManagementName()); SysUser data = sysUserClient.getSysUser(Long.valueOf(byId.getSupplierId())).getData(); v.setSupplierName(data.getNickName()); SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData(); v.setSysName(data1.getNickName()); return v; } }