From 46944d762174e5b7e7a627c59928e2a3c9e03dd4 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期六, 30 五月 2026 15:23:11 +0800
Subject: [PATCH] feat(quality): 增加检验管理功能并完善库存预警
---
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 62 ++++++++++++++++++++++++++++++
1 files changed, 61 insertions(+), 1 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 7a70435..7f5712d 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -33,6 +33,8 @@
import com.ruoyi.framework.security.LoginUser;
import com.ruoyi.framework.web.domain.AjaxResult;
import com.ruoyi.framework.web.domain.R;
+import com.ruoyi.measuringinstrumentledger.mapper.SparePartsMapper;
+import com.ruoyi.measuringinstrumentledger.pojo.SpareParts;
import com.ruoyi.other.mapper.TempFileMapper;
import com.ruoyi.procurementrecord.mapper.ProcurementRecordMapper;
import com.ruoyi.procurementrecord.pojo.ProcurementRecordStorage;
@@ -116,6 +118,7 @@
private final StockInRecordService stockInRecordService;
private final StockUtils stockUtils;
private final ApprovalTemplateMapper approvalTemplateMapper;
+ private final SparePartsMapper sparePartsMapper;
@Override
public List<PurchaseLedger> selectPurchaseLedgerList(PurchaseLedger purchaseLedger) {
@@ -162,6 +165,9 @@
purchaseLedger.setRecorderId(purchaseLedgerDto.getRecorderId());
purchaseLedger.setApprovalStatus(1);
+ if (purchaseLedger.getId() == null) {
+ purchaseLedger.setStatus(1);
+ }
// 3. 鏂板鎴栨洿鏂颁富琛�
if (purchaseLedger.getId() == null) {
purchaseLedgerMapper.insert(purchaseLedger);
@@ -329,7 +335,9 @@
for (SalesLedgerProduct product : products) {
try {
boolean processed;
- if (Boolean.TRUE.equals(product.getIsChecked())) {
+ if (product.getProductType() != null && product.getProductType() == 2) {
+ processed = processPurchaseSparePart(purchaseLedger, product);
+ } else if (Boolean.TRUE.equals(product.getIsChecked())) {
processed = processPurchaseQualityProduct(purchaseLedger, product);
} else {
processed = processPurchaseDirectProduct(purchaseLedger, product);
@@ -359,6 +367,35 @@
detail.put("message", ex.getMessage());
details.add(detail);
log.error("鎵归噺鎺ㄨ繘閲囪喘鍙拌处澶辫触, purchaseLedgerId={}", id, ex);
+ }
+ }
+
+ // 鏇存柊鏀惰揣鐘舵��
+ List<Long> processedIds = details.stream()
+ .filter(d -> "SUCCESS".equals(d.get("status")) || "PARTIAL".equals(d.get("status")))
+ .map(d -> (Long) d.get("purchaseLedgerId"))
+ .filter(Objects::nonNull)
+ .collect(Collectors.toList());
+ if (!processedIds.isEmpty()) {
+ PurchaseLedgerDto statusQuery = new PurchaseLedgerDto();
+ statusQuery.setIds(processedIds);
+ IPage<PurchaseLedgerDto> statusPage = this.selectPurchaseLedgerListPage(
+ new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(1, processedIds.size()),
+ statusQuery
+ );
+ if (statusPage != null && CollectionUtils.isNotEmpty(statusPage.getRecords())) {
+ for (PurchaseLedgerDto dto : statusPage.getRecords()) {
+ PurchaseLedger update = new PurchaseLedger();
+ update.setId(dto.getId());
+ if ("瀹屽叏鍏ュ簱".equals(dto.getStockInStatus())) {
+ update.setStatus(3);
+ } else if ("鍏ュ簱涓�".equals(dto.getStockInStatus())) {
+ update.setStatus(2);
+ } else {
+ update.setStatus(1);
+ }
+ purchaseLedgerMapper.updateById(update);
+ }
}
}
@@ -517,6 +554,22 @@
return hasApprovedStockRecord(stockRecords);
}
+ private boolean processPurchaseSparePart(PurchaseLedger purchaseLedger, SalesLedgerProduct product) {
+ if (purchaseLedger == null || product == null || product.getProductModelId() == null) {
+ return false;
+ }
+ SpareParts spareParts = sparePartsMapper.selectById(product.getProductModelId());
+ if (spareParts == null) {
+ return false;
+ }
+ BigDecimal newQty = spareParts.getQuantity() != null
+ ? spareParts.getQuantity().add(product.getQuantity())
+ : product.getQuantity();
+ spareParts.setQuantity(newQty);
+ sparePartsMapper.updateById(spareParts);
+ return true;
+ }
+
private LocalDateTime toStartOfDayPlusDays(Date date, int days) {
if (date == null) {
return null;
@@ -656,6 +709,13 @@
if (productModelId != null && modelMap.containsKey(productModelId)) {
product.setSpecificationModel(modelMap.get(productModelId));
}
+
+ if (product.getProductType() != null && product.getProductType() == 2) {
+ SpareParts spareParts = sparePartsMapper.selectById(productModelId);
+ if (spareParts != null) {
+ product.setProductCategory(spareParts.getName());
+ }
+ }
}
// 鍒嗙粍澶勭悊
--
Gitblit v1.9.3