From 1c4311135628b53daa336821ff452292a9d063e9 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期三, 28 八月 2024 09:14:10 +0800
Subject: [PATCH] 代码提交 bug解决
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 6 ++----
1 files changed, 2 insertions(+), 4 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 a6c2f62..67a1a6c 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
@@ -118,13 +118,14 @@
LambdaQueryWrapper< SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlVolumeProductionRk::getMaterialsId,SlGoodsMaterialsSlVolumeProductionRkDTO.getSlGoodsMaterialsid());
wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
+ wrapper1.eq(SlVolumeProductionRk::getManagementId,SlGoodsMaterialsSlVolumeProductionRkDTO.getId());
+ wrapper1.isNotNull(SlVolumeProductionRk::getNewAddTime);
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());
-
if (slGoodsMaterials!=null){
list.setGoodsMaterialsName(slGoodsMaterials.getGoodsMaterialsName());
list.setIsConsume(slGoodsMaterials.getIsConsume());
@@ -136,8 +137,6 @@
list.setSupplierName(data.getNickName());
}
}
-
-
SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
if (slGoodsShelf!=null){
list.setGoodsShelfName(slGoodsShelf.getGoodsShelfName());
@@ -200,7 +199,6 @@
}if (a.getRkNumber()!=null){
byId.setRkNumber(a.getRkNumber());
}
- byId.setNewAddTime(a.getNewAddTime());
this.updateById(byId);
}
--
Gitblit v1.7.1