From 2bf3546b11ba12cd371a4255dbc5a7705d18c75a Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 26 七月 2024 09:04:21 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 124 ++++++++++++++++++++++++++++++++--------
1 files changed, 98 insertions(+), 26 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
index 16c9e66..3d6fc4f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java
@@ -47,6 +47,10 @@
@Resource
private SysUserClient sysUserClient;
+
+
+
+
@Override
public PageDTO<ManagementimgVolumeProductionRkVO> getManagementimgVolumeProductionList(ManagementimgVolumeProductionRkQuery managementimgVolumeProductionRkDTO) {
@@ -100,38 +104,57 @@
}
@Override
- public void addVolumeProductionRkgl(SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
- List<Long> materialsId = slVolumeProductionRkListDTO.getMaterialsId();
- for (Long m:materialsId){
+ public void addVolumeProductionRkgl(List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO) {
+
+ for (SlVolumeProductionRkListDTO m:slVolumeProductionRkListDTO){
SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
- slVolumeProductionRk.setVolumeProductionRkglId(slVolumeProductionRkListDTO.getVolumeProductionRkglId());
- slVolumeProductionRk.setMaterialsId(m);
- slVolumeProductionRk.setManagementId(slVolumeProductionRkListDTO.getManagementId());
+ slVolumeProductionRk.setVolumeProductionRkglId(m.getVolumeProductionRkglId());
+ slVolumeProductionRk.setMaterialsId(m.getMaterialsId());
+ slVolumeProductionRk.setManagementId(m.getManagementId());
slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
+ if ( m.getErwmNum()!=null){
+ slVolumeProductionRk.setErwmNum( m.getErwmNum());
+ }if ( m.getRkPice()!=null){
+ slVolumeProductionRk.setRkPice( m.getRkPice());
+ }if ( m.getRkNum()!=null){
+ slVolumeProductionRk.setRkNum( m.getRkNum());
+ }if ( m.getShelfId()!=null){
+ slVolumeProductionRk.setShelfId( m.getShelfId());
+ }if ( m.getRkModel()!=null){
+ slVolumeProductionRk.setRkModel( m.getRkModel());
+ }if ( m.getStoreManagementNumber()!=null){
+ slVolumeProductionRk.setStoreManagementNumber( m.getStoreManagementNumber());
+ }if ( m.getRkNumber()!=null){
+ slVolumeProductionRk.setRkNumber( m.getRkNumber());
+ }
+
this.save(slVolumeProductionRk);
}
}
@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);
}
- this.updateById(byId);
+
}
@Override
@@ -144,17 +167,16 @@
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;
}
@Override
- public ManagementimgVolumeProductionRkVO codeInfo(Integer id) {
+ public ManagementimgVolumeProductionRkVO codeInfo(Long id) {
SlVolumeProductionRk byId = this.getById(id);
ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO();
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
@@ -170,4 +192,54 @@
return vo;
}
+ @Override
+ public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
+
+ LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
+ if (meProductionRkQuery.getGoodsMaterialsName()!=null&&meProductionRkQuery.getGoodsMaterialsName()!=""){
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+ }
+ if (meProductionRkQuery.getIsConsume()!=0){
+ wrapper.eq(SlGoodsMaterials::getIsConsume,meProductionRkQuery.getIsConsume());
+ }
+ wrapper.eq( SlGoodsMaterials::getDelFlag,0);
+ List<SlGoodsMaterials> page1 = slGoodsMaterialsMapper.selectList(wrapper);
+
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = page1.stream().map(SlGoodsMaterials::getId)
+ .collect(Collectors.toSet());
+
+
+ Page<SlVolumeProductionRk> page = new Page<>(meProductionRkQuery.getPageCurr(), meProductionRkQuery.getPageSize());
+ LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+ if(meProductionRkQuery.getManagementId()!=null&&meProductionRkQuery.getManagementId()!=0){
+ wrapper1.eq(SlVolumeProductionRk::getManagementId,meProductionRkQuery.getManagementId());
+ }
+ if (goodsSkuIdList.size()>0){
+ wrapper1.in(SlVolumeProductionRk::getMaterialsId,goodsSkuIdList);
+ }if(meProductionRkQuery.getStoreManagementNumber()!=null&&meProductionRkQuery.getStoreManagementNumber()!=0){
+ wrapper1.eq(SlVolumeProductionRk::getStoreManagementNumber,meProductionRkQuery.getStoreManagementNumber());
+ }if(meProductionRkQuery.getShelfId()!=null&&meProductionRkQuery.getShelfId()!=0){
+ wrapper1.eq(SlVolumeProductionRk::getShelfId,meProductionRkQuery.getShelfId());
+ }
+ wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
+ wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
+ Page<SlVolumeProductionRk> page2 = this.page(page, wrapper1);
+ PageDTO<ManagementimgVolumeProductionRkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgVolumeProductionRkVO.class);
+ List<ManagementimgVolumeProductionRkVO> list2 = SlGoodsShelfDTO.getList();
+ for(ManagementimgVolumeProductionRkVO list:list2) {
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
+
+ SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
+ SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ list.setSupplierName(data.getNickName());
+ SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ }
+ return SlGoodsShelfDTO;
+ }
+
}
--
Gitblit v1.7.1