From 069153106a8ce1d7a7c1d5b48c07b849fd65971f Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期四, 04 七月 2024 18:08:56 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/getVolumeProductionRkQuery.java | 23 +++++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java | 6 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java | 10 ++-
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java | 8 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java | 9 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java | 9 +-
ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml | 19 ++++++
ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml | 20 ++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java | 8 --
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 40 ++++++++++++-
11 files changed, 135 insertions(+), 19 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/getVolumeProductionRkQuery.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/getVolumeProductionRkQuery.java
new file mode 100644
index 0000000..63e13e3
--- /dev/null
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/getVolumeProductionRkQuery.java
@@ -0,0 +1,23 @@
+package com.ruoyi.system.api.domain;
+
+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 getVolumeProductionRkQuery extends BasePage {
+
+ @ApiModelProperty("供应商名称")
+ private String supplierName;
+
+ @ApiModelProperty("供应商电话")
+ private String supplierPhone;
+
+ @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
+ private Integer presentState;
+
+ @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
+ private Integer auditStatus;
+}
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
index 5aaf479..a0622da 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/feignClient/SysUserClient.java
@@ -6,6 +6,7 @@
import com.ruoyi.system.api.domain.DelayTask;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import com.ruoyi.system.api.factory.SysUserFallbackFactory;
import java.util.List;
import org.springframework.cloud.openfeign.FeignClient;
@@ -24,6 +25,11 @@
@PostMapping("/user/updateSysUser")
R<Boolean> updateSysUser(@RequestBody SysUser sysUser);
+
+
+ @PostMapping("/user/getUserSupplierList")
+ R<List<SysUser>> getUserSupplierList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery);
+
@PostMapping("/user/getUserList")
R<List<SysUser>> getUserList(@RequestBody List<Integer> userIds);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
index ee819dc..1887920 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkController.java
@@ -3,11 +3,9 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
-import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionRkQuery;
import com.ruoyi.management.domain.dto.SlGoodsMaterialsSlVolumeProductionRkQuery;
import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
import com.ruoyi.management.service.SlVolumeProductionRkService;
-import com.ruoyi.management.service.SlVolumeProductionRkglService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.web.bind.annotation.PostMapping;
@@ -32,11 +30,7 @@
public class SlVolumeProductionRkController {
@Resource
private SlVolumeProductionRkService slVolumeProductionRkService;
- @PostMapping("/getManagementimgVolumeProductionList")
- @ApiOperation(value = "分页获取通过入库管理来获取当前批次入库的物资")
- public R<PageDTO<ManagementimgVolumeProductionRkVO>> getManagementimgVolumeProductionList(@RequestBody ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
- return R.ok(slVolumeProductionRkService.getManagementimgVolumeProductionList(managementimgVolumeProductionRkDTO));
- }
+
@PostMapping("/getSlGoodsMaterialsSlVolumeProductionRkList")
@ApiOperation(value = "分页获取通过物资来获取当前批次入库的物资")
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
index c9e053e..7248ca7 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
@@ -3,13 +3,11 @@
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.domain.vo.VolumeProductionRkgInfoVO;
import com.ruoyi.management.service.SlVolumeProductionRkglService;
+import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
@@ -46,4 +44,10 @@
return R.ok(slVolumeProductionRkglService.getVolumeProductionRkgInfo(id));
}
+ @PostMapping("/getslVolumeProductionRkglList")
+ @ApiOperation(value = "分页获取入库管理")
+ public R<PageDTO<SupplierVolumeProductionRkglVO>> getslVolumeProductionRkglList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
+ return R.ok(slVolumeProductionRkglService.getslVolumeProductionRkglList(getVolumeProductionRkQuery));
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
index ec696d4..a862d67 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SupplierVolumeProductionRkglVO.java
@@ -3,11 +3,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.fasterxml.jackson.annotation.JsonInclude;
+import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.util.Date;
@Data
+@ApiModel(value = "仓库管理入库", description = "仓库管理入库")
public class SupplierVolumeProductionRkglVO {
@ApiModelProperty("用户名称")
@JsonInclude(JsonInclude.Include.ALWAYS)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
index 043e598..18ff39d 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/VolumeProductionRkgInfoVO.java
@@ -3,11 +3,13 @@
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;
import java.util.Date;
@Data
+@ApiModel(value = "仓库管理", description = "仓库管理")
public class VolumeProductionRkgInfoVO {
private Long id;
@@ -24,15 +26,18 @@
@ApiModelProperty("结束时间")
private Date endTime;
- @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过")
+ @ApiModelProperty("1.待审核，2 已拒绝，3 审核通过，4 已完成，5 已取消")
private Integer presentState;
- @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 已通过，5 已拒绝")
+ @ApiModelProperty("1 待管理员审核，2 待主管审核，3 待主任审核，4 待入库，5 待从重新提交， 6已完成， 7，已取消")
private Integer auditStatus;
@ApiModelProperty("供应商名称")
private String supplierName;
+ @ApiModelProperty("供应商电话")
+ private String supplierPhone;
+
@ApiModelProperty("附件")
private String attachmentUrl;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
index 7c4b0bf..b1b3509 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
@@ -6,9 +6,7 @@
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;
+import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
/**
* <p>
@@ -19,6 +17,9 @@
* @since 2024-06-25
*/
public interface SlVolumeProductionRkglService extends IService<SlVolumeProductionRkgl> {
- PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList(@RequestBody SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery);
+ PageDTO<SupplierVolumeProductionRkglVO> getSupplierVolumeProductionRkglList( SupplierVolumeProductionRkglQuery supplierVolumeProductionRkglQuery);
VolumeProductionRkgInfoVO getVolumeProductionRkgInfo(Integer id);
+
+ PageDTO<SupplierVolumeProductionRkglVO> getslVolumeProductionRkglList( getVolumeProductionRkQuery getVolumeProductionRkQuery) ;
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index d0e4191..b67c136 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -5,11 +5,9 @@
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;
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.domain.vo.VolumeProductionRkgInfoVO;
import com.ruoyi.management.mapper.SlStoreManagementMapper;
@@ -17,11 +15,14 @@
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.domain.getVolumeProductionRkQuery;
import com.ruoyi.system.api.feignClient.SysUserClient;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
/**
* <p>
@@ -45,7 +46,7 @@
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::getSupplierId,supplierVolumeProductionRkglQuery.getSupplierId());
wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
Page<SlVolumeProductionRkgl> page2 = this.page(page, wrapper1);
@@ -74,4 +75,37 @@
v.setSysName(data1.getNickName());
return v;
}
+
+ @Override
+ public PageDTO<SupplierVolumeProductionRkglVO> getslVolumeProductionRkglList(getVolumeProductionRkQuery getVolumeProductionRkQuery) {
+ Page<SlVolumeProductionRkgl> page = new Page<>(getVolumeProductionRkQuery.getPageCurr(), getVolumeProductionRkQuery.getPageSize());
+
+ List<SysUser> data1 = sysUserClient.getUserSupplierList(getVolumeProductionRkQuery).getData();
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = data1.stream().map(SysUser::getUserId)
+ .collect(Collectors.toSet());
+
+ LambdaQueryWrapper< SlVolumeProductionRkgl> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
+ wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus,getVolumeProductionRkQuery.getAuditStatus());
+ if (goodsSkuIdList.size()>0){
+ wrapper1.in(SlVolumeProductionRkgl::getSupplierId,goodsSkuIdList);
+ }
+ 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(list.getSupplierId()).getData();
+ list.setNickName(data.getNickName());
+ list.setPhonenumber(data.getPhonenumber());
+ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(list.getManagementId());
+ list.setStoreManagementName(slStoreManagement.getStoreManagementName());
+ }
+ return SlGoodsShelfDTO;
+ }
+
+
}
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml
new file mode 100644
index 0000000..3976f0a
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesInfoMapper.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rouyi.management.mapper.InventoriesSuppliesInfoMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.InventoriesSuppliesInfo">
+ <id column="id" property="id" />
+ <result column="supplies_id" property="suppliesId" />
+ <result column="rk_id" property="rkId" />
+ <result column="supplies_num" property="suppliesNum" />
+ <result column="zk_num" property="zkNum" />
+ <result column="del_flag" property="delFlag" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ <result column="type" property="type" />
+ </resultMap>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml
new file mode 100644
index 0000000..c28a8d2
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/target/classes/mapper/management/InventoriesSuppliesMapper.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rouyi.management.mapper.InventoriesSuppliesMapper">
+
+ <!-- 通用查询映射结果 -->
+ <resultMap id="BaseResultMap" type="com.ruoyi.management.domain.InventoriesSupplies">
+ <id column="id" property="id" />
+ <result column="materials_id" property="materialsId" />
+ <result column="pdr_id" property="pdrId" />
+ <result column="pd_time" property="pdTime" />
+ <result column="pdr_name" property="pdrName" />
+ <result column="del_flag" property="delFlag" />
+ <result column="create_by" property="createBy" />
+ <result column="create_time" property="createTime" />
+ <result column="update_by" property="updateBy" />
+ <result column="update_time" property="updateTime" />
+ </resultMap>
+
+</mapper>
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
index 4c904ff..02219e6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/SysUserController.java
@@ -19,6 +19,7 @@
import com.ruoyi.system.api.domain.SysDept;
import com.ruoyi.system.api.domain.SysRole;
import com.ruoyi.system.api.domain.SysUser;
+import com.ruoyi.system.api.domain.getVolumeProductionRkQuery;
import com.ruoyi.system.api.model.LoginUser;
import com.ruoyi.system.api.validate.InsertGroup;
import com.ruoyi.system.api.validate.UpdateGroup;
@@ -257,6 +258,12 @@
}
}
+ @PostMapping("/getUserSupplierList")
+ public R<List<SysUser>> getUserSupplierList(@RequestBody getVolumeProductionRkQuery getVolumeProductionRkQuery) {
+ List<SysUser> list = userService.list(new LambdaQueryWrapper<SysUser>().like(SysUser::getNickName, getVolumeProductionRkQuery.getSupplierName()).like(SysUser::getPhonenumber,getVolumeProductionRkQuery.getSupplierPhone()));
+ return R.ok(list);
+ }
+
@PostMapping("/updateSysUser")
public R<Boolean> updateSysUser(@RequestBody SysUser sysUser) {
try {
@@ -270,6 +277,7 @@
}
}
+
@Log(title = "用户管理", businessType = BusinessType.EXPORT)
@RequiresPermissions("system:user:export")
@PostMapping("/export")
--
Gitblit v1.7.1