From e8304b5b39787b25eb024fafd00d7db512ee6438 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 19 五月 2025 09:02:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 137 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 122 insertions(+), 15 deletions(-)
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 c8ef0fc..db3990a 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -2,7 +2,10 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
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;
@@ -13,11 +16,11 @@
import com.ruoyi.purchase.mapper.PurchaseLedgerMapper;
import com.ruoyi.purchase.pojo.PurchaseLedger;
import com.ruoyi.purchase.service.IPurchaseLedgerService;
-import com.ruoyi.sales.mapper.SalesLedgerFileMapper;
+import com.ruoyi.sales.mapper.CommonFileMapper;
import com.ruoyi.sales.mapper.SalesLedgerMapper;
import com.ruoyi.sales.mapper.SalesLedgerProductMapper;
+import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedger;
-import com.ruoyi.sales.pojo.SalesLedgerFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
@@ -27,6 +30,7 @@
import org.springframework.stereotype.Service;
import java.io.IOException;
+import java.math.BigDecimal;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -34,10 +38,7 @@
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
/**
@@ -60,14 +61,20 @@
private final TempFileMapper tempFileMapper;
- private final SalesLedgerFileMapper salesLedgerFileMapper;
+ private final CommonFileMapper commonFileMapper;
+
+ private final SupplierManageMapper supplierManageMapper;
@Value("${file.upload-dir}")
private String uploadDir;
@Override
public List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger) {
- return purchaseLedgerMapper.selectList(new LambdaQueryWrapper<>());
+ LambdaQueryWrapper<PurchaseLedger> queryWrapper = new LambdaQueryWrapper<>();
+ if (StringUtils.isNotBlank(purchaseLedger.getPurchaseContractNumber())) {
+ queryWrapper.like(PurchaseLedger::getPurchaseContractNumber,purchaseLedger.getPurchaseContractNumber());
+ }
+ return purchaseLedgerMapper.selectList(queryWrapper);
}
@Override
@@ -75,18 +82,28 @@
SalesLedger salesLedger = salesLedgerMapper.selectById(purchaseLedgerDto.getSalesLedgerId());
+ //涓氬姟鍛�
+ SysUser businessPerson = userMapper.selectUserById(purchaseLedgerDto.getBusinessPersonId());
+
if (salesLedger == null) {
throw new BaseException("閿�鍞彴璐︿笉瀛樺湪");
}
+ //褰曞叆浜�
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());
+ purchaseLedger.setBusinessPerson(businessPerson.getNickName());
+ purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
// 3. 鏂板鎴栨洿鏂颁富琛�
if (purchaseLedger.getId() == null) {
@@ -99,7 +116,6 @@
List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
if (productList != null && !productList.isEmpty()) {
handleSalesLedgerProducts(purchaseLedger.getId(), productList, purchaseLedgerDto.getType());
-
}
// 5. 杩佺Щ涓存椂鏂囦欢鍒版寮忕洰褰�
@@ -132,6 +148,18 @@
salesLedgerProduct.setType(type);
salesLedgerProductMapper.insert(salesLedgerProduct);
}
+ }
+
+ // 璁＄畻鎬诲惈绋庨噾棰�
+ BigDecimal totalTaxInclusiveAmount = products.stream()
+ .map(SalesLedgerProduct::getTaxInclusiveTotalPrice)
+ .filter(Objects::nonNull)
+ .reduce(BigDecimal.ZERO, BigDecimal::add);
+
+ // 鏇存柊涓昏〃鐨勬�婚噾棰濆瓧娈�
+ if (salesLedgerId != null) {
+ // 鐩存帴鏇存柊鎸囧畾ID鐨勮褰曠殑contractAmount瀛楁涓簍otalTaxInclusiveAmount
+ purchaseLedgerMapper.updateContractAmountById(salesLedgerId, totalTaxInclusiveAmount);
}
}
@@ -186,12 +214,13 @@
log.info("鏂囦欢杩佺Щ鎴愬姛: {} -> {}", tempFile.getTempPath(), formalFilePath);
// 鏇存柊鏂囦欢璁板綍锛堝叧鑱斿埌涓氬姟ID锛�
- SalesLedgerFile fileRecord = new SalesLedgerFile();
- fileRecord.setLedgerId(businessId);
+ CommonFile fileRecord = new CommonFile();
+ fileRecord.setCommonId(businessId);
fileRecord.setName(originalFilename);
fileRecord.setUrl(formalFilePath.toString());
fileRecord.setCreateTime(LocalDateTime.now());
- salesLedgerFileMapper.insert(fileRecord);
+ fileRecord.setType("2");
+ commonFileMapper.insert(fileRecord);
// 鍒犻櫎涓存椂鏂囦欢璁板綍
tempFileMapper.deleteById(tempFile);
@@ -225,9 +254,9 @@
List<SalesLedgerProduct> products = salesLedgerProductMapper.selectList(productWrapper);
// 3.鏌ヨ涓婁紶鏂囦欢
- LambdaQueryWrapper<SalesLedgerFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
- salesLedgerFileWrapper.eq(SalesLedgerFile::getLedgerId, purchaseLedger.getId());
- List<SalesLedgerFile> salesLedgerFiles = salesLedgerFileMapper.selectList(salesLedgerFileWrapper);
+ LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
+ salesLedgerFileWrapper.eq(CommonFile::getCommonId, purchaseLedger.getId());
+ List<CommonFile> salesLedgerFiles = commonFileMapper.selectList(salesLedgerFileWrapper);
// 4. 杞崲 DTO
PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
@@ -239,4 +268,82 @@
}
return resultDto;
}
+
+ @Override
+ public List getProduct(PurchaseLedgerDto purchaseLedgerDto) {
+ LambdaQueryWrapper<PurchaseLedger> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.select(PurchaseLedger::getId, PurchaseLedger::getPurchaseContractNumber);
+
+ // 鑾峰彇鍘熷鏌ヨ缁撴灉
+ List<Map<String, Object>> result = purchaseLedgerMapper.selectMaps(queryWrapper);
+
+ // 灏嗕笅鍒掔嚎鍛藉悕杞崲涓洪┘宄板懡鍚�
+ return result.stream().map(map -> map.entrySet().stream()
+ .collect(Collectors.toMap(
+ entry -> underlineToCamel(entry.getKey()),
+ Map.Entry::getValue))
+ ).collect(Collectors.toList());
+ }
+
+ @Override
+ public PurchaseLedgerDto getInfo(PurchaseLedgerDto purchaseLedgerDto) {
+ PurchaseLedger purchaseLedger = purchaseLedgerMapper.selectById(purchaseLedgerDto.getId());
+ if (purchaseLedger == null) {
+ throw new BaseException("閲囪喘鍙拌处涓嶅瓨鍦�");
+ }
+ // 鍒涘缓骞跺～鍏匘TO
+ PurchaseLedgerDto resultDto = new PurchaseLedgerDto();
+ resultDto.setSalesContractNoId(purchaseLedger.getSalesLedgerId());
+ resultDto.setSalesContractNo(purchaseLedger.getSalesContractNo());
+ resultDto.setSupplierName(purchaseLedger.getSupplierName());
+ resultDto.setProjectName(purchaseLedger.getProjectName());
+ resultDto.setBusinessPersonId(purchaseLedger.getBusinessPersonId());
+
+ // 鏌ヨ骞惰缃叧鑱斾骇鍝�
+ LambdaQueryWrapper<SalesLedgerProduct> queryWrapper = new LambdaQueryWrapper<>();
+ queryWrapper.eq(SalesLedgerProduct::getSalesLedgerId, purchaseLedger.getId())
+ .eq(SalesLedgerProduct::getType, 2);
+ List<SalesLedgerProduct> productList = salesLedgerProductMapper.selectList(queryWrapper);
+ resultDto.setProductData(productList);
+
+ return resultDto;
+ }
+
+ @Override
+ public List getPurchasesNo() {
+ LambdaQueryWrapper<PurchaseLedger> queryWrapper = Wrappers.lambdaQuery();
+ queryWrapper.select(PurchaseLedger::getId, PurchaseLedger::getPurchaseContractNumber,PurchaseLedger::getSupplierId);
+
+ // 鑾峰彇鍘熷鏌ヨ缁撴灉
+ List<Map<String, Object>> result = purchaseLedgerMapper.selectMaps(queryWrapper);
+
+ // 灏嗕笅鍒掔嚎鍛藉悕杞崲涓洪┘宄板懡鍚�
+ return result.stream().map(map -> map.entrySet().stream()
+ .collect(Collectors.toMap(
+ entry -> underlineToCamel(entry.getKey()),
+ Map.Entry::getValue))
+ ).collect(Collectors.toList());
+ }
+
+ /**
+ * 涓嬪垝绾垮懡鍚嶈浆椹煎嘲鍛藉悕
+ */
+ private String underlineToCamel(String param) {
+ if (param == null || "".equals(param.trim())) {
+ return "";
+ }
+ int len = param.length();
+ StringBuilder sb = new StringBuilder(len);
+ for (int i = 0; i < len; i++) {
+ char c = param.charAt(i);
+ if (c == '_') {
+ if (++i < len) {
+ sb.append(Character.toUpperCase(param.charAt(i)));
+ }
+ } else {
+ sb.append(Character.toLowerCase(c));
+ }
+ }
+ return sb.toString();
+ }
}
--
Gitblit v1.9.3