From 2bf3546b11ba12cd371a4255dbc5a7705d18c75a Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期五, 26 七月 2024 09:04:21 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 77 +++++++++++++++++++++++++-------------
1 files changed, 50 insertions(+), 27 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 9ca0a0e..3d6fc4f 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
@@ -104,38 +104,57 @@
}
@Override
- public void addVolumeProductionRkgl(SlVolumeProductionRkListDTO slVolumeProductionRkListDTO) {
- List<Long> materialsId = slVolumeProductionRkListDTO.getMaterialsId();
- for (Long m:materialsId){
+ public void addVolumeProductionRkgl(List<SlVolumeProductionRkListDTO> slVolumeProductionRkListDTO) {
+
+ for (SlVolumeProductionRkListDTO m:slVolumeProductionRkListDTO){
SlVolumeProductionRk slVolumeProductionRk=new SlVolumeProductionRk();
- slVolumeProductionRk.setVolumeProductionRkglId(slVolumeProductionRkListDTO.getVolumeProductionRkglId());
- slVolumeProductionRk.setMaterialsId(m);
- slVolumeProductionRk.setManagementId(slVolumeProductionRkListDTO.getManagementId());
+ slVolumeProductionRk.setVolumeProductionRkglId(m.getVolumeProductionRkglId());
+ slVolumeProductionRk.setMaterialsId(m.getMaterialsId());
+ slVolumeProductionRk.setManagementId(m.getManagementId());
slVolumeProductionRk.setRkNumber("CD-"+new Date().getTime());
+ if ( m.getErwmNum()!=null){
+ slVolumeProductionRk.setErwmNum( m.getErwmNum());
+ }if ( m.getRkPice()!=null){
+ slVolumeProductionRk.setRkPice( m.getRkPice());
+ }if ( m.getRkNum()!=null){
+ slVolumeProductionRk.setRkNum( m.getRkNum());
+ }if ( m.getShelfId()!=null){
+ slVolumeProductionRk.setShelfId( m.getShelfId());
+ }if ( m.getRkModel()!=null){
+ slVolumeProductionRk.setRkModel( m.getRkModel());
+ }if ( m.getStoreManagementNumber()!=null){
+ slVolumeProductionRk.setStoreManagementNumber( m.getStoreManagementNumber());
+ }if ( m.getRkNumber()!=null){
+ slVolumeProductionRk.setRkNumber( m.getRkNumber());
+ }
+
this.save(slVolumeProductionRk);
}
}
@Override
- public void uplSlVolumeProductionRk(SlVolumeProductionRkDTO SlVolumeProductionRkDTO) {
- SlVolumeProductionRk byId = this.getById(SlVolumeProductionRkDTO.getId());
- if (SlVolumeProductionRkDTO.getErwmNum()!=null){
- byId.setErwmNum(SlVolumeProductionRkDTO.getErwmNum());
- }if (SlVolumeProductionRkDTO.getRkPice()!=null){
- byId.setRkPice(SlVolumeProductionRkDTO.getRkPice());
- }if (SlVolumeProductionRkDTO.getRkNum()!=null){
- byId.setRkNum(SlVolumeProductionRkDTO.getRkNum());
- }if (SlVolumeProductionRkDTO.getShelfId()!=null){
- byId.setShelfId(SlVolumeProductionRkDTO.getShelfId());
- }if (SlVolumeProductionRkDTO.getRkModel()!=null){
- byId.setRkModel(SlVolumeProductionRkDTO.getRkModel());
- }if (SlVolumeProductionRkDTO.getStoreManagementNumber()!=null){
- byId.setStoreManagementNumber(SlVolumeProductionRkDTO.getStoreManagementNumber());
- }if (SlVolumeProductionRkDTO.getRkNumber()!=null){
- byId.setRkNumber(SlVolumeProductionRkDTO.getRkNumber());
+ public void uplSlVolumeProductionRk(List<SlVolumeProductionRkDTO> SlVolumeProductionRkDTO) {
+ for (SlVolumeProductionRkDTO a:SlVolumeProductionRkDTO){
+ SlVolumeProductionRk byId = this.getById(a.getId());
+ if (a.getErwmNum()!=null){
+ byId.setErwmNum(a.getErwmNum());
+ }if (a.getRkPice()!=null){
+ byId.setRkPice(a.getRkPice());
+ }if (a.getRkNum()!=null){
+ byId.setRkNum(a.getRkNum());
+ }if (a.getShelfId()!=null){
+ byId.setShelfId(a.getShelfId());
+ }if (a.getRkModel()!=null){
+ byId.setRkModel(a.getRkModel());
+ }if (a.getStoreManagementNumber()!=null){
+ byId.setStoreManagementNumber(a.getStoreManagementNumber());
+ }if (a.getRkNumber()!=null){
+ byId.setRkNumber(a.getRkNumber());
+ }
+ this.updateById(byId);
}
- this.updateById(byId);
+
}
@Override
@@ -157,7 +176,7 @@
}
@Override
- public ManagementimgVolumeProductionRkVO codeInfo(Integer id) {
+ public ManagementimgVolumeProductionRkVO codeInfo(Long id) {
SlVolumeProductionRk byId = this.getById(id);
ManagementimgVolumeProductionRkVO vo=new ManagementimgVolumeProductionRkVO();
SlGoodsMaterials slGoodsMaterials = slGoodsMaterialsMapper.selectById(byId.getMaterialsId());
@@ -177,7 +196,9 @@
public PageDTO<ManagementimgVolumeProductionRkVO> getroductionRkList(umeProductionRkQuery meProductionRkQuery) {
LambdaQueryWrapper< SlGoodsMaterials> wrapper= Wrappers.lambdaQuery();
- wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+ if (meProductionRkQuery.getGoodsMaterialsName()!=null&&meProductionRkQuery.getGoodsMaterialsName()!=""){
+ wrapper.eq(SlGoodsMaterials::getGoodsMaterialsName,meProductionRkQuery.getGoodsMaterialsName());
+ }
if (meProductionRkQuery.getIsConsume()!=0){
wrapper.eq(SlGoodsMaterials::getIsConsume,meProductionRkQuery.getIsConsume());
}
@@ -191,12 +212,14 @@
Page<SlVolumeProductionRk> page = new Page<>(meProductionRkQuery.getPageCurr(), meProductionRkQuery.getPageSize());
LambdaQueryWrapper<SlVolumeProductionRk> wrapper1= Wrappers.lambdaQuery();
+ if(meProductionRkQuery.getManagementId()!=null&&meProductionRkQuery.getManagementId()!=0){
wrapper1.eq(SlVolumeProductionRk::getManagementId,meProductionRkQuery.getManagementId());
+ }
if (goodsSkuIdList.size()>0){
wrapper1.in(SlVolumeProductionRk::getMaterialsId,goodsSkuIdList);
- }if(meProductionRkQuery.getStoreManagementNumber()!=null){
+ }if(meProductionRkQuery.getStoreManagementNumber()!=null&&meProductionRkQuery.getStoreManagementNumber()!=0){
wrapper1.eq(SlVolumeProductionRk::getStoreManagementNumber,meProductionRkQuery.getStoreManagementNumber());
- }if(meProductionRkQuery.getShelfId()!=null){
+ }if(meProductionRkQuery.getShelfId()!=null&&meProductionRkQuery.getShelfId()!=0){
wrapper1.eq(SlVolumeProductionRk::getShelfId,meProductionRkQuery.getShelfId());
}
wrapper1.eq( SlVolumeProductionRk::getDelFlag,0);
--
Gitblit v1.7.1