森林防火 的仓库管理和货架管理

rentaiming

2024-06-27 c428ffeeafc8164066a19b0f0b7c63df86d0fe45

森林防火 的仓库管理和货架管理

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

@@ -1,9 +1,22 @@
package com.ruoyi.management.controller;


import org.springframework.web.bind.annotation.RequestMapping;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsDTO;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery;
import com.ruoyi.management.domain.dto.SlGoodsShelfDTO;
import com.ruoyi.management.domain.dto.SlGoodsShelfQuery;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.service.SlGoodsMaterialsService;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.springframework.web.bind.annotation.*;

import org.springframework.web.bind.annotation.RestController;
import javax.annotation.Resource;

/**
 * <p>
@@ -16,5 +29,34 @@
@RestController
@RequestMapping("/sl-goods-materials")
public class SlGoodsMaterialsController {
    @Resource
    private SlGoodsMaterialsService slGoodsMaterialsService;

    @PostMapping("/getGoodSmaterialsList")
    @ApiOperation(value = "分页获物资管理")
    public R<PageDTO<SlGoodsMaterialsVO>> getGoodSmaterialsList(@RequestBody SlGoodsMaterialsQuery slGoodsMaterialsQuery) {
        return R.ok(slGoodsMaterialsService.getGoodSmaterialsList(slGoodsMaterialsQuery));
    }

    @PostMapping("/addGoodSmaterials")
    @ApiOperation(value = "添加/修改物资管理")
    public R addSlGoodsShelf(@RequestBody SlGoodsMaterialsDTO slGoodsMaterialsDTO) {
        slGoodsMaterialsService.addSlGoodsShelf(slGoodsMaterialsDTO);
        return R.ok();
    }

    @ApiOperation("删除物资管理")
    @DeleteMapping("/{id}")
    public R<?> delStoreManagement(
            @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Integer id) {
        slGoodsMaterialsService.removeById(id);
        return R.ok();
    }

    @PostMapping("/getGoodSmaterialsOne")
    @ApiOperation(value = "物资管理詳情")
    public R<SlGoodsMaterials> getGoodSmaterialsOne(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Integer id) {
        return R.ok(slGoodsMaterialsService.getById(id));
    }

}

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

@@ -1,9 +1,22 @@
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.SlVolumeProductionRkgl;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery;
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.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 javax.annotation.Resource;

/**
 * <p>
@@ -17,4 +30,14 @@
@RequestMapping("/sl-volume-production-rkgl")
public class SlVolumeProductionRkglController {

    @Resource
    private SlVolumeProductionRkglService slVolumeProductionRkglService;


    @PostMapping("/getSupplierVolumeProductionRkglList")
    @ApiOperation(value = "分页获取供应商关联入库")
    public R<PageDTO<SupplierVolumeProductionRkglVO>> getSupplierVolumeProductionRkglList(@RequestBody SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) {
        return R.ok(slVolumeProductionRkglService.getSupplierVolumeProductionRkglList(supplierVolumeProductionRkglQuery));
    }

}

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

@@ -73,22 +73,4 @@
    private Date updateTime;



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

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

    @ApiModelProperty("备注")
    @TableField("remark")
    private String remark;

    @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过")
    @TableField("state")
    private Integer state;


}

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

@@ -75,4 +75,17 @@
    @TableField("supplier_id")
    private Integer supplierId;

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

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

    @ApiModelProperty("备注")
    @TableField("remark")
    private String remark;


}

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

New file
@@ -0,0 +1,23 @@
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 io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("物资管理数据传输对象")
public class SlGoodsMaterialsDTO {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @ApiModelProperty("物资名称")
    private String goodsMaterialsName;

    @ApiModelProperty("1 是非消耗，2是消耗 ")
    private Integer isConsume;

    @ApiModelProperty("预警库存")
    private Integer repertory;
}

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

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

import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("物资数据查询传输对象")
public class SlGoodsMaterialsQuery extends BasePage {
    @ApiModelProperty("物资名称")
    private String goodsMaterialsName;

    @ApiModelProperty("1 是非消耗，2是消耗 ")
    private Integer isConsume;
}

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

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

import com.baomidou.mybatisplus.annotation.TableField;
import com.ruoyi.common.core.web.page.BasePage;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel("供应商关联入库数据查询传输对象")
public class SupplierVolumeProductionRkglQuery extends BasePage {
    @ApiModelProperty("供应商id")
    private Integer supplierId;
}

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

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

import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

@Data
@ApiModel(value = "物资视图对象", description = "物视图对象")
public class SlGoodsMaterialsVO {
    @TableId(value = "id", type = IdType.AUTO)
    private Integer id;
    @ApiModelProperty("物资名称")
    private String goodsMaterialsName;

    @ApiModelProperty("1 是非消耗，2是消耗 ")
    private Integer isConsume;

    @ApiModelProperty("预警库存")
    private Integer repertory;
}

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

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

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 SupplierVolumeProductionRkglVO {
    @ApiModelProperty("用户名称")
    private String nickName;

    @ApiModelProperty(name = "手机号码")
    private String phonenumber;

    @TableId("id")
    private Integer id;

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

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

    @ApiModelProperty("供应商id")
    private Integer supplierId;

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


}

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

@@ -1,7 +1,13 @@
package com.ruoyi.management.service;

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsMaterials;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsDTO;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * <p>
@@ -13,4 +19,8 @@
 */
public interface SlGoodsMaterialsService extends IService<SlGoodsMaterials> {

    void addSlGoodsShelf(@RequestBody SlGoodsMaterialsDTO slGoodsMaterialsDTO);

    PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(@RequestBody SlGoodsMaterialsQuery slGoodsMaterialsQuery);

}

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

@@ -1,7 +1,11 @@
package com.ruoyi.management.service;

import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
import com.ruoyi.management.domain.vo.SupplierVolumeProductionRkglVO;
import org.springframework.web.bind.annotation.RequestBody;

/**
 * <p>
@@ -12,5 +16,6 @@
 * @since 2024-06-25
 */
public interface SlVolumeProductionRkglService extends IService<SlVolumeProductionRkgl> {
    PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(@RequestBody SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery);

}

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

@@ -1,6 +1,15 @@
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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsDTO;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsQuery;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
import com.ruoyi.management.service.SlGoodsMaterialsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -17,4 +26,39 @@
@Service
public class SlGoodsMaterialsServiceImpl extends ServiceImpl<SlGoodsMaterialsMapper, SlGoodsMaterials> implements SlGoodsMaterialsService {

    @Override
    public void addSlGoodsShelf(SlGoodsMaterialsDTO slGoodsMaterialsDTO) {
        if(slGoodsMaterialsDTO.getId()==null){
            SlGoodsMaterials slGoodsMaterials=new  SlGoodsMaterials();
            slGoodsMaterials.setGoodsMaterialsName(slGoodsMaterialsDTO.getGoodsMaterialsName());
            slGoodsMaterials.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
            slGoodsMaterials.setRepertory(slGoodsMaterialsDTO.getRepertory());
        }else{
            SlGoodsMaterials byId = this.getById(slGoodsMaterialsDTO.getId());
            if (slGoodsMaterialsDTO.getGoodsMaterialsName()!=null){
                byId.setGoodsMaterialsName(slGoodsMaterialsDTO.getGoodsMaterialsName());
            }
            if (slGoodsMaterialsDTO.getRepertory()!=null){
                byId.setRepertory(slGoodsMaterialsDTO.getRepertory());
            }
            if (slGoodsMaterialsDTO.getIsConsume()!=null){
                byId.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
            }
            this.updateById(byId);
        }
    }

    @Override
    public PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(SlGoodsMaterialsQuery slGoodsMaterialsQuery) {
        Page<SlGoodsMaterials> page = new Page<>(slGoodsMaterialsQuery.getPageCurr(), slGoodsMaterialsQuery.getPageSize());
        LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
        wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
        if (slGoodsMaterialsQuery.getIsConsume()!=0){
            wrapper.eq(SlGoodsMaterials::getIsConsume,slGoodsMaterialsQuery.getIsConsume());
        }
        wrapper.eq( SlGoodsMaterials::getDelFlag,0);
        wrapper.orderByDesc(SlGoodsMaterials::getCreateTime);
        Page<SlGoodsMaterials> page1 = this.page(page, wrapper);
        return PageDTO.of(page1,SlGoodsMaterialsVO.class);
    }
}

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

@@ -1,10 +1,25 @@
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.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlGoodsShelf;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionRkgl;
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.mapper.SlStoreManagementMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkglMapper;
import com.ruoyi.management.service.SlVolumeProductionRkglService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.system.api.domain.SysUser;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;

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

/**
 * <p>
@@ -17,4 +32,31 @@
@Service
public class SlVolumeProductionRkglServiceImpl extends ServiceImpl<SlVolumeProductionRkglMapper, SlVolumeProductionRkgl> implements SlVolumeProductionRkglService {


    @Resource
    private SysUserClient sysUserClient;

    @Resource
    private SlStoreManagementMapper slStoreManagementMapper;

    @Override
    public PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery) {
        Page<SlVolumeProductionRkgl> page = new Page<>(supplierVolumeProductionRkglQuery.getPageCurr(), supplierVolumeProductionRkglQuery.getPageSize());
        LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery();
        wrapper1.like(SlVolumeProductionRkgl::getSupplierId,supplierVolumeProductionRkglQuery.getSupplierId());
        wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
        wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
        Page<SlVolumeProductionRkgl> page2 = this.page(page, wrapper1);

        PageDTO<SupplierVolumeProductionRkglVO> SlGoodsShelfDTO = PageDTO.of(page2, SupplierVolumeProductionRkglVO.class);
        List<SupplierVolumeProductionRkglVO> list2 = SlGoodsShelfDTO.getList();
        for(SupplierVolumeProductionRkglVO list:list2){
            SysUser data = sysUserClient.getSysUser(Long.valueOf(list.getSupplierId())).getData();
            list.setNickName(data.getNickName());
            list.setPhonenumber(data.getPhonenumber());
            SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
            list.setStoreManagementName(slStoreManagement.getStoreManagementName());
        }
        return SlGoodsShelfDTO;
    }
}

 ruoyi-modules/ruoyi-management/src/main/resources/mapper/management/SlRegionMapper.xml

@@ -3,7 +3,7 @@
<mapper namespace="com.rouyi.management.mapper.SlRegionMapper">

    <!-- 通用查询映射结果 -->
    <resultMap id="BaseResultMap" type="com.rouyi.management.domain.SlRegion">
    <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.SlRegion">
        <id column="id" property="id" />
        <result column="name" property="name" />
        <result column="code" property="code" />
@@ -15,7 +15,7 @@
        <result column="all_name" property="allName" />
    </resultMap>

    <select id="listRegionVo" resultType="com.ruoyi.member.domain.vo.RegionVo">
    <select id="listRegionVo" resultType="com.ruoyi.management.domain.vo.RegionVo">
        SELECT tr.id id, tr.parent_id parentId, tr.level level, tr.code value, tr.name label
        FROM t_region tr
    </select>