From 7aa33e4e6f5dd36d6a67b1b1e59c5d276e740486 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 15 五月 2025 16:45:21 +0800
Subject: [PATCH] 采购合同号
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 6 ++++++
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 9 ++++++++-
src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java | 11 ++++++++---
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index ff81462..93a0cba 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -18,6 +18,12 @@
*/
private String purchaseContractNumber;
+
+ /**
+ * 渚涘簲鍟嗗悕绉癷d
+ */
+ private String supplierId;
+
/**
* 渚涘簲鍟嗗悕绉�
*/
diff --git a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
index a2843c8..b88be60 100644
--- a/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
+++ b/src/main/java/com/ruoyi/purchase/pojo/PurchaseLedger.java
@@ -1,12 +1,12 @@
package com.ruoyi.purchase.pojo;
-import java.math.BigDecimal;
-import java.util.Date;
-
import com.baomidou.mybatisplus.annotation.*;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import lombok.Data;
+
+import java.math.BigDecimal;
+import java.util.Date;
/**
* 閲囪喘鍙拌处瀵硅薄 purchase_ledger
@@ -32,6 +32,11 @@
private String purchaseContractNumber;
/**
+ * 渚涘簲鍟嗗悕绉癷d
+ */
+ private String supplierId;
+
+ /**
* 渚涘簲鍟嗗悕绉�
*/
@Excel(name = "渚涘簲鍟嗗悕绉�")
diff --git a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
index 1d865c9..db3990a 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -4,6 +4,8 @@
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.basic.mapper.SupplierManageMapper;
+import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.StringUtils;
import com.ruoyi.other.mapper.TempFileMapper;
@@ -61,6 +63,8 @@
private final CommonFileMapper commonFileMapper;
+ private final SupplierManageMapper supplierManageMapper;
+
@Value("${file.upload-dir}")
private String uploadDir;
@@ -87,11 +91,14 @@
//褰曞叆浜�
SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
+ SupplierManage supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
+
// DTO杞珽ntity
PurchaseLedger purchaseLedger = new PurchaseLedger();
BeanUtils.copyProperties(purchaseLedgerDto, purchaseLedger);
purchaseLedger.setTenantId(salesLedger.getTenantId());
purchaseLedger.setSalesContractNo(salesLedger.getSalesContractNo());
+ purchaseLedger.setSupplierName(supplierManage.getSupplierName());
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setRecorderName(sysUser.getNickName());
purchaseLedger.setBusinessPersonId(purchaseLedgerDto.getBusinessPersonId());
@@ -305,7 +312,7 @@
@Override
public List getPurchasesNo() {
LambdaQueryWrapper<PurchaseLedger> queryWrapper = Wrappers.lambdaQuery();
- queryWrapper.select(PurchaseLedger::getId, PurchaseLedger::getPurchaseContractNumber);
+ queryWrapper.select(PurchaseLedger::getId, PurchaseLedger::getPurchaseContractNumber,PurchaseLedger::getSupplierId);
// 鑾峰彇鍘熷鏌ヨ缁撴灉
List<Map<String, Object>> result = purchaseLedgerMapper.selectMaps(queryWrapper);
--
Gitblit v1.9.3