森林防火 供应商管理

rentaiming

2024-07-24 3ee4564f6450857a43f508271259b468cf3d1f79

森林防火 供应商管理

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysOperLog.java

@@ -5,12 +5,14 @@
import com.ruoyi.common.core.annotation.Excel;
import com.ruoyi.common.core.annotation.Excel.ColumnType;
import com.ruoyi.common.core.web.domain.BaseEntity;
import lombok.Data;

/**
 * 操作日志记录表 oper_log
 * 
 * @author ruoyi
 */
@Data
public class SysOperLog extends BaseEntity
{
    private static final long serialVersionUID = 1L;
@@ -83,173 +85,7 @@
    @Excel(name = "消耗时间", suffix = "毫秒")
    private Long costTime;

    public Long getOperId()
    {
        return operId;
    }
    @Excel(name = "电话")
    private String phone;

    public void setOperId(Long operId)
    {
        this.operId = operId;
    }

    public String getTitle()
    {
        return title;
    }

    public void setTitle(String title)
    {
        this.title = title;
    }

    public Integer getBusinessType()
    {
        return businessType;
    }

    public void setBusinessType(Integer businessType)
    {
        this.businessType = businessType;
    }

    public Integer[] getBusinessTypes()
    {
        return businessTypes;
    }

    public void setBusinessTypes(Integer[] businessTypes)
    {
        this.businessTypes = businessTypes;
    }

    public String getMethod()
    {
        return method;
    }

    public void setMethod(String method)
    {
        this.method = method;
    }

    public String getRequestMethod()
    {
        return requestMethod;
    }

    public void setRequestMethod(String requestMethod)
    {
        this.requestMethod = requestMethod;
    }

    public Integer getOperatorType()
    {
        return operatorType;
    }

    public void setOperatorType(Integer operatorType)
    {
        this.operatorType = operatorType;
    }

    public String getOperName()
    {
        return operName;
    }

    public void setOperName(String operName)
    {
        this.operName = operName;
    }

    public String getDeptName()
    {
        return deptName;
    }

    public void setDeptName(String deptName)
    {
        this.deptName = deptName;
    }

    public String getOperUrl()
    {
        return operUrl;
    }

    public void setOperUrl(String operUrl)
    {
        this.operUrl = operUrl;
    }

    public String getOperIp()
    {
        return operIp;
    }

    public void setOperIp(String operIp)
    {
        this.operIp = operIp;
    }

    public String getOperParam()
    {
        return operParam;
    }

    public void setOperParam(String operParam)
    {
        this.operParam = operParam;
    }

    public String getJsonResult()
    {
        return jsonResult;
    }

    public void setJsonResult(String jsonResult)
    {
        this.jsonResult = jsonResult;
    }

    public Integer getStatus()
    {
        return status;
    }

    public void setStatus(Integer status)
    {
        this.status = status;
    }

    public String getErrorMsg()
    {
        return errorMsg;
    }

    public void setErrorMsg(String errorMsg)
    {
        this.errorMsg = errorMsg;
    }

    public Date getOperTime()
    {
        return operTime;
    }

    public void setOperTime(Date operTime)
    {
        this.operTime = operTime;
    }

    public Long getCostTime()
    {
        return costTime;
    }

    public void setCostTime(Long costTime)
    {
        this.costTime = costTime;
    }
}

 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java

@@ -80,7 +80,6 @@
    /**
     * 密码
     */
    @NotBlank(message = "密码不能为空")
    private String password;

    /** 帐号状态（0正常 1停用） */

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

@@ -2,6 +2,8 @@


