From 054381d20e23e30cfb3fe962e00be6a3ded3ee2b Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 15 五月 2026 15:51:03 +0800
Subject: [PATCH] feat: 质检数量区分合格/不合格数量
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 184 ++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 161 insertions(+), 23 deletions(-)
diff --git a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
index d030eac..f9a1d42 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -42,6 +42,7 @@
import java.io.InputStream;
import java.io.OutputStream;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.List;
@@ -74,6 +75,9 @@
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
qualityInspect.setInspectState(0);//榛樿鏈彁浜�
+ ensureQualifiedSplitDefaults(qualityInspect);
+ // 鍓嶇鑻ュ凡浼犲悎鏍�/涓嶅悎鏍兼暟閲忥紝defaults 涓嶄細鍐� pass_rate锛岃繖閲岃ˉ绠楀垪琛ㄥ睍绀虹敤鍚堟牸鐜�
+ refreshPassRateFromQuantities(qualityInspect);
qualityInspectMapper.insert(qualityInspect);
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
qualityInspectParam.setInspectId(qualityInspect.getId());
@@ -96,41 +100,147 @@
@Override
public int submit(QualityInspect inspect) {
QualityInspect qualityInspect = qualityInspectMapper.selectById(inspect.getId());
- //鎻愪氦鍓嶅繀椤诲垽鏂槸鍚﹀悎鏍�
- if (ObjectUtils.isNull(qualityInspect.getCheckResult())) {
- throw new RuntimeException("璇峰厛鍒ゆ柇鏄惁鍚堟牸");
+ if (qualityInspect == null) {
+ throw new RuntimeException("璐ㄦ鍗曚笉瀛樺湪");
}
- /*鍒ゆ柇涓嶅悎鏍�*/
- if (qualityInspect.getCheckResult().equals("涓嶅悎鏍�")) {
+ if (Objects.equals(qualityInspect.getInspectState(), 1)) {
+ throw new RuntimeException("璇ヨ川妫�鍗曞凡鎻愪氦锛屼笉鑳介噸澶嶆彁浜�");
+ }
+ if (inspect != null) {
+ if (inspect.getQualifiedQuantity() != null) {
+ qualityInspect.setQualifiedQuantity(inspect.getQualifiedQuantity());
+ }
+ if (inspect.getUnqualifiedQuantity() != null) {
+ qualityInspect.setUnqualifiedQuantity(inspect.getUnqualifiedQuantity());
+ }
+ }
+ validateAndCalculateQuantities(qualityInspect);
+
+ BigDecimal qualifiedQty = qualityInspect.getQualifiedQuantity();
+ BigDecimal unqualifiedQty = qualityInspect.getUnqualifiedQuantity();
+
+ if (unqualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
QualityUnqualified qualityUnqualified = new QualityUnqualified();
BeanUtils.copyProperties(qualityInspect, qualityUnqualified);
- qualityUnqualified.setInspectState(0);//寰呭鐞�
- List<QualityInspectParam> inspectParams = qualityInspectParamService.list(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, inspect.getId()));
- String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
- qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
+ qualityUnqualified.setId(null);
+ qualityUnqualified.setQuantity(unqualifiedQty);
+ qualityUnqualified.setInspectState(0);
+ qualityUnqualified.setDefectivePhenomena(buildDefectivePhenomena(qualityInspect));
qualityUnqualified.setInspectId(qualityInspect.getId());
qualityUnqualifiedMapper.insert(qualityUnqualified);
- } else {
- // 鍘熸潗鏂欐楠屽悎鏍煎悗锛屽厛鍙戣捣鈥滃叆搴撳鎵光�濓紝瀹℃壒閫氳繃鍚庡啀鍏ュ簱
+ }
+
+ if (qualifiedQty.compareTo(BigDecimal.ZERO) > 0) {
if (Objects.equals(qualityInspect.getInspectType(), 0)) {
- submitQualifiedInboundApprove(qualityInspect);
+ Long ledgerId = qualityInspect.getPurchaseLedgerId();
+ PurchaseLedger purchaseLedger = ledgerId == null ? null : purchaseLedgerMapper.selectById(ledgerId);
+ if (purchaseLedger != null) {
+ submitQualifiedInboundApprove(qualityInspect);
+ } else {
+ // 鎵嬪姩鏂板鐨勫師鏉愭枡妫�楠岋細鏃犻噰璐彴璐︼紝涓嶈蛋閲囪喘鍏ュ簱瀹℃壒锛岀洿鎺ュ叆鍚堟牸搴撳瓨锛堜笌杩囩▼/鍑哄巶妫�楠屼竴鑷达級
+ stockUtils.addStock(
+ null,
+ null,
+ qualityInspect.getProductModelId(),
+ qualifiedQty,
+ StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
+ qualityInspect.getId()
+ );
+ syncQualifiedInboundToPurchaseProducts(qualityInspect, qualifiedQty);
+ }
} else {
- // 鐩存帴鍏ュ簱
stockUtils.addStock(
- qualityInspect.getPurchaseLedgerId() == null ? null : qualityInspect.getPurchaseLedgerId().longValue(),
+ qualityInspect.getPurchaseLedgerId() == null ? null : qualityInspect.getPurchaseLedgerId(),
null,
qualityInspect.getProductModelId(),
- qualityInspect.getQuantity(),
+ qualifiedQty,
StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
qualityInspect.getId()
);
- syncQualifiedInboundToPurchaseProducts(qualityInspect);
+ syncQualifiedInboundToPurchaseProducts(qualityInspect, qualifiedQty);
}
}
- qualityInspect.setInspectState(1);//宸叉彁浜�
+
+ qualityInspect.setCheckResult(resolveCheckResult(qualifiedQty, unqualifiedQty));
+ qualityInspect.setInspectState(1);
int updated = qualityInspectMapper.updateById(qualityInspect);
refreshPurchaseLedgerStockStatusByInspect(qualityInspect.getPurchaseLedgerId());
return updated;
+ }
+
+ private void validateAndCalculateQuantities(QualityInspect qualityInspect) {
+ if (qualityInspect.getQualifiedQuantity() == null || qualityInspect.getUnqualifiedQuantity() == null) {
+ throw new RuntimeException("璇峰～鍐欏悎鏍兼暟閲忓拰涓嶅悎鏍兼暟閲�");
+ }
+ if (qualityInspect.getQualifiedQuantity().compareTo(BigDecimal.ZERO) < 0
+ || qualityInspect.getUnqualifiedQuantity().compareTo(BigDecimal.ZERO) < 0) {
+ throw new RuntimeException("鍚堟牸鏁伴噺鍜屼笉鍚堟牸鏁伴噺涓嶈兘涓鸿礋鏁�");
+ }
+ if (qualityInspect.getQuantity() == null) {
+ throw new RuntimeException("璐ㄦ鍗曟�绘暟閲忓紓甯�");
+ }
+ BigDecimal total = qualityInspect.getQualifiedQuantity().add(qualityInspect.getUnqualifiedQuantity());
+ BigDecimal qtyScaled = qualityInspect.getQuantity().setScale(4, RoundingMode.HALF_UP);
+ BigDecimal sumScaled = total.setScale(4, RoundingMode.HALF_UP);
+ if (sumScaled.compareTo(qtyScaled) > 0) {
+ throw new RuntimeException("鍚堟牸鏁伴噺涓庝笉鍚堟牸鏁伴噺涔嬪拰涓嶈兘瓒呰繃鎬绘暟閲�");
+ }
+ qualityInspect.setPassRate(calculatePassRate(qualityInspect.getQualifiedQuantity(), qualityInspect.getQuantity()));
+ }
+
+ /**
+ * 鏂板鏃惰嫢鏈媶鍒嗗悎鏍�/涓嶅悎鏍硷紝榛樿鍏ㄩ儴涓哄緟妫�鍚堟牸鏁�
+ */
+ private void ensureQualifiedSplitDefaults(QualityInspect q) {
+ if (q.getQuantity() == null) {
+ return;
+ }
+ if (q.getQualifiedQuantity() == null && q.getUnqualifiedQuantity() == null) {
+ q.setQualifiedQuantity(q.getQuantity());
+ q.setUnqualifiedQuantity(BigDecimal.ZERO);
+ q.setPassRate(calculatePassRate(q.getQualifiedQuantity(), q.getQuantity()));
+ if (q.getCheckResult() == null || q.getCheckResult().isEmpty()) {
+ q.setCheckResult("鍚堟牸");
+ }
+ }
+ }
+
+ private BigDecimal calculatePassRate(BigDecimal qualifiedQty, BigDecimal totalQty) {
+ if (totalQty == null || totalQty.compareTo(BigDecimal.ZERO) <= 0 || qualifiedQty == null) {
+ return BigDecimal.ZERO;
+ }
+ return qualifiedQty.multiply(BigDecimal.valueOf(100))
+ .divide(totalQty, 2, RoundingMode.HALF_UP);
+ }
+
+ private void refreshPassRateFromQuantities(QualityInspect q) {
+ if (q.getQuantity() == null || q.getQualifiedQuantity() == null) {
+ return;
+ }
+ q.setPassRate(calculatePassRate(q.getQualifiedQuantity(), q.getQuantity()));
+ }
+
+ private String resolveCheckResult(BigDecimal qualifiedQty, BigDecimal unqualifiedQty) {
+ if (unqualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return "鍚堟牸";
+ }
+ if (qualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
+ return "涓嶅悎鏍�";
+ }
+ return "閮ㄥ垎鍚堟牸";
+ }
+
+ private String buildDefectivePhenomena(QualityInspect qualityInspect) {
+ if (ObjectUtils.isNotEmpty(qualityInspect.getDefectivePhenomena())) {
+ return qualityInspect.getDefectivePhenomena();
+ }
+ List<QualityInspectParam> inspectParams = qualityInspectParamService.list(
+ Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, qualityInspect.getId()));
+ if (inspectParams.isEmpty()) {
+ return "璐ㄦ涓嶅悎鏍兼暟閲忥細" + qualityInspect.getUnqualifiedQuantity();
+ }
+ String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
+ return text + "绛夋寚鏍囨楠屼笉鍚堟牸锛屼笉鍚堟牸鏁伴噺锛�" + qualityInspect.getUnqualifiedQuantity();
}
private void submitQualifiedInboundApprove(QualityInspect qualityInspect) {
@@ -188,18 +298,22 @@
if (!Objects.equals(qualityInspect.getInspectType(), 0)) {
throw new RuntimeException("瀹℃壒澶辫触锛屼粎鍘熸潗鏂欐楠屾敮鎸佸叆搴撳鎵�");
}
- if (!Objects.equals(qualityInspect.getInspectState(), 1) || !"鍚堟牸".equals(qualityInspect.getCheckResult())) {
+ if (!Objects.equals(qualityInspect.getInspectState(), 1)) {
throw new RuntimeException("瀹℃壒澶辫触锛屽綋鍓嶈川妫�鍗曠姸鎬佷笉鍏佽鍏ュ簱");
+ }
+ BigDecimal qualifiedQty = qualityInspect.getQualifiedQuantity();
+ if (qualifiedQty == null || qualifiedQty.compareTo(BigDecimal.ZERO) <= 0) {
+ throw new RuntimeException("瀹℃壒澶辫触锛屾棤鍚堟牸鏁伴噺鍙叆搴�");
}
stockUtils.addStock(
qualityInspect.getPurchaseLedgerId() == null ? null : qualityInspect.getPurchaseLedgerId().longValue(),
null,
qualityInspect.getProductModelId(),
- qualityInspect.getQuantity(),
+ qualifiedQty,
StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
qualityInspect.getId()
);
- syncQualifiedInboundToPurchaseProducts(qualityInspect);
+ syncQualifiedInboundToPurchaseProducts(qualityInspect, qualifiedQty);
refreshPurchaseLedgerStockStatusByInspect(qualityInspect.getPurchaseLedgerId());
qualityInspect.setApprovalStatus(3);
qualityInspectMapper.updateById(qualityInspect);
@@ -272,6 +386,13 @@
@Override
public int updateQualityInspect(QualityInspectDto qualityInspectDto) {
+ QualityInspect existing = qualityInspectMapper.selectById(qualityInspectDto.getId());
+ if (existing == null) {
+ throw new RuntimeException("璐ㄦ鍗曚笉瀛樺湪");
+ }
+ if (Objects.equals(existing.getInspectState(), 1)) {
+ throw new RuntimeException("宸叉彁浜ょ殑鏁版嵁涓嶅厑璁镐慨鏀�");
+ }
if (ObjectUtils.isNotNull(qualityInspectDto.getQualityInspectParams())) {
qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, qualityInspectDto.getId()));
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
@@ -281,6 +402,24 @@
}
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
+ qualityInspect.setQuantity(existing.getQuantity());
+
+ BigDecimal qf = qualityInspect.getQualifiedQuantity() != null ? qualityInspect.getQualifiedQuantity() : existing.getQualifiedQuantity();
+ BigDecimal uqf = qualityInspect.getUnqualifiedQuantity() != null ? qualityInspect.getUnqualifiedQuantity() : existing.getUnqualifiedQuantity();
+ if (qf == null || uqf == null) {
+ BigDecimal qty = existing.getQuantity() != null ? existing.getQuantity() : BigDecimal.ZERO;
+ if ("涓嶅悎鏍�".equals(existing.getCheckResult())) {
+ qf = BigDecimal.ZERO;
+ uqf = qty;
+ } else {
+ qf = qty;
+ uqf = BigDecimal.ZERO;
+ }
+ }
+ qualityInspect.setQualifiedQuantity(qf);
+ qualityInspect.setUnqualifiedQuantity(uqf);
+ validateAndCalculateQuantities(qualityInspect);
+ qualityInspect.setCheckResult(resolveCheckResult(qf, uqf));
return qualityInspectMapper.updateById(qualityInspect);
}
@@ -340,17 +479,16 @@
}
}
- private void syncQualifiedInboundToPurchaseProducts(QualityInspect qualityInspect) {
+ private void syncQualifiedInboundToPurchaseProducts(QualityInspect qualityInspect, BigDecimal inboundQty) {
if (qualityInspect == null) {
return;
}
if (!Objects.equals(qualityInspect.getInspectType(), 0) || qualityInspect.getPurchaseLedgerId() == null) {
return;
}
- if (qualityInspect.getProductModelId() == null || qualityInspect.getQuantity() == null) {
+ if (qualityInspect.getProductModelId() == null || inboundQty == null) {
return;
}
- BigDecimal inboundQty = qualityInspect.getQuantity();
if (inboundQty.compareTo(BigDecimal.ZERO) <= 0) {
return;
}
--
Gitblit v1.9.3