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/SlVolumeProductionCkServiceImpl.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
index 0e04574..d8864dd 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionCkServiceImpl.java
@@ -57,11 +57,26 @@
@Override
public PageDTO<ManagementimgSlVolumeProductionCkVO> getManagementimgSlVolumeProductionCkList(SlGoodsMaterialsSlVolumeProductionRkQuery slGoodsMaterialsSlVolumeProductionRkQuery) {
+ QueryWrapper<SlVolumeProductionRk> notNull = new QueryWrapper<SlVolumeProductionRk>()
+
+ .eq("del_flag", "0")
+ .isNotNull("new_add_time");
+ if (slGoodsMaterialsSlVolumeProductionRkQuery.getId()!=null){
+ notNull.eq("management_id", slGoodsMaterialsSlVolumeProductionRkQuery.getId());
+ }
+
+ // 查询该仓库的入库记录
+ List<Long> collect = slVolumeProductionRkMapper.selectList(notNull
+ ).stream().map(SlVolumeProductionRk::getId).collect(Collectors.toList());
Page<SlVolumeProductionCk> page = new Page<>(slGoodsMaterialsSlVolumeProductionRkQuery.getPageCurr(), slGoodsMaterialsSlVolumeProductionRkQuery.getPageSize());
LambdaQueryWrapper< SlVolumeProductionCk> wrapper1= Wrappers.lambdaQuery();
- wrapper1.like(SlVolumeProductionCk::getMaterialsId,slGoodsMaterialsSlVolumeProductionRkQuery.getSlGoodsMaterialsid());
- wrapper1.eq( SlVolumeProductionCk::getDelFlag,0);
+
+ wrapper1.eq(SlVolumeProductionCk::getMaterialsId,slGoodsMaterialsSlVolumeProductionRkQuery.getSlGoodsMaterialsid());
+ wrapper1.eq(SlVolumeProductionCk::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionCk::getCreateTime);
+ if (!collect.isEmpty()){
+ wrapper1.in(SlVolumeProductionCk::getRkId,collect);
+ }
Page<SlVolumeProductionCk> page2 = this.page(page, wrapper1);
PageDTO<ManagementimgSlVolumeProductionCkVO> SlGoodsShelfDTO = PageDTO.of(page2, ManagementimgSlVolumeProductionCkVO.class);
List<ManagementimgSlVolumeProductionCkVO> list2 = SlGoodsShelfDTO.getList();
@@ -199,6 +214,7 @@
wrapper.in("materials_id",collect1);
wrapper.eq("management_id",query.getManagementId());
wrapper.eq("del_flag","0");
+ wrapper.isNotNull("new_add_time");
Page<SlVolumeProductionRk> page2 = slVolumeProductionRkService.page(page, wrapper);
List<SlVolumeProductionRk> list = page2.getRecords();
--
Gitblit v1.7.1