From cce61ef716de4bb02c5164eedb8fe43197dee7ee Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期六, 28 三月 2026 15:26:10 +0800
Subject: [PATCH] feat(procurement): 新增采购价格管理模块及自动价格变更处理
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 89 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 76 insertions(+), 13 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 79041dc..532374f 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -24,6 +24,8 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.other.pojo.TempFile;
+import com.ruoyi.procurementrecord.dto.SimplePP;
+import com.ruoyi.procurementrecord.service.ProcurementPriceManagementService;
import com.ruoyi.project.system.domain.SysUser;
import com.ruoyi.project.system.mapper.SysUserMapper;
import com.ruoyi.purchase.dto.PurchaseLedgerDto;
@@ -50,6 +52,7 @@
import java.io.IOException;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.nio.file.Files;
import java.nio.file.Path;
import java.nio.file.Paths;
@@ -98,6 +101,8 @@
private final StringRedisTemplate redisTemplate;
+ private final ProcurementPriceManagementService procurementPriceManagementService;
+
@Value("${file.upload-dir}")
private String uploadDir;
@@ -109,7 +114,40 @@
}
return purchaseLedgerMapper.selectList(queryWrapper);
}
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public int addPurchaseTemplate(PurchaseLedgerDto purchaseLedgerDto) {
+ //褰曞叆浜�
+ SysUser sysUser = userMapper.selectUserById(purchaseLedgerDto.getRecorderId());
+ SupplierManage supplierManage = supplierManageMapper.selectById(purchaseLedgerDto.getSupplierId());
+
+ PurchaseLedger purchaseLedger = new PurchaseLedger();
+ purchaseLedgerDto.setApprovalStatus(3);
+ BeanUtils.copyProperties(purchaseLedgerDto, purchaseLedger);
+ LoginUser loginUser = SecurityUtils.getLoginUser();
+ if(ObjectUtils.isNotEmpty(loginUser) && null != loginUser.getTenantId()) {
+ purchaseLedger.setTenantId(loginUser.getTenantId());
+ }
+ purchaseLedger.setSupplierName(supplierManage.getSupplierName());
+ purchaseLedger.setRecorderName(sysUser.getNickName());
+ purchaseLedger.setPhoneNumber(sysUser.getPhonenumber());
+ purchaseLedger.setPurchaseContractNumber("11111");
+ purchaseLedger.setEntryDate(Date.from(LocalDate.now().atStartOfDay(ZoneId.systemDefault()).toInstant()));
+ purchaseLedgerMapper.insert(purchaseLedger);
+
+ // 4. 澶勭悊瀛愯〃鏁版嵁
+ List<SalesLedgerProduct> productList = purchaseLedgerDto.getProductData();
+ if (productList != null && !productList.isEmpty()) {
+ productList.forEach(product -> {
+ product.setSalesLedgerId(purchaseLedger.getId());
+ product.setType(purchaseLedgerDto.getType());
+ });
+ productList.forEach(salesLedgerProductMapper::insert);
+ }
+
+ return 1;
+ }
@Override
@Transactional(rollbackFor = Exception.class)
public int addOrEditPurchase(PurchaseLedgerDto purchaseLedgerDto) throws IOException {
@@ -153,18 +191,20 @@
} else {
purchaseLedgerMapper.updateById(purchaseLedger);
PurchaseLedger purchaseLedgerDB = purchaseLedgerMapper.selectById(purchaseLedger.getId());
- AccountExpense accountExpenseDB = accountExpenseService.getByInvoiceNumber(purchaseLedger.getPurchaseContractNumber());
- if (ObjectUtils.isEmpty(accountExpenseDB)) {
- throw new BaseException("鏀嚭绠＄悊鏃犺閲囪喘鍚堝悓鐨勬敮鍑鸿褰�");
+ List<AccountExpense> accountExpenseDBs = accountExpenseService.getByInvoiceNumberList(purchaseLedger.getPurchaseContractNumber());
+ if (!CollectionUtils.isEmpty(accountExpenseDBs)) {
+ accountExpenseDBs.forEach(accountExpenseDB ->{
+ accountExpenseDB.setExpenseDate(purchaseLedgerDB.getEntryDate());
+ accountExpenseDB.setExpenseType("0");
+ accountExpenseDB.setSupplierName(purchaseLedgerDB.getSupplierName());
+ accountExpenseDB.setExpenseMoney(purchaseLedgerDB.getContractAmount());
+ accountExpenseDB.setExpenseDescribed("閲囪喘鍚堝悓锛�" + purchaseLedgerDB.getPurchaseContractNumber());
+ accountExpenseDB.setExpenseMethod("0");
+ accountExpenseDB.setInvoiceNumber(purchaseLedgerDB.getPurchaseContractNumber());
+ accountExpenseService.updateById(accountExpenseDB);
+ });
}
- accountExpenseDB.setExpenseDate(purchaseLedgerDB.getEntryDate());
- accountExpenseDB.setExpenseType("0");
- accountExpenseDB.setSupplierName(purchaseLedgerDB.getSupplierName());
- accountExpenseDB.setExpenseMoney(purchaseLedgerDB.getContractAmount());
- accountExpenseDB.setExpenseDescribed("閲囪喘鍚堝悓锛�" + purchaseLedgerDB.getPurchaseContractNumber());
- accountExpenseDB.setExpenseMethod("0");
- accountExpenseDB.setInvoiceNumber(purchaseLedgerDB.getPurchaseContractNumber());
- accountExpenseService.updateById(accountExpenseDB);
+
}
// 4. 澶勭悊瀛愯〃鏁版嵁
@@ -185,7 +225,7 @@
if (products == null || products.isEmpty()) {
throw new BaseException("浜у搧淇℃伅涓嶅瓨鍦�");
}
-
+ PurchaseLedger ledger = purchaseLedgerMapper.selectById(salesLedgerId);
// 鎻愬墠鏀堕泦鎵�鏈夐渶瑕佹煡璇㈢殑ID
Set<Long> productIds = products.stream()
.map(SalesLedgerProduct::getProductId)
@@ -251,6 +291,28 @@
salesLedgerProductMapper.insert(salesLedgerProduct);
}
}
+
+ updateList.addAll(insertList);
+ updateList.forEach(it->{
+ SimplePP simplePP = new SimplePP();
+ simplePP.setProductId(it.getProductId());
+ simplePP.setSupplierName(ledger.getSupplierName());
+ simplePP.setSupplierId(ledger.getSupplierId());
+ simplePP.setUnit(it.getUnit());
+ simplePP.setProductName(it.getProductCategory());
+ simplePP.setSpecification(it.getSpecificationModel());
+ simplePP.setFinalPrice(it.getTaxInclusiveUnitPrice().divide(
+ BigDecimal.ONE.add(it.getTaxRate().divide(new BigDecimal("100"), 4, RoundingMode.HALF_UP)),
+ 2, // 淇濈暀4浣嶏紙鍙牴鎹笟鍔¤皟鏁达級
+ RoundingMode.HALF_UP
+ ));
+ simplePP.setRemark(
+ "绯荤粺鏍规嵁閲囪喘鎻愪氦鑷姩鐢熸垚銆傞噰璐悎鍚屽彿涓�:" + purchaseLedger.getPurchaseContractNumber() + "銆�"
+ );
+ procurementPriceManagementService.autoCreateRecord(simplePP);
+ });
+
+
// 璁＄畻鎬诲惈绋庨噾棰�
BigDecimal totalTaxInclusiveAmount = products.stream()
@@ -377,7 +439,8 @@
// 3.鏌ヨ涓婁紶鏂囦欢
LambdaQueryWrapper<CommonFile> salesLedgerFileWrapper = new LambdaQueryWrapper<>();
- salesLedgerFileWrapper.eq(CommonFile::getCommonId, purchaseLedger.getId());
+ salesLedgerFileWrapper.eq(CommonFile::getCommonId, purchaseLedger.getId())
+ .eq(CommonFile::getType,FileNameType.PURCHASE.getValue());
List<CommonFile> salesLedgerFiles = commonFileMapper.selectList(salesLedgerFileWrapper);
// 4. 杞崲 DTO
--
Gitblit v1.9.3