森林防火 供应商管理

rentaiming

2024-07-12 acd73337ea692fb4ffd841f2ebd3b85086189175

森林防火 供应商管理

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesController.java

@@ -7,6 +7,7 @@
import com.ruoyi.management.domain.vo.InventoriesSuppliesVO;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.service.InventoriesSuppliesService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -26,6 +27,7 @@
 */
@RestController
@RequestMapping("/inventories-supplies")
@Api(value = "物资盘点接口", tags = "物资盘点接口", description = "物资盘点接口")
public class InventoriesSuppliesController {

    @Resource

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/InventoriesSuppliesInfoController.java

@@ -11,6 +11,7 @@
import com.ruoyi.management.domain.vo.InventoriesSuppliesInfoVO;
import com.ruoyi.management.domain.vo.InventoriesSuppliesVO;
import com.ruoyi.management.service.InventoriesSuppliesInfoService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -30,6 +31,7 @@
 */
@RestController
@RequestMapping("/inventories-supplies-info")
@Api(value = "物资盘点详情接口", tags = "物资盘点详情接口", description = "物资盘点详情接口")
public class InventoriesSuppliesInfoController {

    @Resource

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkController.java

@@ -16,6 +16,7 @@
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;
import java.util.List;

/**
 * <p>
@@ -52,6 +53,12 @@
        return R.ok(slVolumeProductionCkService.getSlVolumeProductionCkList(managementimgVolumeProductionCkQuery));
    }

    @PostMapping("/SlVolumeProductionCkList")
    @ApiOperation(value = "不分页获取通过出库管理ID当前出库的物资")
    public R<List<ManagementimgVolumeProductionCkVO>> SlVolumeProductionCkList(@RequestBody ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery) {
        return R.ok(slVolumeProductionCkService.SlVolumeProductionCkList(managementimgVolumeProductionCkQuery));
    }

    @ApiOperation("删除出库批次")
    @DeleteMapping("/{id}")
    public R<?> delStoreManagement(

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionCkglController.java

@@ -6,17 +6,13 @@
import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.service.SlVolumeProductionCkglService;
import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
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 io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

import javax.annotation.Resource;

@@ -48,4 +44,16 @@
        return R.ok();
    }

    @PostMapping("/getVolumeProductionCkglnfo")
    @ApiOperation(value = "获取出库库管理详情")
    public R<VolumeProductionCkglInfoVO> getVolumeProductionCkglnfo(@ApiParam(name = "id", value = "出库管理id", required = true) @PathVariable("id") Integer id) {
        return R.ok(slVolumeProductionCkglService.getVolumeProductionCkglnfo(id));
    }

    @PostMapping("/getVolumeProductionCkglInventory")
    @ApiOperation(value = "获取出库管理打印清单")
    public R<VolumeProductionCkglInventoryVO> getVolumeProductionCkglInventory(@ApiParam(name = "id", value = "入库管理id", required = true) @PathVariable("id") Integer id) {
        return R.ok(slVolumeProductionCkglService.getVolumeProductionCkglInventory(id));
    }

}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlVolumeProductionCkgl.java

@@ -67,7 +67,7 @@
    @TableField("present_state")
    private Integer presentState;

    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6已完成， 7，已取消")
    @TableField("audit_status")
    private Integer auditStatus;


 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglInfoVO.java

New file
@@ -0,0 +1,49 @@
package com.ruoyi.management.domain.vo;

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(value = "出库管理详情", description = "入库出库管理详情")
public class VolumeProductionCkglInfoVO {
    private Long id;

    @ApiModelProperty("发起人名称")
    private String sysName;

    @ApiModelProperty("发起人电话")
    private String sysPhone;

    @ApiModelProperty("仓库名称")
    private String storeManagementName;

    @ApiModelProperty("发起时间")
    private Date startiTime;

    @ApiModelProperty("结束时间")
    private Date endTime;

    @ApiModelProperty("来源")
    @TableField("source")
    private String source;

    @ApiModelProperty("附件")
    @TableField("attachment")
    private String attachmentUrl;

    @ApiModelProperty("审批单")
    @TableField("authorization")
    private String authorization;

    @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
    @TableField("present_state")
    private Integer presentState;

    @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待出库，5 待从重新提交， 6已完成， 7，已取消")
    @TableField("audit_status")
    private Integer auditStatus;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionCkglInventoryVO.java

New file
@@ -0,0 +1,43 @@
package com.ruoyi.management.domain.vo;

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

import java.util.Date;
import java.util.List;

@Data
@ApiModel(value = "出库打印清单", description = "出库打印清单")
public class VolumeProductionCkglInventoryVO {
    private Long id;
    @ApiModelProperty("发起人名称")
    private String sysName;

    @ApiModelProperty("仓库名称")
    private String storeManagementName;

    @ApiModelProperty("仓库ID")
    private Long managementId;

    @ApiModelProperty("发起时间")
    private Date startiTime;

    @ApiModelProperty("发起人电话")
    private String sysPhone;

    @ApiModelProperty("主任id-仓库管理员选择的多个逗号隔各开")
    private String directorName;

    @ApiModelProperty("主管id-仓库管理员选择的多个逗号隔各开")
    private String competentName;

    @ApiModelProperty("管理员id多个逗号隔各开")
    private String administratorName;


    @ApiModelProperty("出库数据")
    List<ManagementimgVolumeProductionCkVO> managementimgVolumeProductionCkVOList;


}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java

@@ -9,7 +9,7 @@

import java.util.Date;
@Data
@ApiModel(value = "仓库管理", description = "仓库管理")
@ApiModel(value = "入库管理详情", description = "入库管理详情")
public class VolumeProductionRkgInfoVO {

    private Long id;
@@ -17,6 +17,9 @@
    @ApiModelProperty("发起人名称")
    private String sysName;

    @ApiModelProperty("发起人电话")
    private String sysPhone;

    @ApiModelProperty("仓库名称")
    private String storeManagementName;


 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInventoryVO.java

@@ -39,5 +39,5 @@
    private String supplierName;

    @ApiModelProperty("入库数据")
    List<ManagementimgVolumeProductionRkVO> managementimgVolumeProductionRkVOList;
    List<ManagementimgVolumeProductionCkVO> managementimgVolumeProductionRkVOList;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkService.java

@@ -10,6 +10,8 @@
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionCkVO;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;

/**
 * <p>
 * 发起出库 服务类
@@ -25,4 +27,6 @@
    void addSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO);

    PageDTO<ManagementimgVolumeProductionCkVO> getSlVolumeProductionCkList(ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);

    List<ManagementimgVolumeProductionCkVO> SlVolumeProductionCkList(@RequestBody ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery);
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionCkglService.java

@@ -5,7 +5,11 @@
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
import com.ruoyi.management.domain.vo.VolumeProductionCkglInfoVO;
import com.ruoyi.management.domain.vo.VolumeProductionCkglInventoryVO;
import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;

/**
@@ -20,4 +24,8 @@
    PageDTO<VolumeProductionCkglVO> getslVolumeProductionCkglList(getslVolumeProductionCkglQuery VolumeProductionCkglQuery);

    void addslVolumeProductionCkgl(VolumeProductionCkglDTO volumeProductionCkglDTO);

    VolumeProductionCkglInfoVO getVolumeProductionCkglnfo (Integer id);

    VolumeProductionCkglInventoryVO getVolumeProductionCkglInventory(Integer id);
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java

@@ -21,6 +21,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;

/**
@@ -100,4 +101,32 @@
        }
        return SlGoodsShelfDTO;
    }

    @Override
    public List<ManagementimgVolumeProductionCkVO> SlVolumeProductionCkList(ManagementimgVolumeProductionCkQuery managementimgVolumeProductionCkQuery) {
        LambdaQueryWrapper< SlVolumeProductionCk> wrapper1= Wrappers.lambdaQuery();
        wrapper1.eq(SlVolumeProductionCk::getCkglId,managementimgVolumeProductionCkQuery.getVolumeProductionCKglId());
        wrapper1.eq( SlVolumeProductionCk::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionCk::getCreateTime);
        List<SlVolumeProductionCk> page2 = this.list(wrapper1);
            List<ManagementimgVolumeProductionCkVO> SlGoodsShelfDTO=new ArrayList<>();
        for(SlVolumeProductionCk list1:page2) {{
            ManagementimgVolumeProductionCkVO list=new ManagementimgVolumeProductionCkVO();
            list.setId(list1.getId());
            list.setCkNum(list1.getCkNum());
            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list1.getRkId());
            list.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
            list.setRkNumber(slVolumeProductionRk.getRkNumber());
            list.setRepertoryZhai(slVolumeProductionRk.getRepertoryZhai());
            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
            list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
            list.setIsConsume(slGoodsMaterials.getIsConsume());
            SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
            list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());

            SlGoodsShelfDTO.add(list);
            }
        }
        return SlGoodsShelfDTO;
    }
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkglServiceImpl.java

@@ -3,17 +3,14 @@
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.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionCkgl;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.VolumeProductionCkglDTO;
import com.ruoyi.management.domain.dto.getslVolumeProductionCkglQuery;
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import com.ruoyi.management.domain.vo.VolumeProductionCkglVO;
import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.mapper.SlVolumeProductionCkglMapper;
import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.*;
import com.ruoyi.management.service.SlVolumeProductionCkglService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.SysUser;
@@ -22,9 +19,7 @@
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.*;
import java.util.stream.Collectors;

/**
@@ -42,6 +37,19 @@

    @Resource
    private SlStoreManagementMapper slStoreManagementMapper;

    @Resource
    private SlVolumeProductionCkMapper slVolumeProductionCkMapper;

    @Resource
    private SlVolumeProductionRkMapper slVolumeProductionRkMapper;

    @Resource
    private SlGoodsMaterialsMapper slGoodsMaterialsMapper;

    @Resource
    private  SlGoodsShelfMapper slGoodsShelfMapper;

    @Override
    public PageDTO<VolumeProductionCkglVO> getslVolumeProductionCkglList(getslVolumeProductionCkglQuery VolumeProductionCkglQuery) {

@@ -104,4 +112,87 @@
            this.updateById(byId);
        }
    }

    @Override
    public VolumeProductionCkglInfoVO getVolumeProductionCkglnfo(Integer id) {

        SlVolumeProductionCkgl byId = this.getById(id);
        VolumeProductionCkglInfoVO v= BeanUtils.copyBean(byId, VolumeProductionCkglInfoVO.class);
        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
        v.setStoreManagementName(slStoreManagement.getStoreManagementName());
        SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
        v.setSysName(data1.getNickName());
        v.setSysPhone(data1.getPhonenumber());
        return null;
    }

    @Override
    public VolumeProductionCkglInventoryVO getVolumeProductionCkglInventory(Integer id) {
        SlVolumeProductionCkgl byId = this.getById(id);
        VolumeProductionCkglInventoryVO vo = new VolumeProductionCkglInventoryVO();
        SysUser data = sysUserClient.getSysUser(byId.getId()).getData();
        vo.setSysPhone(data.getPhonenumber());
        vo.setSysName(data.getNickName());
        vo.setStartiTime(byId.getStartiTime());
        SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
        vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
        String directorId = slStoreManagement.getDirectorId();
        List<String> stri = Arrays.asList(directorId.split(","));
        String str1 = null;
        if (stri.size() > 0) {
            for (String str : stri) {
                SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
                str1 += data1.getNickName() + ",";
            }
        }
        vo.setDirectorName(str1.substring(0, str1.length() - 1));

        String competentId = slStoreManagement.getCompetentId();
        List<String> stri1 = Arrays.asList(competentId.split(","));
        String str11 = null;
        if (stri1.size() > 0) {
            for (String str : stri1) {
                SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
                str11 += data1.getNickName() + ",";
            }
        }
        vo.setCompetentName(str11.substring(0, str11.length() - 1));

        String administratorId = slStoreManagement.getAdministratorId();
        List<String> stri11 = Arrays.asList(administratorId.split(","));
        String str111 = null;
        if (stri11.size() > 0) {
            for (String str : stri11) {
                SysUser data1 = sysUserClient.getSysUser(Long.valueOf(str)).getData();
                str111 += data1.getNickName() + ",";
            }
        }
        vo.setAdministratorName(str111.substring(0, str111.length() - 1));


        LambdaQueryWrapper< SlVolumeProductionCk> wrapper2= Wrappers.lambdaQuery();
        wrapper2.eq(SlVolumeProductionCk::getCkglId,id);
        wrapper2.eq( SlVolumeProductionCk::getDelFlag,0);
        wrapper2.orderByDesc(SlVolumeProductionCk::getCreateTime);
        List<SlVolumeProductionCk> page2 = slVolumeProductionCkMapper.selectList(wrapper2);
        List<ManagementimgVolumeProductionCkVO> SlGoodsShelfDTO=new ArrayList<>();
        for(SlVolumeProductionCk list1:page2) {
            ManagementimgVolumeProductionCkVO list=new ManagementimgVolumeProductionCkVO();
            list.setId(list1.getId());
            list.setCkNum(list1.getCkNum());
            SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list1.getRkId());
            list.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
            list.setRkNumber(slVolumeProductionRk.getRkNumber());
            list.setRepertoryZhai(slVolumeProductionRk.getRepertoryZhai());
            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
            list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
            list.setIsConsume(slGoodsMaterials.getIsConsume());
            SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
            list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());

            SlGoodsShelfDTO.add(list);
        }
        vo.setManagementimgVolumeProductionCkVOList(SlGoodsShelfDTO);
        return vo;
    }
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java

@@ -148,11 +148,10 @@
        Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
        PageDTO<getVolumeProductionRkgCodeVO> SlGoodsShelfDTO = PageDTO.of(page2, getVolumeProductionRkgCodeVO.class);
        List<getVolumeProductionRkgCodeVO> list2 = SlGoodsShelfDTO.getList();
        for(getVolumeProductionRkgCodeVO list:list2) {{
        for(getVolumeProductionRkgCodeVO list:list2) {
            SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
            list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
            list.setIsConsume(slGoodsMaterials.getIsConsume());
        }
        }
        return SlGoodsShelfDTO;
    }

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java

@@ -86,8 +86,10 @@
        v.setStoreManagementName(slStoreManagement.getStoreManagementName());
        SysUser data = sysUserClient.getSysUser(Long.valueOf(byId.getSupplierId())).getData();
        v.setSupplierName(data.getNickName());
        v.setSupplierPhone(data.getPhonenumber());
        SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
        v.setSysName(data1.getNickName());
        v.setSysPhone(data1.getPhonenumber());
        return v;
    }