From 24f7e4c21f6b6375f791b5132d25373255c1d464 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 29 七月 2024 18:14:24 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 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 3d6fc4f..ba71edf 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
@@ -71,7 +71,18 @@
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());
+ }
+
+
+ LambdaQueryWrapper<SlGoodsShelf> wrapper5= Wrappers.lambdaQuery();
+ wrapper5.eq(SlGoodsShelf::getStoreManagementId,byId.getManagementId());
+ wrapper5.eq(SlGoodsShelf::getStoreManagementNumber,list.getStoreManagementNumber());
+ wrapper5.eq( SlGoodsShelf::getDelFlag,0);
+ wrapper5.orderByDesc(SlGoodsShelf::getCreateTime);
+ List<SlGoodsShelf> page3 = slGoodsShelfMapper.selectList(wrapper5);
+ list.setSlGoodsShelfs(page3);
}
}
return SlGoodsShelfDTO;
@@ -112,6 +123,7 @@
slVolumeProductionRk.setMaterialsId(m.getMaterialsId());
slVolumeProductionRk.setManagementId(m.getManagementId());
slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
+ slVolumeProductionRk.setNewAddTime(m.getNewAddTime());
if ( m.getErwmNum()!=null){
slVolumeProductionRk.setErwmNum( m.getErwmNum());
}if ( m.getRkPice()!=null){
@@ -152,6 +164,7 @@
}if (a.getRkNumber()!=null){
byId.setRkNumber(a.getRkNumber());
}
+ byId.setNewAddTime(a.getNewAddTime());
this.updateById(byId);
}
--
Gitblit v1.7.1