From 87e07ac8b8f1868eb4302fac73dfc93c5417f977 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 30 七月 2024 11:06:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/ForestFirePrevention
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
index a14dfbe..32fd7ff 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java
@@ -52,7 +52,9 @@
SlGoodsMaterials slGoodsMaterials=new SlGoodsMaterials();
slGoodsMaterials.setGoodsMaterialsName(slGoodsMaterialsDTO.getGoodsMaterialsName());
slGoodsMaterials.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
+ slGoodsMaterials.setGoodsMaterialsNo(slGoodsMaterialsDTO.getGoodsMaterialsNo());
slGoodsMaterials.setRepertory(slGoodsMaterialsDTO.getRepertory());
+ this.save(slGoodsMaterials);
}else{
SlGoodsMaterials byId = this.getById(slGoodsMaterialsDTO.getId());
if (slGoodsMaterialsDTO.getGoodsMaterialsName()!=null){
@@ -60,7 +62,18 @@
}
if (slGoodsMaterialsDTO.getRepertory()!=null){
byId.setRepertory(slGoodsMaterialsDTO.getRepertory());
+ LambdaQueryWrapper<ManagementGoodsMaterials> wrapper3= Wrappers.lambdaQuery();
+ wrapper3.eq(ManagementGoodsMaterials::getGoodsMaterialsId,byId.getId());
+ wrapper3.eq( ManagementGoodsMaterials::getDelFlag,0);
+ wrapper3.orderByDesc(ManagementGoodsMaterials::getCreateTime);
+ List<ManagementGoodsMaterials> page1 = managementGoodsMaterialsService.list(wrapper3);
+ for (ManagementGoodsMaterials pg:page1){
+ pg.setRepertory(slGoodsMaterialsDTO.getRepertory());
+ managementGoodsMaterialsService.updateById(pg);
+ }
+
}
+ byId.setGoodsMaterialsNo(slGoodsMaterialsDTO.getGoodsMaterialsNo());
if (slGoodsMaterialsDTO.getIsConsume()!=null){
byId.setIsConsume(slGoodsMaterialsDTO.getIsConsume());
}
@@ -72,7 +85,9 @@
public PageDTO<SlGoodsMaterialsVO> getGoodSmaterialsList(SlGoodsMaterialsQuery slGoodsMaterialsQuery) {
Page<SlGoodsMaterials> page = new Page<>(slGoodsMaterialsQuery.getPageCurr(), slGoodsMaterialsQuery.getPageSize());
LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
+ if (slGoodsMaterialsQuery.getGoodsMaterialsName()!=null&&slGoodsMaterialsQuery.getGoodsMaterialsName()!=""){
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,slGoodsMaterialsQuery.getGoodsMaterialsName());
+ }
if (slGoodsMaterialsQuery.getIsConsume()!=0){
wrapper.eq(SlGoodsMaterials::getIsConsume,slGoodsMaterialsQuery.getIsConsume());
}
@@ -92,7 +107,7 @@
.collect(Collectors.toSet());
LambdaQueryWrapper< SlGoodsMaterials> wrapper1 =Wrappers.lambdaQuery();
- if (storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
+ if (storeManagementGoodSmaterialsQuery.getIsConsume()!=null&&storeManagementGoodSmaterialsQuery.getIsConsume()!=0){
wrapper1.eq(SlGoodsMaterials::getIsConsume,storeManagementGoodSmaterialsQuery.getIsConsume());
}
if (storeManagementGoodSmaterialsQuery.getGoodsMaterialsName()!=null){
--
Gitblit v1.7.1