import com.ruoyi.common.core.domain.R;
import com.ruoyi.management.domain.SlRegion;
import com.ruoyi.management.domain.dto.RegionQuery;
import com.ruoyi.management.domain.vo.RegionVo;
import com.ruoyi.management.service.SlRegionService;
import io.swagger.annotations.Api;
@@ -35,4 +37,24 @@
        return R.ok(regionService.listRegionVo());
    }


    @PostMapping("/getcityRegione")
    @ApiOperation(value = "获取城市")
    public R<List<SlRegion>> getcityRegione(RegionQuery regionQuery) {
        return R.ok(regionService.getcityRegione(regionQuery));
    }

    @PostMapping("/getcountyRegione")
    @ApiOperation(value = "获取县")
    public R<List<SlRegion>> getcountyRegione(RegionQuery regionQuery) {
        return R.ok(regionService.getcountyRegione(regionQuery));
    }

    @PostMapping("/gettownRegione")
    @ApiOperation(value = "获取乡")
    public R<List<SlRegion>> gettownRegione(RegionQuery regionQuery) {
        return R.ok(regionService.gettownRegione(regionQuery));
    }


}

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

@@ -50,7 +50,7 @@

    @PostMapping("/updSlVolumeProductionCk")
    @ApiOperation(value = "修改出库")
    public R updSlVolumeProductionCk(@RequestBody SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
    public R updSlVolumeProductionCk(@RequestBody List<SlVolumeProductionCkDTO> slVolumeProductionCkDTO) {
        slVolumeProductionCkService.updSlVolumeProductionCk(slVolumeProductionCkDTO);
        return R.ok();
    }

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

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

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

/**
 * <p>
@@ -46,7 +47,7 @@

    @PostMapping("/uplSlVolumeProductionRk")
    @ApiOperation(value = "修改入库批次管理")
    public R uplSlVolumeProductionRk(@RequestBody SlVolumeProductionRkDTO SlVolumeProductionRkDTO) {
    public R uplSlVolumeProductionRk(@RequestBody List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO) {
        slVolumeProductionRkService.uplSlVolumeProductionRk(SlVolumeProductionRkDTO);
        return R.ok();
    }

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

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

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

/**
 * <p>
@@ -47,7 +48,7 @@

    @PostMapping("/updSlVolumeProductionZy")
    @ApiOperation(value = "修改转移")
    public R updSlVolumeProductionZy(@RequestBody UpdaddSlVolumeProductionZyDTO updaddSlVolumeProductionZyDTO) {
    public R updSlVolumeProductionZy(@RequestBody List<UpdaddSlVolumeProductionZyDTO> updaddSlVolumeProductionZyDTO) {
        slVolumeProductionZyService.updSlVolumeProductionZy(updaddSlVolumeProductionZyDTO);
        return R.ok();
    }

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/RegionQuery.java

New file
@@ -0,0 +1,10 @@
package com.ruoyi.management.domain.dto;

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

@Data
@ApiModel("地址通过上一级code找下一件")
public class RegionQuery {
    private  String code;
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/StoreManagementQuery.java

@@ -6,7 +6,7 @@
import lombok.Data;

@Data
@ApiModel("仓库管理分页数据查询传输对象")
@ApiModel("仓库库存分页数据查询传输对象")
public class StoreManagementQuery extends BasePage {
    @ApiModelProperty("仓库名称")
    private String storeManagementName;
@@ -18,5 +18,5 @@
    private Integer storeManagementNumber;

    @ApiModelProperty("仓库等级 1省级，2市州级，3市县级，5乡镇级，6 经营单位")
    private Integer storeManagementGrade;
    private String storeManagementGrade;
}

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

@@ -3,6 +3,7 @@

import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.SlRegion;
import com.ruoyi.management.domain.dto.RegionQuery;
import com.ruoyi.management.domain.vo.RegionVo;

import java.util.List;
@@ -18,5 +19,10 @@
public interface SlRegionService extends IService<SlRegion> {
    List<RegionVo> listRegionVo();

    List<SlRegion> getcityRegione(RegionQuery regionQuery);
    List<SlRegion>  getcountyRegione(RegionQuery regionQuery);

    List<SlRegion> gettownRegione(RegionQuery regionQuery);


}

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

@@ -25,7 +25,7 @@

    PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery);

    void updSlVolumeProductionCk(SlVolumeProductionCkDTO slVolumeProductionCkDTO);
    void updSlVolumeProductionCk(List<SlVolumeProductionCkDTO>slVolumeProductionCkDTO);
    void addSlVolumeProductionCk(AddSlVolumeProductionCkDTO addSlVolumeProductionCkDTO);



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

@@ -10,6 +10,8 @@
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;

import java.util.List;

/**
 * <p>
 * 发起入库管理 服务类
@@ -26,7 +28,7 @@

    void addVolumeProductionRkgl(@RequestBody SlVolumeProductionRkListDTO slVolumeProductionRkListDTO);

    void uplSlVolumeProductionRk(@RequestBody SlVolumeProductionRkDTO SlVolumeProductionRkDTO);
    void uplSlVolumeProductionRk(@RequestBody List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO);

    PageDTO<getVolumeProductionRkgCodeVO> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery);
    ManagementimgVolumeProductionRkVO codeInfo(Long id);

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

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

import java.util.List;

/**
 * <p>
 * 发起转移 服务类
@@ -20,7 +22,7 @@

    void addSlVolumeProductionZy(AddaddSlVolumeProductionZyDTO addaddSlVolumeProductionZyDTO);

    void  updSlVolumeProductionZy(UpdaddSlVolumeProductionZyDTO updaddSlVolumeProductionZyDTO);
    void  updSlVolumeProductionZy(List<UpdaddSlVolumeProductionZyDTO> updaddSlVolumeProductionZyDTO);

    PageDTO<ManagementimgVolumeProductionZyVO> getSlVolumeProductionZyList( ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery);
}

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

@@ -1,6 +1,11 @@
package com.ruoyi.management.service.impl;
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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.domain.SlRegion;
import com.ruoyi.management.domain.SlVolumeProductionRk;
import com.ruoyi.management.domain.dto.RegionQuery;
import com.ruoyi.management.domain.vo.RegionVo;
import com.ruoyi.management.mapper.SlRegionMapper;
import com.ruoyi.management.service.SlRegionService;
@@ -107,4 +112,38 @@
        // 返回处理后的地区列表
        return regionVoList1;
    }

    @Override
    public List<SlRegion> getcityRegione(RegionQuery regionQuery) {

        LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
        if (regionQuery.getCode()!=null){
            wrapper1.like(SlRegion::getParentId,regionQuery.getCode());
        }
        wrapper1.like(SlRegion::getLevel,2);
        List<SlRegion> page2 = this.list(wrapper1);
        return page2;
    }

    @Override
    public List<SlRegion> getcountyRegione(RegionQuery regionQuery) {
        LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
        if (regionQuery.getCode()!=null){
            wrapper1.like(SlRegion::getParentId,regionQuery.getCode());
        }
        wrapper1.like(SlRegion::getLevel,3);
        List<SlRegion> page2 = this.list(wrapper1);
        return page2;
    }

    @Override
    public List<SlRegion> gettownRegione(RegionQuery regionQuery) {
        LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
        if (regionQuery.getCode()!=null){
            wrapper1.like(SlRegion::getParentId,regionQuery.getCode());
        }
        wrapper1.like(SlRegion::getLevel,4);
        List<SlRegion> page2 = this.list(wrapper1);
        return page2;
    }
}

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.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.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;


@@ -14,6 +15,7 @@
import com.ruoyi.management.domain.dto.StoreManagementQuery;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.domain.vo.SlStoreManagementInventoryVO;
import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkglMapper;
@@ -21,6 +23,7 @@
import org.springframework.stereotype.Service;

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

/**
@@ -35,7 +38,7 @@
public class SlStoreManagementServiceImpl extends ServiceImpl<SlStoreManagementMapper, SlStoreManagement> implements SlStoreManagementService {

    @Resource
    private SlVolumeProductionRkMapper SlVolumeProductionRkMapper;
    private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;

    @Override
    public PageDTO<SlStoreManagement> getStoreManagementList(StoreManagementQuery storeManagementQuery) {
@@ -47,9 +50,16 @@
        if(storeManagementQuery.getStoreManagementNo()!=null&&storeManagementQuery.getStoreManagementNo()!=""){
            wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
        }
        if (storeManagementQuery.getStoreManagementGrade()!=0 && storeManagementQuery.getStoreManagementGrade()!=null){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,storeManagementQuery.getStoreManagementGrade());

        if ( storeManagementQuery.getStoreManagementGrade()!=null &&!storeManagementQuery.getStoreManagementGrade().equals("0") ){
            String[] split = storeManagementQuery.getStoreManagementGrade().split(",");
            List<Integer> arr=new ArrayList<>();
            for(int i=0;i<split.length;i++){
                arr.add(Integer.valueOf(split[i]));
        }
            wrapper.in(SlStoreManagement::getStoreManagementGrade,arr);
        }

        wrapper.eq( SlStoreManagement::getDelFlag,0);
        wrapper.orderByDesc(SlStoreManagement::getCreateTime);
        Page<SlStoreManagement> page1 = this.page(page, wrapper);
@@ -159,10 +169,20 @@

        Page<SlStoreManagement> page = new Page<>(storeManagementQuery.getPageCurr(), storeManagementQuery.getPageSize());
        LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
        if (storeManagementQuery.getStoreManagementName()!=null){
        wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
        }
        if (storeManagementQuery.getStoreManagementNo()!=null){
        wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
        if (storeManagementQuery.getStoreManagementGrade()!=0 && storeManagementQuery.getStoreManagementGrade()!=null){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,storeManagementQuery.getStoreManagementGrade());
        }

        if ( storeManagementQuery.getStoreManagementGrade()!=null&&!storeManagementQuery.getStoreManagementGrade().equals("0")){
            String[] split = storeManagementQuery.getStoreManagementGrade().split(",");
            List<Integer> arr=new ArrayList<>();
            for(int i=0;i<split.length;i++){
                arr.add(Integer.valueOf(split[i]));
            }
            wrapper.in(SlStoreManagement::getStoreManagementGrade,arr);
        }
        wrapper.eq( SlStoreManagement::getDelFlag,0);
        wrapper.orderByDesc(SlStoreManagement::getCreateTime);
@@ -171,8 +191,11 @@
        PageDTO<SlStoreManagementInventoryVO> InventoryVO = PageDTO.of(page1, SlStoreManagementInventoryVO.class);
        List<SlStoreManagementInventoryVO> list2 = InventoryVO.getList();
        for(SlStoreManagementInventoryVO list:list2){
            Integer managementInventoryList = SlVolumeProductionRkMapper.getManagementInventoryList(list.getId());
            list.setGoodsMaterialsNum(managementInventoryList);
            LambdaQueryWrapper<ManagementGoodsMaterials> wrapper1= Wrappers.lambdaQuery();

            wrapper1.eq(ManagementGoodsMaterials::getManagementId,list.getId());
            List<ManagementGoodsMaterials> managementGoodsMaterials = managementGoodsMaterialsMapper.selectList(wrapper1);
            list.setGoodsMaterialsNum(managementGoodsMaterials.size());

        }
        return InventoryVO;

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

@@ -65,11 +65,14 @@
    }

    @Override
    public void updSlVolumeProductionCk(SlVolumeProductionCkDTO slVolumeProductionCkDTO) {
            SlVolumeProductionCk byId = this.getById(slVolumeProductionCkDTO.getId());
            byId.setCkNum(slVolumeProductionCkDTO.getCkNum());
            byId.setGuihNum(slVolumeProductionCkDTO.getGuihNum());
    public void updSlVolumeProductionCk(List<SlVolumeProductionCkDTO> slVolumeProductionCkDTO) {
           for (SlVolumeProductionCkDTO c:slVolumeProductionCkDTO){
               SlVolumeProductionCk byId = this.getById(c.getId());
               byId.setCkNum(c.getCkNum());
               byId.setGuihNum(c.getGuihNum());
            this.updateById(byId);
           }


    }


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

@@ -118,26 +118,29 @@
    }

    @Override
    public void uplSlVolumeProductionRk(SlVolumeProductionRkDTO SlVolumeProductionRkDTO) {
        SlVolumeProductionRk byId = this.getById(SlVolumeProductionRkDTO.getId());
        if (SlVolumeProductionRkDTO.getErwmNum()!=null){
            byId.setErwmNum(SlVolumeProductionRkDTO.getErwmNum());
        }if (SlVolumeProductionRkDTO.getRkPice()!=null){
            byId.setRkPice(SlVolumeProductionRkDTO.getRkPice());
        }if (SlVolumeProductionRkDTO.getRkNum()!=null){
            byId.setRkNum(SlVolumeProductionRkDTO.getRkNum());
        }if (SlVolumeProductionRkDTO.getShelfId()!=null){
            byId.setShelfId(SlVolumeProductionRkDTO.getShelfId());
        }if (SlVolumeProductionRkDTO.getRkModel()!=null){
            byId.setRkModel(SlVolumeProductionRkDTO.getRkModel());
        }if (SlVolumeProductionRkDTO.getStoreManagementNumber()!=null){
            byId.setStoreManagementNumber(SlVolumeProductionRkDTO.getStoreManagementNumber());
        }if (SlVolumeProductionRkDTO.getRkNumber()!=null){
            byId.setRkNumber(SlVolumeProductionRkDTO.getRkNumber());
    public void uplSlVolumeProductionRk(List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO) {
        for (SlVolumeProductionRkDTO a:SlVolumeProductionRkDTO){
            SlVolumeProductionRk byId = this.getById(a.getId());
            if (a.getErwmNum()!=null){
                byId.setErwmNum(a.getErwmNum());
            }if (a.getRkPice()!=null){
                byId.setRkPice(a.getRkPice());
            }if (a.getRkNum()!=null){
                byId.setRkNum(a.getRkNum());
            }if (a.getShelfId()!=null){
                byId.setShelfId(a.getShelfId());
            }if (a.getRkModel()!=null){
                byId.setRkModel(a.getRkModel());
            }if (a.getStoreManagementNumber()!=null){
                byId.setStoreManagementNumber(a.getStoreManagementNumber());
            }if (a.getRkNumber()!=null){
                byId.setRkNumber(a.getRkNumber());
        }
        this.updateById(byId);
    }

    }

    @Override
    public PageDTO<getVolumeProductionRkgCodeVO> getVolumeProductionRkgCode(VolumeProductionRkgCodeQuery volumeProductionRkgCodeQuery) {
        Page<SlVolumeProductionRk> page = new Page<>(volumeProductionRkgCodeQuery.getPageCurr(), volumeProductionRkgCodeQuery.getPageSize());

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

@@ -96,12 +96,15 @@
    }

    @Override
    public void updSlVolumeProductionZy(UpdaddSlVolumeProductionZyDTO updaddSlVolumeProductionZyDTO) {
        SlVolumeProductionZy byId = this.getById(updaddSlVolumeProductionZyDTO.getId());
        byId.setZyNum(updaddSlVolumeProductionZyDTO.getZyNum());
    public void updSlVolumeProductionZy(List<UpdaddSlVolumeProductionZyDTO> updaddSlVolumeProductionZyDTO) {
        for (UpdaddSlVolumeProductionZyDTO z:updaddSlVolumeProductionZyDTO){
            SlVolumeProductionZy byId = this.getById(z.getId());
            byId.setZyNum(z.getZyNum());
        this.updateById(byId);
    }

    }

    @Override
    public PageDTO<ManagementimgVolumeProductionZyVO> getSlVolumeProductionZyList(ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery) {