From e092cf71d1b333e866a927941b918f6c8fb70154 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期一, 27 四月 2026 10:37:47 +0800
Subject: [PATCH] feat(sales): 添加供应商名称或合同号搜索功能
---
src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java | 34 ++++++++++++++++++++++++++++------
1 files changed, 28 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
index e23355d..3a7436e 100644
--- a/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
+++ b/src/main/java/com/ruoyi/basic/service/impl/SupplierServiceImpl.java
@@ -1,18 +1,22 @@
package com.ruoyi.basic.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.SupplierManageDto;
import com.ruoyi.basic.excel.SupplierManageExcelDto;
+import com.ruoyi.basic.mapper.ProductModelMapper;
import com.ruoyi.basic.mapper.SupplierManageMapper;
-import com.ruoyi.basic.pojo.Customer;
+import com.ruoyi.basic.pojo.ProductModel;
import com.ruoyi.basic.pojo.SupplierManage;
import com.ruoyi.basic.service.ISupplierService;
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.framework.web.domain.AjaxResult;
+import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
+import com.ruoyi.purchase.pojo.PurchaseLedger;
+import org.apache.commons.lang3.ArrayUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -21,13 +25,19 @@
import javax.servlet.http.HttpServletResponse;
import java.time.LocalDate;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class SupplierServiceImpl extends ServiceImpl<SupplierManageMapper,SupplierManage> implements ISupplierService {
@Autowired
private SupplierManageMapper supplierMapper;
+ @Autowired
+ private PurchaseLedgerMapper purchaseLedgerMapper;
+ @Autowired
+ private ProductModelMapper productModelMapper;
/**
* 渚涘簲鍟嗘柊澧�
@@ -35,7 +45,7 @@
* @return
*/
@Override
- public void saveSupplier(SupplierManage supplierManage) {
+ public void saveSupplier(SupplierManageDto supplierManage) {
LambdaQueryWrapper<SupplierManage> supplierManageLambdaQueryWrapper = new LambdaQueryWrapper<>();
supplierManageLambdaQueryWrapper.eq(SupplierManage::getSupplierName,supplierManage.getSupplierName());
if (supplierMapper.selectCount(supplierManageLambdaQueryWrapper) > 0) {
@@ -51,8 +61,13 @@
*/
@Override
public int delSupplier(List<Integer> ids) {
+ List<PurchaseLedger> purchaseLedgers = purchaseLedgerMapper.selectList(new QueryWrapper<PurchaseLedger>().lambda().in(PurchaseLedger::getSupplierId, ids));
+ if (purchaseLedgers.size() > 0) {
+ throw new RuntimeException("渚涘簲鍟嗗凡瀛樺湪閲囪喘鍚堝悓");
+ }
LambdaQueryWrapper<SupplierManage> delWrapper = new LambdaQueryWrapper<>();
delWrapper.in(SupplierManage::getId, ids);
+
return supplierMapper.delete(delWrapper);
}
@@ -62,8 +77,15 @@
* @return
*/
@Override
- public SupplierManage supplierDetail(Integer id) {
- return supplierMapper.selectById(id);
+ public SupplierManageDto supplierDetail(Integer id) {
+ SupplierManage supplierManage = supplierMapper.selectById(id);
+ SupplierManageDto supplierManageDto = new SupplierManageDto();
+ BeanUtils.copyProperties(supplierManage,supplierManageDto);
+ ProductModel productModel = productModelMapper.selectById(supplierManage.getSupplyProduct());
+ if(productModel != null) {
+ supplierManageDto.setProducutId(productModel.getProductId());
+ }
+ return supplierManageDto;
}
/**
@@ -72,7 +94,7 @@
* @return
*/
@Override
- public int supplierUpdate(SupplierManage supplierManage) {
+ public int supplierUpdate(SupplierManageDto supplierManage) {
return supplierMapper.updateById(supplierManage);
}
--
Gitblit v1.9.3