From 068f7367353f9f20debc65ec4be2209ae3b90ecd Mon Sep 17 00:00:00 2001
From: rentaiming <806181062@qq.com>
Date: 星期二, 16 七月 2024 16:54:57 +0800
Subject: [PATCH] 森林防火 供应商管理
---
ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlVolumeProductionRkglServiceImpl.java | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
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 aef9f56..43888ca 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
@@ -5,6 +5,7 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.core.utils.page.BeanUtils;
import com.ruoyi.common.core.utils.page.PageDTO;
+import com.ruoyi.common.security.utils.SecurityUtils;
import com.ruoyi.management.domain.*;
import com.ruoyi.management.domain.dto.SupplierVolumeProductionRkglQuery;
import com.ruoyi.management.domain.dto.VolumeProductionRkglDTO;
@@ -85,8 +86,10 @@
v.setStoreManagementName(slStoreManagement.getStoreManagementName());
SysUser data = sysUserClient.getSysUser(Long.valueOf(byId.getSupplierId())).getData();
v.setSupplierName(data.getNickName());
+ v.setSupplierPhone(data.getPhonenumber());
SysUser data1 = sysUserClient.getSysUser(Long.valueOf(byId.getSysId())).getData();
v.setSysName(data1.getNickName());
+ v.setSysPhone(data1.getPhonenumber());
return v;
}
@@ -103,7 +106,7 @@
wrapper1.eq(SlVolumeProductionRkgl::getPresentState,getVolumeProductionRkQuery.getPresentState());
wrapper1.eq(SlVolumeProductionRkgl::getAuditStatus,getVolumeProductionRkQuery.getAuditStatus());
if (goodsSkuIdList.size()>0){
- wrapper1.in(SlVolumeProductionRkgl::getSupplierId,goodsSkuIdList);
+ wrapper1.in(SlVolumeProductionRkgl::getSysId,goodsSkuIdList);
}
wrapper1.eq( SlVolumeProductionRkgl::getDelFlag,0);
wrapper1.orderByDesc(SlVolumeProductionRkgl::getCreateTime);
@@ -123,6 +126,7 @@
@Override
public void addVolumeProductionRkgl(VolumeProductionRkglDTO volumeProductionRkglDTO) {
+ Long userid = SecurityUtils.getUserId();
if (volumeProductionRkglDTO.getId()!=null){
SlVolumeProductionRkgl slVolumeProductionRkgl=new SlVolumeProductionRkgl();
slVolumeProductionRkgl.setAttachmentUrl(volumeProductionRkglDTO.getAttachmentUrl());
@@ -133,9 +137,9 @@
slVolumeProductionRkgl.setSupplierId(volumeProductionRkglDTO.getSupplierId());
slVolumeProductionRkgl.setSource(volumeProductionRkglDTO.getSource());
slVolumeProductionRkgl.setStartiTime(new Date());
- slVolumeProductionRkgl.setSysId(volumeProductionRkglDTO.getSysId());
+ slVolumeProductionRkgl.setSysId(userid);
slVolumeProductionRkgl.setRemark(volumeProductionRkglDTO.getRemark());
- this.updateById(slVolumeProductionRkgl);
+ this.save(slVolumeProductionRkgl);
}else{
SlVolumeProductionRkgl byId = this.getById(volumeProductionRkglDTO.getId());
if (volumeProductionRkglDTO.getSource()!=null){
@@ -241,8 +245,8 @@
Long repertoryZhai = managementGoodsMaterials.getRepertoryZhai();
Long re=repertorySum+list.getRkNum();
Long re1=repertoryZhai+list.getRkNum();
- managementGoodsMaterials.setRepertoryZhai(re);
- managementGoodsMaterials.setRepertorySum(re1);
+ managementGoodsMaterials.setRepertorySum(re);
+ managementGoodsMaterials.setRepertoryZhai(re1);
managementGoodsMaterialsMapper.updateById(managementGoodsMaterials);
}else{
ManagementGoodsMaterials managementGoodsMaterials1=new ManagementGoodsMaterials();
@@ -253,6 +257,11 @@
managementGoodsMaterialsMapper.insert(managementGoodsMaterials1);
}
}
+ SlVolumeProductionRkgl byId = this.getById(id);
+ byId.setPresentState(4);
+ byId.setAuditStatus(6);
+ byId.setEndTime(new Date());
+ this.updateById(byId);
}
}
--
Gitblit v1.7.1