From 1b1f8011322270f36e1e956134bb92461021b1d5 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 02 七月 2024 11:42:54 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java | 6 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsMaterials.java | 19 ---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentDTO.java | 27 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentQuery.java | 17 ++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java | 46 +++++++
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java | 8 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlEquipmentService.java | 9 +
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 41 +++++-
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java | 89 ++++++++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlEquipmentVO.java | 58 +++++++++
10 files changed, 290 insertions(+), 30 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
index 5a4ae2b..f14d76d 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/SysUser.java
@@ -149,34 +149,42 @@
/** 所属省名称 */
@TableField("province_name")
+ @ApiModelProperty(value = "所属省名称")
private String provinceName;
/** 所属省code */
@TableField("province_code")
+ @ApiModelProperty(value = "所属省code")
private String provinceCode;
/** 城市名称 */
@TableField("city_name")
+ @ApiModelProperty(value = "城市名称")
private String cityName;
/** 城市code */
@TableField("city_code")
+ @ApiModelProperty(value = "城市code")
private String cityCode;
/** 所属区县名称 */
@TableField("county_name")
+ @ApiModelProperty(value = "county_name")
private String countyName;
/** 所属区县code */
@TableField("county_code")
+ @ApiModelProperty(value = "county_code")
private String countyCode;
/** 所属街道名称 */
@TableField("town_name")
+ @ApiModelProperty(value = "town_name")
private String townName;
/** 所属街道code */
@TableField("town_code")
+ @ApiModelProperty(value = "town_code")
private String townCode;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
index 09c1d82..1fdd5c6 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlEquipmentController.java
@@ -1,10 +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.dto.InventoriesSuppDTO;
+import com.ruoyi.management.domain.dto.InventoriesSuppliesQuery;
+import com.ruoyi.management.domain.dto.SlEquipmentDTO;
+import com.ruoyi.management.domain.dto.SlEquipmentQuery;
+import com.ruoyi.management.domain.vo.InventoriesSuppliesVO;
+import com.ruoyi.management.domain.vo.SlEquipmentVO;
+import com.ruoyi.management.service.InventoriesSuppliesService;
+import com.ruoyi.management.service.SlEquipmentService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
+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>
@@ -19,4 +31,34 @@
@Api(value = "设备管理接口", tags = "设备管理接口", description = "设备管理接口")
public class SlEquipmentController {
+ @Resource
+ private SlEquipmentService slEquipmentService;
+ @PostMapping("/getSlEquipmentList")
+ @ApiOperation(value = "分页获设备管理")
+ public R<PageDTO<SlEquipmentVO>> getSlEquipmentList(@RequestBody SlEquipmentQuery slEquipmentQuery) {
+ return R.ok(slEquipmentService.getSlEquipmentList(slEquipmentQuery));
+ }
+
+ @PostMapping("/addSlEquipment")
+ @ApiOperation(value = "添加设备管理")
+ public R addSlEquipment(@RequestBody SlEquipmentDTO slEquipmentDTO) {
+ slEquipmentService.addSlEquipment(slEquipmentDTO);
+ return R.ok();
+ }
+
+ @ApiOperation("删除设备管理")
+ @DeleteMapping("/{id}")
+ public R<?> delSlEquipment(
+ @ApiParam(name = "id", value = "设备管理id", required = true) @PathVariable("id") Integer id) {
+ slEquipmentService.removeById(id);
+ return R.ok();
+ }
+
+ @PostMapping("/getSlEquipmentOne")
+ @ApiOperation(value = "设备管理详情")
+ public R<SlEquipmentVO> getSlEquipmentOne(@RequestBody SlEquipmentDTO slEquipmentDTO) {
+ return R.ok(slEquipmentService.getSlEquipmentOne(slEquipmentDTO));
+ }
+
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsMaterials.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsMaterials.java
index e5b3570..b7a3ce8 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsMaterials.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/SlGoodsMaterials.java
@@ -59,25 +59,6 @@
@TableField("update_time")
private Date updateTime;
- @ApiModelProperty("库存总数")
- @TableField("repertory_sum")
- private Integer repertorySum;
-
- @ApiModelProperty("在库存的")
- @TableField("repertory_zhai")
- private Integer repertoryZhai;
-
- @ApiModelProperty("出库存的")
- @TableField("repertory_chu")
- private Integer repertoryChu;
-
- @ApiModelProperty("遗失库存的")
- @TableField("repertory_yishi")
- private Integer repertoryYishi;
-
- @ApiModelProperty("盘点数量")
- @TableField("check_num")
- private Integer checkNum;
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentDTO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentDTO.java
new file mode 100644
index 0000000..416e00e
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentDTO.java
@@ -0,0 +1,27 @@
+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 SlEquipmentDTO {
+
+ private Long id;
+
+ @ApiModelProperty("设备名称")
+ private String equipmentName;
+
+ @ApiModelProperty("设备编号")
+ private String equipmentNum;
+
+ @ApiModelProperty("1 屏幕设备，2 扫描设备")
+ private Integer type;
+
+ @ApiModelProperty("仓库ID")
+ private Long managementId;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentQuery.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentQuery.java
new file mode 100644
index 0000000..2d9dcb0
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/dto/SlEquipmentQuery.java
@@ -0,0 +1,17 @@
+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 SlEquipmentQuery extends BasePage {
+ @ApiModelProperty("设备名称")
+ private String equipmentName;
+
+ @ApiModelProperty("1 屏幕设备，2 扫描设备，3 打印机")
+ private Integer type;
+
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlEquipmentVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlEquipmentVO.java
new file mode 100644
index 0000000..64ff117
--- /dev/null
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/SlEquipmentVO.java
@@ -0,0 +1,58 @@
+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.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "设备管理视图对象", description = "设备管理视图对象")
+public class SlEquipmentVO {
+
+ private Long id;
+
+ @ApiModelProperty("设备名称")
+ private String equipmentName;
+
+ @ApiModelProperty("设备编号")
+ private String equipmentNum;
+
+ @ApiModelProperty("1 屏幕设备，2 扫描设备，3 打印机")
+ private Integer type;
+
+ @ApiModelProperty("仓库ID")
+ private Long managementId;
+
+ @ApiModelProperty("仓库名称")
+ private String storeManagementName;
+
+ /** 所属省名称 */
+ @ApiModelProperty("所属省名称")
+ private String provinceName;
+
+ @ApiModelProperty("所属省code")
+ private String provinceCode;
+
+ @ApiModelProperty("城市名称")
+ private String cityName;
+
+ @ApiModelProperty("城市code")
+ private String cityCode;
+
+ @ApiModelProperty("所属区县名称")
+ private String countyName;
+
+ /** 所属区县code */
+ @ApiModelProperty("所属区县code")
+ private String countyCode;
+
+ /** 所属街道名称 */
+ @ApiModelProperty("所属街道名称")
+ private String townName;
+
+ /** 所属街道code */
+ @ApiModelProperty("所属街道code")
+ private String townCode;
+}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java
index 58108d9..23eb47a 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/StoreManagementGoodSmaterialsVO.java
@@ -35,4 +35,10 @@
@ApiModelProperty("均价")
private Double averagePrice;
+ @ApiModelProperty("仓库ID")
+ private Long managementId;
+
+ @ApiModelProperty("物资ID")
+ private Long goodsMaterialsId;
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlEquipmentService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlEquipmentService.java
index 64936d0..1b43151 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlEquipmentService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlEquipmentService.java
@@ -1,7 +1,12 @@
package com.ruoyi.management.service;
+import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.SlEquipment;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.management.domain.dto.SlEquipmentDTO;
+import com.ruoyi.management.domain.dto.SlEquipmentQuery;
+import com.ruoyi.management.domain.vo.SlEquipmentVO;
+import org.springframework.web.bind.annotation.RequestBody;
/**
* <p>
@@ -12,5 +17,9 @@
* @since 2024-06-25
*/
public interface SlEquipmentService extends IService<SlEquipment> {
+ PageDTO<SlEquipmentVO> getSlEquipmentList(@RequestBody SlEquipmentQuery slEquipmentQuery);
+ void addSlEquipment(@RequestBody SlEquipmentDTO slEquipmentDTO);
+
+ SlEquipmentVO getSlEquipmentOne(@RequestBody SlEquipmentDTO slEquipmentDTO);
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
index 6a7f66a..f765094 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -1,10 +1,24 @@
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.SlEquipment;
+import com.ruoyi.management.domain.SlGoodsMaterials;
+import com.ruoyi.management.domain.SlStoreManagement;
+import com.ruoyi.management.domain.dto.SlEquipmentDTO;
+import com.ruoyi.management.domain.dto.SlEquipmentQuery;
+import com.ruoyi.management.domain.vo.SlEquipmentVO;
+import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.mapper.SlEquipmentMapper;
+import com.ruoyi.management.mapper.SlStoreManagementMapper;
import com.ruoyi.management.service.SlEquipmentService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -17,4 +31,79 @@
@Service
public class SlEquipmentServiceImpl extends ServiceImpl<SlEquipmentMapper, SlEquipment> implements SlEquipmentService {
+ @Resource
+ private SlStoreManagementMapper slStoreManagementMapper;
+
+ @Override
+ public PageDTO<SlEquipmentVO> getSlEquipmentList(SlEquipmentQuery slEquipmentQuery) {
+ Page<SlEquipment> page = new Page<>(slEquipmentQuery.getPageCurr(), slEquipmentQuery.getPageSize());
+ LambdaQueryWrapper< SlEquipment> wrapper= Wrappers.lambdaQuery();
+ wrapper.eq(SlEquipment::getEquipmentName,slEquipmentQuery.getEquipmentName());
+ wrapper.eq(SlEquipment::getType,slEquipmentQuery.getType());
+ wrapper.eq( SlEquipment::getDelFlag,0);
+ wrapper.orderByDesc(SlEquipment::getCreateTime);
+ Page<SlEquipment> page1 = this.page(page, wrapper);
+ PageDTO<SlEquipmentVO> slEquipmentVOPageDTO = PageDTO.of(page1, SlEquipmentVO.class);
+ List<SlEquipmentVO> list = slEquipmentVOPageDTO.getList();
+ for (SlEquipmentVO sl:list){
+ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(sl.getManagementId());
+ sl.setCountyCode(slStoreManagement.getCountyCode());
+ sl.setProvinceName(slStoreManagement.getProvinceName());
+ sl.setProvinceCode(slStoreManagement.getProvinceCode());
+ sl.setCountyName(slStoreManagement.getCountyName());
+ sl.setCityCode(slStoreManagement.getCityCode());
+ sl.setCityName(slStoreManagement.getCityName());
+ sl.setTownName(slStoreManagement.getTownName());
+ sl.setTownCode(slStoreManagement.getTownCode());
+ }
+ return slEquipmentVOPageDTO;
+ }
+
+ @Override
+ public void addSlEquipment(SlEquipmentDTO slEquipmentDTO) {
+ if (slEquipmentDTO.getId()==null){
+ SlEquipment slEquipment=new SlEquipment();
+ slEquipment.setEquipmentName(slEquipmentDTO.getEquipmentName());
+ slEquipment.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
+ slEquipment.setType(slEquipmentDTO.getType());
+ slEquipment.setManagementId(slEquipmentDTO.getManagementId());
+ }else{
+ SlEquipment byId = this.getById(slEquipmentDTO.getId());
+ if (slEquipmentDTO.getEquipmentName()!=null){
+ byId.setEquipmentName(slEquipmentDTO.getEquipmentName());
+ }
+ if (slEquipmentDTO.getEquipmentNum()!=null){
+ byId.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
+ }
+ if (slEquipmentDTO.getType()!=null){
+ byId.setType(slEquipmentDTO.getType());
+ }
+ if (slEquipmentDTO.getManagementId()!=null){
+ byId.setManagementId(slEquipmentDTO.getManagementId());
+ }
+ this.updateById(byId);
+ }
+ }
+
+ @Override
+ public SlEquipmentVO getSlEquipmentOne(SlEquipmentDTO slEquipmentDTO) {
+ SlEquipment byId = this.getById(slEquipmentDTO.getId());
+ SlEquipmentVO slEquipmentVO=new SlEquipmentVO();
+ slEquipmentVO.setEquipmentName(slEquipmentDTO.getEquipmentName());
+ slEquipmentVO.setEquipmentNum(slEquipmentDTO.getEquipmentNum());
+ slEquipmentVO.setType(slEquipmentDTO.getType());
+ slEquipmentVO.setManagementId(slEquipmentDTO.getManagementId());
+
+ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
+ slEquipmentVO.setCountyCode(slStoreManagement.getCountyCode());
+ slEquipmentVO.setProvinceName(slStoreManagement.getProvinceName());
+ slEquipmentVO.setProvinceCode(slStoreManagement.getProvinceCode());
+ slEquipmentVO.setCountyName(slStoreManagement.getCountyName());
+ slEquipmentVO.setCityCode(slStoreManagement.getCityCode());
+ slEquipmentVO.setCityName(slStoreManagement.getCityName());
+ slEquipmentVO.setTownName(slStoreManagement.getTownName());
+ slEquipmentVO.setTownCode(slStoreManagement.getTownCode());
+
+ return slEquipmentVO;
+ }
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
index 144b8b6..a14dfbe 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.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.SlGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
import com.ruoyi.management.domain.SlVolumeProductionRk;
@@ -13,8 +14,10 @@
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.domain.vo.StoreManagementGoodSmaterialsVO;
+import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlGoodsMaterialsMapper;
import com.ruoyi.management.mapper.SlVolumeProductionRkMapper;
+import com.ruoyi.management.service.ManagementGoodsMaterialsService;
import com.ruoyi.management.service.SlGoodsMaterialsService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.management.service.SlVolumeProductionRkService;
@@ -38,6 +41,9 @@
@Resource
private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
+
+ @Resource
+ private ManagementGoodsMaterialsService managementGoodsMaterialsService;
@Override
@@ -85,22 +91,39 @@
slVolumeProductionIdList = slVolumeProductionRks.stream().map(SlVolumeProductionRk::getMaterialsId)
.collect(Collectors.toSet());
- Page<SlGoodsMaterials> page = new Page<>(storeManagementGoodSmaterialsQuery.getPageCurr(), storeManagementGoodSmaterialsQuery.getPageSize());
- LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,storeManagementGoodSmaterialsQuery.getGoodsMaterialsName());
+ LambdaQueryWrapper< SlGoodsMaterials> wrapper1 =Wrappers.lambdaQuery();
if (storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
- wrapper.eq(SlGoodsMaterials::getIsConsume,storeManagementGoodSmaterialsQuery.getIsConsume());
+ wrapper1.eq(SlGoodsMaterials::getIsConsume,storeManagementGoodSmaterialsQuery.getIsConsume());
}
+ if (storeManagementGoodSmaterialsQuery.getGoodsMaterialsName()!=null){
+ wrapper1.like(SlGoodsMaterials::getGoodsMaterialsName,storeManagementGoodSmaterialsQuery.getGoodsMaterialsName());
+ }
+ List<SlGoodsMaterials> list1 = this.list(wrapper1);
+
+ Set<Long> SlGoodsMaterialsList = null;
+ SlGoodsMaterialsList = list1.stream().map(SlGoodsMaterials::getId)
+ .collect(Collectors.toSet());
+
+
+ Page<ManagementGoodsMaterials> page = new Page<>(storeManagementGoodSmaterialsQuery.getPageCurr(), storeManagementGoodSmaterialsQuery.getPageSize());
+ LambdaQueryWrapper< ManagementGoodsMaterials> wrapper= Wrappers.lambdaQuery();
+
if (slVolumeProductionIdList.size()>0){
- wrapper.in(SlGoodsMaterials::getId,slVolumeProductionIdList);
+ wrapper.in(ManagementGoodsMaterials::getManagementId,slVolumeProductionIdList);
}
- wrapper.eq( SlGoodsMaterials::getDelFlag,0);
- wrapper.orderByDesc(SlGoodsMaterials::getCreateTime);
- Page<SlGoodsMaterials> page1 = this.page(page, wrapper);
+ if (SlGoodsMaterialsList.size()>0){
+ wrapper.in(ManagementGoodsMaterials::getGoodsMaterialsId,SlGoodsMaterialsList);
+ }
+ wrapper.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper.orderByDesc(ManagementGoodsMaterials::getCreateTime);
+ Page<ManagementGoodsMaterials> page1 = managementGoodsMaterialsService.page(page, wrapper);
PageDTO<StoreManagementGoodSmaterialsVO> storeManagementGoodSmaterialsVOPageDTO = PageDTO.of(page1, StoreManagementGoodSmaterialsVO.class);
List<StoreManagementGoodSmaterialsVO> list = storeManagementGoodSmaterialsVOPageDTO.getList();
for (StoreManagementGoodSmaterialsVO li:list){
- Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(li.getId());
+ Double storeManagementGoodSmaterialsOne = slVolumeProductionRkMapper.getStoreManagementGoodSmaterialsOne(li.getGoodsMaterialsId());
+ SlGoodsMaterials byId = this.getById(li.getGoodsMaterialsId());
+ li.setGoodsMaterialsName(byId.getGoodsMaterialsName());
+ li.setIsConsume(byId.getIsConsume());
li.setAveragePrice(storeManagementGoodSmaterialsOne);
}
--
Gitblit v1.7.1