From b10ab69ad0b3ba71837b48515e2c4eab7b4694a4 Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期一, 29 七月 2024 11:42:44 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java | 12 +++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsMaterialsServiceImpl.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java | 13 ++++--
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkServiceImpl.java | 8 ++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java | 2
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java | 7 +++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java | 25 ++++++++++++
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java | 1
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java | 12 +++---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java | 1
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 21 ++++++----
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java | 1
14 files changed, 83 insertions(+), 26 deletions(-)
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java
index 0e7c858..daef247 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/ManagementGoodsMaterialsController.java
@@ -3,6 +3,7 @@
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.dto.InventoriesSuppliesQuery;
import com.ruoyi.management.domain.dto.ManagementGoodsMaterialsQuery;
import com.ruoyi.management.domain.vo.InventoriesSuppliesVO;
@@ -11,11 +12,8 @@
import com.ruoyi.management.service.ManagementGoodsMaterialsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiParam;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
@@ -40,4 +38,9 @@
return R.ok(managementGoodsMaterialsService.getManagementGoodsMaterialsList(managementGoodsMaterialsQuery));
}
+
+
+
+
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
index 73b0f09..e26f500 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsMaterialsController.java
@@ -1,14 +1,21 @@
package com.ruoyi.management.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
+import com.ruoyi.common.core.utils.bean.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.management.domain.ManagementGoodsMaterials;
import com.ruoyi.management.domain.SlGoodsMaterials;
import com.ruoyi.management.domain.SlStoreManagement;
+import com.ruoyi.management.domain.SlVolumeProductionRk;
import com.ruoyi.management.domain.dto.*;
import com.ruoyi.management.domain.vo.SlGoodsMaterialsVO;
import com.ruoyi.management.domain.vo.SlGoodsShelfVO;
import com.ruoyi.management.domain.vo.StoreManagementGoodSmaterialsVO;
+import com.ruoyi.management.mapper.ManagementGoodsMaterialsMapper;
+import com.ruoyi.management.service.ManagementGoodsMaterialsService;
import com.ruoyi.management.service.SlGoodsMaterialsService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +23,7 @@
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -31,6 +39,9 @@
public class SlGoodsMaterialsController {
@Resource
private SlGoodsMaterialsService slGoodsMaterialsService;
+
+ @Resource
+ private ManagementGoodsMaterialsMapper managementGoodsMaterialsMapper;
@PostMapping("/getGoodSmaterialsList")
@ApiOperation(value = "分页获物资管理")
@@ -67,4 +78,18 @@
return R.ok(slGoodsMaterialsService.getStoreManagementGoodSmaterialsOne(storeManagementGoodSmaterialsQuery));
}
+ @GetMapping("/getGooManagementGoodSmaterials/{id}")
+ @ApiOperation(value = "库存管理查看物资詳情")
+ public R<StoreManagementGoodSmaterialsVO> getGooManagementGoodSmaterials(@ApiParam(name = "id", value = "物资管理id", required = true) @PathVariable("id") Long id) {
+ StoreManagementGoodSmaterialsVO storeManagementGoodSmaterialsVO=new StoreManagementGoodSmaterialsVO();
+ LambdaQueryWrapper<ManagementGoodsMaterials> wrappers= Wrappers.lambdaQuery();
+ wrappers.eq( ManagementGoodsMaterials::getGoodsMaterialsId,id);
+ ManagementGoodsMaterials managementGoodsMaterials = managementGoodsMaterialsMapper.selectById(id);
+ BeanUtils.copyProperties(managementGoodsMaterials, storeManagementGoodSmaterialsVO);
+ SlGoodsMaterials byId = slGoodsMaterialsService.getById(managementGoodsMaterials.getGoodsMaterialsId());
+ storeManagementGoodSmaterialsVO.setGoodsMaterialsName(byId.getGoodsMaterialsName());
+ storeManagementGoodSmaterialsVO.setIsConsume(byId.getIsConsume());
+ return R.ok(storeManagementGoodSmaterialsVO);
+ }
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
index fed1eb9..855e735 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlGoodsShelfController.java
@@ -64,11 +64,21 @@
}
@PostMapping("/wfanzGoodsShelfList")
- @ApiOperation(value = "货架获取未放置")
+ @ApiOperation(value = "货架获放置")
public R<List<SlGoodsShelf>> wfanzGoodsShelfList(@RequestBody GoodsShelfQuery goodsShelfQuery) {
return R.ok(slGoodsShelfService.wfanzGoodsShelfList(goodsShelfQuery));
}
+ @PostMapping("/wfanzGoodsShelfListDel/{id}")
+ @ApiOperation(value = "货架获放置删除")
+ public R wfanzGoodsShelfListDel(
+ @ApiParam(name = "id", value = "货架管理id", required = true) @PathVariable("id") Long id){
+ SlGoodsShelf byId = slGoodsShelfService.getById(id);
+ byId.setIsStoreManagement(1);
+ slGoodsShelfService.updateById(byId);
+ return R.ok();
+ }
+
@PostMapping("/fanzGoodsShelfList")
@ApiOperation(value = "货架放置到图片")
public R fanzGoodsShelfList(@RequestBody GoodsShelfDTO goodsShelfDTO) {
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
index 8e9772c..a6cdd2f 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/controller/SlVolumeProductionRkglController.java
@@ -67,7 +67,7 @@
@PostMapping("/addVolumeProductionRkgl")
@ApiOperation(value = "添加/修改入库管理")
- public R addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ public R<Long> addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO) {
slVolumeProductionRkglService.addVolumeProductionRkgl(volumeProductionRkglDTO);
return R.ok();
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java
index 28f28da..ee5dfc4 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/InventoriesSuppliesVO.java
@@ -9,7 +9,7 @@
import java.util.Date;
@Data
-@ApiModel(value = "通过物资拿出库物资的数据对象", description = "通过物资拿出库物资的数据对象")
+@ApiModel(value = "物资盘点数据对象", description = "物资盘点数据对象")
public class InventoriesSuppliesVO {
private Long id;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
index d0fc10b..5bcb427 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/domain/vo/ManagementimgVolumeProductionRkVO.java
@@ -2,11 +2,13 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.fasterxml.jackson.annotation.JsonInclude;
+import com.ruoyi.management.domain.SlGoodsShelf;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.math.BigDecimal;
+import java.util.List;
@Data
@ApiModel(value = "通过入库管理拿入库物资的数据对象", description = "通过入库管理拿入库物资的数据对象")
@@ -53,4 +55,9 @@
@ApiModelProperty("仓库名称")
private String storeManagementName;
+ @ApiModelProperty("")
+ private List<SlGoodsShelf> SlGoodsShelfs;
+
+
+
}
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
index 4840788..03f1125 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/SlVolumeProductionRkglService.java
@@ -28,7 +28,7 @@
PageDTO<SupplierVolumeProductionRkglVO> getslVolumeProductionRkglList( getVolumeProductionRkQuery getVolumeProductionRkQuery) ;
- void addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO);
+ Long addVolumeProductionRkgl(@RequestBody VolumeProductionRkglDTO volumeProductionRkglDTO);
VolumeProductionRkgInventoryVO getVolumeProductionRkgInventory(Long id);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
index 97f56d1..c7fcd92 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/ManagementGoodsMaterialsServiceImpl.java
@@ -110,6 +110,7 @@
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(li.getManagementId());
li.setProvinceCode(slStoreManagement.getProvinceCode());
+ li.setStoreManagementName(slStoreManagement.getStoreManagementName());
li.setProvinceName(slStoreManagement.getProvinceName());
li.setCityCode(slStoreManagement.getCityCode());
li.setCityName(slStoreManagement.getCityName());
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
index a20514e..636bd7e 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlEquipmentServiceImpl.java
@@ -102,6 +102,7 @@
SlStoreManagement slStoreManagement = slStoreManagementMapper.selectById(byId.getManagementId());
slEquipmentVO.setCountyCode(slStoreManagement.getCountyCode());
+ slEquipmentVO.setStoreManagementName(slStoreManagement.getStoreManagementName());
slEquipmentVO.setProvinceName(slStoreManagement.getProvinceName());
slEquipmentVO.setProvinceCode(slStoreManagement.getProvinceCode());
slEquipmentVO.setCountyName(slStoreManagement.getCountyName());
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 18377ee..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
@@ -107,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){
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
index b37c257..134822b 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlGoodsShelfServiceImpl.java
@@ -152,7 +152,6 @@
LambdaQueryWrapper< SlGoodsShelf> wrapper1= Wrappers.lambdaQuery();
wrapper1.eq(SlGoodsShelf::getStoreManagementId,goodsShelfQuery.getStoreManagementId());
wrapper1.eq(SlGoodsShelf::getStoreManagementNumber,goodsShelfQuery.getStoreManagementNumber());
- wrapper1.eq(SlGoodsShelf::getIsStoreManagement,1);
wrapper1.eq( SlGoodsShelf::getDelFlag,0);
wrapper1.orderByDesc(SlGoodsShelf::getCreateTime);
List<SlGoodsShelf> page2 = this.list(wrapper1);
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java
index 5679afe..e6912e5 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlRegionServiceImpl.java
@@ -118,9 +118,9 @@
LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
if (regionQuery.getCode()!=null){
- wrapper1.like(SlRegion::getParentId,regionQuery.getCode());
+ wrapper1.eq(SlRegion::getParentId,regionQuery.getCode());
}
- wrapper1.like(SlRegion::getLevel,2);
+ wrapper1.eq(SlRegion::getLevel,2);
List<SlRegion> page2 = this.list(wrapper1);
return page2;
}
@@ -129,9 +129,9 @@
public List<SlRegion> getcountyRegione(RegionQuery regionQuery) {
LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
if (regionQuery.getCode()!=null){
- wrapper1.like(SlRegion::getParentId,regionQuery.getCode());
+ wrapper1.eq(SlRegion::getParentId,regionQuery.getCode());
}
- wrapper1.like(SlRegion::getLevel,3);
+ wrapper1.eq(SlRegion::getLevel,3);
List<SlRegion> page2 = this.list(wrapper1);
return page2;
}
@@ -140,9 +140,9 @@
public List<SlRegion> gettownRegione(RegionQuery regionQuery) {
LambdaQueryWrapper<SlRegion> wrapper1= Wrappers.lambdaQuery();
if (regionQuery.getCode()!=null){
- wrapper1.like(SlRegion::getParentId,regionQuery.getCode());
+ wrapper1.eq(SlRegion::getParentId,regionQuery.getCode());
}
- wrapper1.like(SlRegion::getLevel,4);
+ wrapper1.eq(SlRegion::getLevel,4);
List<SlRegion> page2 = this.list(wrapper1);
return page2;
}
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..51aa668 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
@@ -72,6 +72,14 @@
list.setSupplierName(data.getNickName());
SlGoodsShelf slGoodsShelf = slGoodsShelfMapper.selectById(list.getShelfId());
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;
diff --git a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
index 86ecb13..e85fd49 100644
--- a/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
+++ b/ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java
@@ -139,10 +139,11 @@
}
@Override
- public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ public Long addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
Long userid = SecurityUtils.getUserId();
+ SlVolumeProductionRkgl slVolumeProductionRkgl=null;
if (volumeProductionRkglDTO.getId()==null){
- SlVolumeProductionRkgl slVolumeProductionRkgl=new SlVolumeProductionRkgl();
+ new SlVolumeProductionRkgl();
slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
slVolumeProductionRkgl.setAuditStatus(1);
@@ -155,24 +156,26 @@
slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
this.save(slVolumeProductionRkgl);
}else{
- SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId());
+ slVolumeProductionRkgl = this.getById(volumeProductionRkglDTO.getId());
if (volumeProductionRkglDTO.getSource()!=null){
- byId.setSource(volumeProductionRkglDTO.getSource());
+ slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource());
}
if (volumeProductionRkglDTO.getRemark()!=null){
- byId.setRemark(volumeProductionRkglDTO.getRemark());
+ slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
}
if (volumeProductionRkglDTO.getSupplierId()!=null){
- byId.setSupplierId(volumeProductionRkglDTO.getSupplierId());
+ slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId());
}
if (volumeProductionRkglDTO.getAttachmentUrl()!=null){
- byId.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
+ slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
}
if (volumeProductionRkglDTO.getAuthorization()!=null){
- byId.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
+ slVolumeProductionRkgl.setAuthorizationUrl(volumeProductionRkglDTO.getAuthorization());
}
- this.updateById(byId);
+ this.updateById(slVolumeProductionRkgl);
+
}
+ return slVolumeProductionRkgl.getId();
}
@Override
--
Gitblit v1.7.1