From 8876b1b9cd27fad076ea9e5f3e04197b84ba02bd Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 01 八月 2024 14:26:56 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 123 ++++++++++++++++++++++++++++------------
1 files changed, 86 insertions(+), 37 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 e9480d5..2894d97 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
@@ -6,10 +6,7 @@
import com.ruoyi.common.core.utils.page.PageDTO;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.*;
-import com.ruoyi.management.domain.vo.ManagementimgVolumeProductionRkVO;
-import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
-import com.ruoyi.management.domain.vo.getVolumeProductionRkgCodeVO;
-import com.ruoyi.management.domain.vo.gethuojRkVO;
+import com.ruoyi.management.domain.vo.*;
import com.ruoyi.management.mapper.*;
import com.ruoyi.management.service.SlStoreManagementService;
import com.ruoyi.management.service.SlVolumeProductionRkService;
@@ -21,10 +18,9 @@
import javax.annotation.Resource;
import java.math.BigDecimal;
-import java.util.Date;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import java.sql.Array;
+import java.text.SimpleDateFormat;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -41,6 +37,8 @@
private SlGoodsMaterialsMapper slGoodsMaterialsMapper;
@Resource
private SlVolumeProductionRkglMapper slVolumeProductionRkglMapper;
+ @Resource
+ private SlVolumeProductionRkMapper slVolumeProductionRkMapper;
@Resource
private SlGoodsShelfMapper slGoodsShelfMapper;
@@ -105,14 +103,22 @@
for(ManagementimgVolumeProductionRkVO list:list2) {{
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
+ if (slGoodsMaterials!=null){
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ }
SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
- SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ if (byId!=null){
+ SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ list.setSupplierName(data.getNickName());
+ }
- list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
- list.setIsConsume(slGoodsMaterials.getIsConsume());
- list.setSupplierName(data.getNickName());
+
SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
- list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ if (slGoodsShelf!=null){
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+
+ }
}
}
return SlGoodsShelfDTO;
@@ -120,13 +126,13 @@
@Override
public void addVolumeProductionRkgl(List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO) {
-
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
for (SlVolumeProductionRkListDTO m:slVolumeProductionRkListDTO){
SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
slVolumeProductionRk.setVolumeProductionRkglId(m.getVolumeProductionRkglId());
slVolumeProductionRk.setMaterialsId(m.getMaterialsId());
slVolumeProductionRk.setManagementId(m.getManagementId());
- slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
+ slVolumeProductionRk.setRkNumber("CD-"+simpleDateFormat.format(new Date()));
slVolumeProductionRk.setNewAddTime(m.getNewAddTime());
if ( m.getErwmNum()!=null){
slVolumeProductionRk.setErwmNum( m.getErwmNum());
@@ -143,7 +149,8 @@
}if ( m.getRkNumber()!=null){
slVolumeProductionRk.setRkNumber( m.getRkNumber());
}
-
+ slVolumeProductionRk.setCreateTime(new Date());
+ slVolumeProductionRk.setRepertoryZhai(m.getRkNum());
this.save(slVolumeProductionRk);
}
@@ -193,22 +200,55 @@
}
@Override
- public ManagementimgVolumeProductionRkVO codeInfo(Long id) {
- SlVolumeProductionRk byId = this.getById(id);
- ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO();
- SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
- vo.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
- vo.setIsConsume(slGoodsMaterials.getIsConsume());
- SlVolumeProductionRkgl byId1 = slVolumeProductionRkglMapper.selectById(byId.getVolumeProductionRkglId());
- SysUser data = sysUserClient.getSysUser(byId1.getSupplierId()).getData();
- vo.setSupplierName(data.getNickName());
- SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
- vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
- vo.setRkNum(byId.getRkNum());
- vo.setRkNumber(byId.getRkNumber());
- return vo;
+ public List<QRCodeVO> codeInfo(Long id) {
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyyMMddHHmmss");
+ List<QRCodeVO> res = new ArrayList<>();
+ LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+ wrapper1.like(SlVolumeProductionRk::getVolumeProductionRkglId,id);
+ wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
+ wrapper1.orderByDesc(SlVolumeProductionRk::getCreateTime);
+ List<SlVolumeProductionRk> list = this.list(wrapper1);
+ for (SlVolumeProductionRk byId : list) {
+ // 根据生成二维码数量 复制
+ for (int i = 0; i < byId.getErwmNum(); i++) {
+ QRCodeVO vo=new QRCodeVO();
+ String letter = getLetter(i);
+ vo.setCategory(letter);
+ SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
+ vo.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ SlVolumeProductionRkgl byId1 = slVolumeProductionRkglMapper.selectById(byId.getVolumeProductionRkglId());
+ SysUser data = sysUserClient.getSysUser(byId1.getSupplierId()).getData();
+ vo.setSupplierName(data.getNickName());
+ vo.setMaterialsNum(byId.getRkNum());
+ Long materialsId = byId.getMaterialsId();
+ // 查询物资缩写
+ vo.setMaterials(byId.getRkNumber());
+ SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
+ vo.setStoreManagementName(slStoreManagement.getStoreManagementName());
+ res.add(vo);
+ }
+
+ }
+
+
+ return res;
}
+ // 根据传入数字是几 返回对应的字母
+ public static String getLetter(int num) {
+ String[] str = {"A", "B", "C", "D", "E", "F", "G", "H", "I", "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V", "W", "X", "Y", "Z"};
+ // 如果num大于26 那么往后叠加对应的字母
+ if (num > 26) {
+ int a = num / 26;
+ int b = num % 26;
+ if (b == 0) {
+ a = a - 1;
+ b = 26;
+ }
+ return getLetter(a) + getLetter(b);
+ }
+ return str[num - 1];
+ }
@Override
public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
@@ -292,7 +332,6 @@
List<gethuojRkVO> list2 = SlGoodsShelfDTO.getList();
for(gethuojRkVO list:list2) {
-
LambdaQueryWrapper<ManagementGoodsMaterials> wrapper2 = Wrappers.lambdaQuery();
wrapper2.eq(ManagementGoodsMaterials::getGoodsMaterialsId,list.getMaterialsId());
wrapper2.eq(ManagementGoodsMaterials::getManagementId,list.getManagementId());
@@ -300,19 +339,29 @@
ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectOne(wrapper2);
if (managementGoodsMaterials != null){
list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(managementGoodsMaterials.getRepertorySum())));
+ list.setRepertorySum(managementGoodsMaterials.getRepertorySum());
}else{
list.setRkPiceSum(list.getRkPice().multiply(new BigDecimal(1)));
+ list.setRepertorySum(0L);
}
- list.setRepertorySum(managementGoodsMaterials.getRepertorySum());
+
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(list.getMaterialsId());
SlVolumeProductionRkgl byId = slVolumeProductionRkglMapper.selectById(list.getVolumeProductionRkglId());
- SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ if (byId!=null){
+ SysUser data = sysUserClient.getSysUser(byId.getSupplierId()).getData();
+ list.setSupplierName(data.getNickName());
+ }
- list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
- list.setIsConsume(slGoodsMaterials.getIsConsume());
- list.setSupplierName(data.getNickName());
+ if (slGoodsMaterials!=null){
+ list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
+ list.setIsConsume(slGoodsMaterials.getIsConsume());
+ }
+
SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
- list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+ if (slGoodsShelf!=null){
+ list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
+
+ }
}
return SlGoodsShelfDTO;
}
--
Gitblit v1.7.1