From 7bbce72b03664f56400fe7e70e8dcd4ea737a8da Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 02 八月 2024 14:19:30 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java | 109 ++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 93 insertions(+), 16 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
index b27f77c..b01513e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionZyglServiceImpl.java
@@ -1,12 +1,14 @@
package com.ruoyi.management.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
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.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.*;
+import com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyQuery;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyDTO;
import com.ruoyi.management.domain.dto.SlVolumeProductionZyQuery;
import com.ruoyi.management.domain.vo.*;
@@ -68,8 +70,13 @@
.collect(Collectors.toSet());
LambdaQueryWrapper< SlVolumeProductionZygl> wrapper1= Wrappers.lambdaQuery();
- wrapper1.eq(SlVolumeProductionZygl::getPresentState,slVolumeProductionZyQuery.getPresentState());
- wrapper1.eq(SlVolumeProductionZygl::getAuditStatus,slVolumeProductionZyQuery.getAuditStatus());
+ if (slVolumeProductionZyQuery.getPresentState()!=null){
+ wrapper1.eq(SlVolumeProductionZygl::getPresentState,slVolumeProductionZyQuery.getPresentState());
+ }
+ if (slVolumeProductionZyQuery.getAuditStatus()!=null){
+ wrapper1.eq(SlVolumeProductionZygl::getAuditStatus,slVolumeProductionZyQuery.getAuditStatus());
+
+ }
if (goodsSkuIdList.size()>0){
wrapper1.in(SlVolumeProductionZygl::getSysId,goodsSkuIdList);
}
@@ -87,15 +94,15 @@
list.setStoreManagementName(slStoreManagement.getStoreManagementName());
SlStoreManagement bslStoreManagement = slStoreManagementMapper.selectById(list.getBmanagementId());
- list.setStoreManagementName(bslStoreManagement.getStoreManagementName());
+ list.setBstoreManagementName(bslStoreManagement.getStoreManagementName());
}
return SlGoodsShelfDTO;
}
@Override
- public void addsVolumeProductionzZygl(SlVolumeProductionZyDTO slVolumeProductionZyDTO) {
+ public String addsVolumeProductionzZygl(SlVolumeProductionZyDTO slVolumeProductionZyDTO) {
Long userid = SecurityUtils.getUserId();
- if (slVolumeProductionZyDTO.getId()!=null){
+ if (slVolumeProductionZyDTO.getId()==null){
SlVolumeProductionZygl slVolumeProductionZygl=new SlVolumeProductionZygl();
slVolumeProductionZygl.setAttachmentUrl(slVolumeProductionZyDTO.getAttachmentUrl());
slVolumeProductionZygl.setAuthorizationUrl(slVolumeProductionZyDTO.getAuthorization());
@@ -106,6 +113,8 @@
slVolumeProductionZygl.setStartiTime(new Date());
slVolumeProductionZygl.setAuditStatus(1);
slVolumeProductionZygl.setPresentState(1);
+ this.save(slVolumeProductionZygl);
+ return slVolumeProductionZygl.getId().toString();
}else {
SlVolumeProductionZygl byId = this.getById(slVolumeProductionZyDTO.getId());
if (slVolumeProductionZyDTO.getSource()!=null){
@@ -118,12 +127,14 @@
byId.setAuthorizationUrl(slVolumeProductionZyDTO.getAuthorization());
}
this.updateById(byId);
+ return slVolumeProductionZyDTO.getId().toString();
}
+
}
@Override
- public VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(Long id) {
- SlVolumeProductionZygl byId = this.getById(id);
+ public VolumeProductionZyglInfoVO getVolumeProductionzZyglnfo(ManagementimgVolumeProductionZyQuery managementimgVolumeProductionZyQuery) {
+ SlVolumeProductionZygl byId = this.getById(managementimgVolumeProductionZyQuery.getVolumeProductionzyglId());
VolumeProductionZyglInfoVO v= BeanUtils.copyBean(byId, VolumeProductionZyglInfoVO.class);
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
v.setStoreManagementName(slStoreManagement.getStoreManagementName());
@@ -132,6 +143,75 @@
SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
v.setSysName(data1.getNickName());
v.setSysPhone(data1.getPhonenumber());
+ // 查询楼层数据
+ SlStoreManagement slStoreManagement1 = slStoreManagementMapper.selectById(byId.getManagementId());
+ List<String> number = new ArrayList<>();
+ for (Integer i = 1; i <= slStoreManagement1.getStoreManagementNumber(); i++) {
+ switch (i){
+ case 1:
+ number.add("一层");
+ break;
+ case 2:
+ number.add("二层");
+ break;
+ case 3:
+ number.add("三层");
+ break;
+ }
+ }
+ v.setNumber(number);
+
+ QueryWrapper<SlGoodsShelf> eq = new QueryWrapper<SlGoodsShelf>()
+ .eq("del_flag", "0")
+ .eq("store_management_id", byId.getManagementId())
+ .eq("store_management_number",managementimgVolumeProductionZyQuery.getStoreManagementNumber());
+ List<SlGoodsShelf> slGoodsShelves = slGoodsShelfMapper.selectList(eq);
+ v.setGoodsShelfList(slGoodsShelves);
+ // 查询物资列表
+ LambdaQueryWrapper<SlVolumeProductionRk> wrapper2= Wrappers.lambdaQuery();
+ wrapper2.eq(SlVolumeProductionRk::getManagementId,byId.getBmanagementId());
+ if (managementimgVolumeProductionZyQuery.getShelfId() == null){
+ managementimgVolumeProductionZyQuery.setShelfId(slGoodsShelves.get(0).getId());
+ }
+ if (managementimgVolumeProductionZyQuery.getStoreManagementNumber()==null){
+ wrapper2.eq(SlVolumeProductionRk::getStoreManagementNumber,1);
+ }
+ wrapper2.eq(SlVolumeProductionRk::getShelfId,managementimgVolumeProductionZyQuery.getShelfId());
+ wrapper2.eq( SlVolumeProductionRk::getDelFlag,0);
+ wrapper2.orderByDesc(SlVolumeProductionRk::getCreateTime);
+ List<SlVolumeProductionRk> page1 = slVolumeProductionRkMapper.selectList(wrapper2);
+
+ Set<Long> goodsSkuIdList = null;
+ goodsSkuIdList = page1.stream().map(SlVolumeProductionRk::getId)
+ .collect(Collectors.toSet());
+ Page<SlVolumeProductionZy> page = new Page<>(managementimgVolumeProductionZyQuery.getPageCurr(), managementimgVolumeProductionZyQuery.getPageSize());
+ LambdaQueryWrapper< SlVolumeProductionZy> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.eq(SlVolumeProductionZy::getZyglId,managementimgVolumeProductionZyQuery.getVolumeProductionzyglId());
+ if (goodsSkuIdList.size()>0&&goodsSkuIdList!=null){
+ wrapper1.in(SlVolumeProductionZy::getScrkId,goodsSkuIdList);
+ }
+ wrapper1.eq( SlVolumeProductionZy::getDelFlag,0);
+ wrapper1.orderByDesc(SlVolumeProductionZy::getCreateTime);
+ Page<SlVolumeProductionZy> page2 = slVolumeProductionZyMapper.selectPage(page, wrapper1);
+ PageDTO<com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO> SlGoodsShelfDTO = PageDTO.of(page2, com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO.class);
+ List<com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO> list2 = SlGoodsShelfDTO.getList();
+ for(com.ruoyi.management.domain.dto.ManagementimgVolumeProductionZyVO list:list2) {
+ SlVolumeProductionRk slVolumeProductionRk = slVolumeProductionRkMapper.selectById(list.getRkId());
+ list.setStoreManagementNumber(slVolumeProductionRk.getStoreManagementNumber());
+ list.setRkNumber(slVolumeProductionRk.getRkNumber());
+ list.setRepertoryZhai(slVolumeProductionRk.getRepertoryZhai());
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(slVolumeProductionRk.getMaterialsId());
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(slVolumeProductionRk.getShelfId());
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ if(list.getScrkId()!=null){
+ SlVolumeProductionRk slVolumeProductionRk1 = slVolumeProductionRkMapper.selectById(list.getScrkId());
+ list.setStoreManagementNumber(slVolumeProductionRk1.getStoreManagementNumber());
+ list.setRkNumber(slVolumeProductionRk1.getRkNumber());
+ }
+ }
+ v.setList(SlGoodsShelfDTO);
return v;
}
@@ -217,21 +297,20 @@
wrapper1.orderByDesc(SlVolumeProductionZy::getCreateTime);
List<SlVolumeProductionZy> page2 = slVolumeProductionZyMapper.selectList(wrapper1);
for (SlVolumeProductionZy zy:page2){
- SlVolumeProductionRk slVolumeProductionRk1 = slVolumeProductionRkMapper.selectById(zy.getRkId());
SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
- slVolumeProductionRk.setMaterialsId(slVolumeProductionRk1.getMaterialsId());
- slVolumeProductionRk.setStoreManagementNumber(slVolumeProductionRk1.getStoreManagementNumber());
+ slVolumeProductionRk.setMaterialsId(zy.getMaterialsId());
+ slVolumeProductionRk.setStoreManagementNumber(zy.getStoreManagementNumber());
slVolumeProductionRk.setManagementId(byId.getBmanagementId());
slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
slVolumeProductionRk.setRkNum(Long.valueOf(zy.getZyNum()));
- slVolumeProductionRk.setShelfId(slVolumeProductionRk1.getShelfId());
+ slVolumeProductionRk.setShelfId(zy.getShelfId());
slVolumeProductionRk.setRepertoryZhai(Long.valueOf(zy.getZyNum()));
slVolumeProductionRk.setCreateTime(new Date());
slVolumeProductionRkMapper.insert(slVolumeProductionRk);
zy.setScrkId(slVolumeProductionRk.getId());
-
+ slVolumeProductionZyMapper.updateById(zy);
LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery();
- wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,slVolumeProductionRk1.getMaterialsId());
+ wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,zy.getMaterialsId());
wrapper2.eq(ManagementGoodsMaterials::getManagementId,byId.getBmanagementId());
wrapper2.eq(ManagementGoodsMaterials::getDelFlag, 0);
ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
@@ -246,14 +325,12 @@
}else{
ManagementGoodsMaterials managementGoodsMaterials1=new ManagementGoodsMaterials();
managementGoodsMaterials1.setManagementId(byId.getBmanagementId());
- managementGoodsMaterials1.setGoodsMaterialsId(slVolumeProductionRk1.getMaterialsId());
+ managementGoodsMaterials1.setGoodsMaterialsId(zy.getMaterialsId());
managementGoodsMaterials1.setRepertoryZhai(Long.valueOf(zy.getZyNum()));
managementGoodsMaterials1.setRepertorySum(Long.valueOf(zy.getZyNum()));
managementGoodsMaterials1.setCreateTime(new Date());
managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
}
-
-
}
}
}
--
Gitblit v1.7.1