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 ++++++++++++++++++++--
doc/quality_inspect_add_qualified_columns.sql | 19 ++
src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java | 5
src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java | 30 +++
src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java | 3
src/main/java/com/ruoyi/quality/pojo/QualityInspect.java | 20 ++
src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java | 112 ++++++++-----
src/main/resources/mapper/quality/QualityInspectMapper.xml | 48 ++++-
8 files changed, 337 insertions(+), 84 deletions(-)
diff --git a/doc/quality_inspect_add_qualified_columns.sql b/doc/quality_inspect_add_qualified_columns.sql
new file mode 100644
index 0000000..d98619d
--- /dev/null
+++ b/doc/quality_inspect_add_qualified_columns.sql
@@ -0,0 +1,19 @@
+ALTER TABLE `quality_inspect`
+ ADD COLUMN `qualified_quantity` decimal(18, 2) NULL DEFAULT NULL COMMENT '鍚堟牸鏁伴噺' AFTER `quantity`,
+ ADD COLUMN `unqualified_quantity` decimal(18, 2) NULL DEFAULT NULL COMMENT '涓嶅悎鏍兼暟閲�' AFTER `qualified_quantity`,
+ ADD COLUMN `pass_rate` decimal(18, 2) NULL DEFAULT NULL COMMENT '鍚堟牸鐜�(%)' AFTER `unqualified_quantity`;
+
+-- 鍘嗗彶鏁版嵁锛氭寜鍘熴�屾娴嬬粨鏋溿�嶄笌鎬绘暟閲忓洖濉紙鏃犳�绘暟閲忓垯璺宠繃锛�
+UPDATE `quality_inspect`
+SET `unqualified_quantity` = CASE WHEN `check_result` = '涓嶅悎鏍�' THEN IFNULL(`quantity`, 0) ELSE 0 END,
+ `qualified_quantity` = CASE WHEN `check_result` = '涓嶅悎鏍�' THEN 0 ELSE IFNULL(`quantity`, 0) END
+WHERE `qualified_quantity` IS NULL
+ AND `unqualified_quantity` IS NULL
+ AND `quantity` IS NOT NULL;
+
+UPDATE `quality_inspect`
+SET `pass_rate` = CASE
+ WHEN `quantity` IS NULL OR `quantity` = 0 THEN 0
+ ELSE ROUND(IFNULL(`qualified_quantity`, 0) * 100 / `quantity`, 2)
+ END
+WHERE `pass_rate` IS NULL;
diff --git a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
index 1e94a30..e030833 100644
--- a/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
+++ b/src/main/java/com/ruoyi/home/service/impl/HomeServiceImpl.java
@@ -308,6 +308,47 @@
return analysisCustomerContractAmountsDto;
}
+ private static BigDecimal nz(BigDecimal v) {
+ return v == null ? BigDecimal.ZERO : v;
+ }
+
+ /**
+ * 澶у睆/鎶ヨ〃缁熻鐢ㄥ悎鏍兼暟閲忥細浠� qualified_quantity
+ */
+ private BigDecimal inspectQualifiedQtyForStat(QualityInspect item) {
+ if (item.getQualifiedQuantity() != null) {
+ return item.getQualifiedQuantity();
+ }
+ BigDecimal qty = nz(item.getQuantity());
+ if ("鍚堟牸".equals(item.getCheckResult())) {
+ return qty;
+ }
+ return BigDecimal.ZERO;
+ }
+
+ /**
+ * 澶у睆/鎶ヨ〃缁熻鐢ㄤ笉鍚堟牸鏁伴噺锛氫互 unqualified_quantity
+ */
+ private BigDecimal inspectUnqualifiedQtyForStat(QualityInspect item) {
+ if (item.getUnqualifiedQuantity() != null) {
+ return item.getUnqualifiedQuantity();
+ }
+ BigDecimal qty = nz(item.getQuantity());
+ String cr = item.getCheckResult();
+ if ("涓嶅悎鏍�".equals(cr) || "閮ㄥ垎鍚堟牸".equals(cr)) {
+ return qty;
+ }
+ return BigDecimal.ZERO;
+ }
+
+ private boolean inspectHasUnqualifiedVolume(QualityInspect item) {
+ return inspectUnqualifiedQtyForStat(item).compareTo(BigDecimal.ZERO) > 0;
+ }
+
+ private static int toStatInt(BigDecimal v) {
+ return nz(v).setScale(0, RoundingMode.HALF_UP).intValue();
+ }
+
@Override
public QualityStatisticsDto qualityStatistics() {
// 鑾峰彇杩戝洓涓湀鏁版嵁锛堝線鍓嶆帹涓変釜鏈堬紝鍏�4涓畬鏁存湀浠斤級
@@ -355,29 +396,27 @@
QualityStatisticsItem item = new QualityStatisticsItem();
item.setDate(monthStart.format(monthFormatter)); // 鏃ユ湡鏄剧ず涓衡�滃勾鏈堚�濓紙濡� 2025-10锛�
- // 1. 渚涘簲鍟嗘楠岋紙绫诲瀷0锛�- 鍚堟牸鏁伴噺
- BigDecimal supplierQualified = monthInspects.stream()
+ // 1锝�3锛氭湰鏈堛�屼笉鍚堟牸鏁伴噺銆嶏紙浠呭凡鎻愪氦妫�楠岋級锛屾寜妫�楠岀被鍒媶鍒嗏�斺�旂敤浜庡浘琛ㄥ浘渚嬨�屆椕椾笉鍚堟牸鏁般��
+ BigDecimal supplierUnq = monthInspects.stream()
.filter(inspect -> inspect.getInspectType().equals(0)
- && "鍚堟牸".equals(inspect.getCheckResult()))
- .map(QualityInspect::getQuantity)
+ && Objects.equals(inspect.getInspectState(), 1))
+ .map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- item.setSupplierNum(supplierQualified);
+ item.setSupplierNum(supplierUnq);
- // 2. 宸ュ簭妫�楠岋紙绫诲瀷1锛�- 鍚堟牸鏁伴噺
- BigDecimal processQualified = monthInspects.stream()
+ BigDecimal processUnq = monthInspects.stream()
.filter(inspect -> inspect.getInspectType().equals(1)
- && "鍚堟牸".equals(inspect.getCheckResult()))
- .map(QualityInspect::getQuantity)
+ && Objects.equals(inspect.getInspectState(), 1))
+ .map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- item.setProcessNum(processQualified);
+ item.setProcessNum(processUnq);
- // 3. 宸ュ巶妫�楠岋紙绫诲瀷2锛�- 鍚堟牸鏁伴噺
- BigDecimal factoryQualified = monthInspects.stream()
+ BigDecimal factoryUnq = monthInspects.stream()
.filter(inspect -> inspect.getInspectType().equals(2)
- && "鍚堟牸".equals(inspect.getCheckResult()))
- .map(QualityInspect::getQuantity)
+ && Objects.equals(inspect.getInspectState(), 1))
+ .map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add);
- item.setFactoryNum(factoryQualified);
+ item.setFactoryNum(factoryUnq);
qualityStatisticsItems.add(item);
}
@@ -1902,17 +1941,14 @@
BigDecimal unqualifiedCount = BigDecimal.ZERO;
for (QualityInspect item : list) {
- if ("鍚堟牸".equals(item.getCheckResult())) {
- qualifiedCount = qualifiedCount.add(item.getQuantity());
- } else {
- unqualifiedCount = unqualifiedCount.add(item.getQuantity());
- }
+ qualifiedCount = qualifiedCount.add(inspectQualifiedQtyForStat(item));
+ unqualifiedCount = unqualifiedCount.add(inspectUnqualifiedQtyForStat(item));
}
BigDecimal totalCount = qualifiedCount.add(unqualifiedCount);
- dto.setQualifiedCount(qualifiedCount.intValue());
- dto.setUnqualifiedCount(unqualifiedCount.intValue());
+ dto.setQualifiedCount(toStatInt(qualifiedCount));
+ dto.setUnqualifiedCount(toStatInt(unqualifiedCount));
if (totalCount.compareTo(BigDecimal.ZERO) == 0) {
dto.setQualifiedRate(BigDecimal.ZERO.setScale(2));
@@ -2175,13 +2211,8 @@
continue;
}
- BigDecimal quantity = item.getQuantity();
-
- if ("鍚堟牸".equals(item.getCheckResult())) {
- dto.setQualifiedCount(dto.getQualifiedCount().add(quantity));
- } else {
- dto.setUnqualifiedCount(dto.getUnqualifiedCount().add(quantity));
- }
+ dto.setQualifiedCount(dto.getQualifiedCount().add(inspectQualifiedQtyForStat(item)));
+ dto.setUnqualifiedCount(dto.getUnqualifiedCount().add(inspectUnqualifiedQtyForStat(item)));
}
// 璁＄畻鍚堟牸鐜�
@@ -2222,14 +2253,11 @@
BigDecimal unqualifiedCount = BigDecimal.ZERO;
for (QualityInspect item : items) {
- BigDecimal qty = item.getQuantity();
+ BigDecimal qty = nz(item.getQuantity());
totalCount = totalCount.add(qty);
- if ("鍚堟牸".equals(item.getCheckResult())) {
- qualifiedCount = qualifiedCount.add(qty);
- } else {
- unqualifiedCount = unqualifiedCount.add(qty);
- }
+ qualifiedCount = qualifiedCount.add(inspectQualifiedQtyForStat(item));
+ unqualifiedCount = unqualifiedCount.add(inspectUnqualifiedQtyForStat(item));
}
if (totalCount.compareTo(BigDecimal.ZERO) == 0) {
@@ -2358,10 +2386,10 @@
dto.setProcessNum(sumQuantity(qualityInspectList, 1)); // 杩囩▼
dto.setFactoryNum(sumQuantity(qualityInspectList, 2)); // 鍑哄巶
- // 鍋囪 qualityInspectList 鏄竴涓� List<QualityInspect> 绫诲瀷鐨勯泦鍚�
- Map<String, List<QualityInspect>> groupedByCheckResult = qualityInspectList.stream()
- .collect(Collectors.groupingBy(QualityInspect::getCheckResult));
- List<QualityInspect> qualityInspects = groupedByCheckResult.get("涓嶅悎鏍�");
+ // 瀛樺湪涓嶅悎鏍兼暟閲忕殑妫�楠屽崟锛堝惈鎸夋暟閲忔媶鍒嗙殑鏂版暟鎹紱鏃ф暟鎹粛鍙敤妫�娴嬬粨鏋滃厹搴曪級
+ List<QualityInspect> qualityInspects = qualityInspectList.stream()
+ .filter(this::inspectHasUnqualifiedVolume)
+ .collect(Collectors.toList());
if (ObjectUtils.isNull(qualityInspects) || qualityInspects.size() == 0) {
return dto;
}
@@ -2416,11 +2444,11 @@
QualityStatisticsItem item = new QualityStatisticsItem();
item.setDate(dateLabel);
- item.setSupplierNum(list.stream().filter(i -> i.getInspectType() == 0).map(QualityInspect::getQuantity)
+ item.setSupplierNum(list.stream().filter(i -> i.getInspectType() == 0).map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add));
- item.setProcessNum(list.stream().filter(i -> i.getInspectType() == 1).map(QualityInspect::getQuantity)
+ item.setProcessNum(list.stream().filter(i -> i.getInspectType() == 1).map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add));
- item.setFactoryNum(list.stream().filter(i -> i.getInspectType() == 2).map(QualityInspect::getQuantity)
+ item.setFactoryNum(list.stream().filter(i -> i.getInspectType() == 2).map(this::inspectUnqualifiedQtyForStat)
.reduce(BigDecimal.ZERO, BigDecimal::add));
return item;
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
index 405405f..3b4a4ff 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionProductMainServiceImpl.java
@@ -33,6 +33,7 @@
import com.ruoyi.production.mapper.ProductionProductMainMapper;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
@@ -187,6 +188,10 @@
qualityInspect.setModel(productModel.getModel());
qualityInspect.setUnit(productModel.getUnit());
qualityInspect.setQuantity(productQty);
+ qualityInspect.setQualifiedQuantity(productQty);
+ qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
+ qualityInspect.setPassRate(BigDecimal.valueOf(100).setScale(2, RoundingMode.HALF_UP));
+ qualityInspect.setCheckResult("鍚堟牸");
qualityInspect.setProcess(process);
qualityInspect.setInspectState(0);
qualityInspect.setInspectType(inspectType);
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 337e972..e87a975 100644
--- a/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/purchase/service/impl/PurchaseLedgerServiceImpl.java
@@ -272,6 +272,9 @@
qualityInspect.setProductModelId(saleProduct.getProductModelId());
qualityInspect.setUnit(saleProduct.getUnit());
qualityInspect.setQuantity(saleProduct.getQuantity());
+ qualityInspect.setQualifiedQuantity(saleProduct.getQuantity());
+ qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
+ qualityInspect.setPassRate(BigDecimal.valueOf(100).setScale(2, RoundingMode.HALF_UP));
qualityInspectMapper.insert(qualityInspect);
List<QualityTestStandard> qualityTestStandard = qualityTestStandardMapper.getQualityTestStandardByProductId(saleProduct.getProductId(), 0, null);
if (qualityTestStandard.size() > 0) {
@@ -931,7 +934,7 @@
}
// 闇�瑕佽川妫�锛氭壂鐮佸叆搴撹繘鍏ュ師鏉愭枡妫�楠岋紝涓嶇洿鎺ュ叆鍚堟牸搴撳瓨
if (Boolean.TRUE.equals(dbProduct.getIsChecked())) {
- // 瀛樺湪鏈�氳繃/鏈鐞嗙殑鍘熸潗鏂欐楠屽崟锛屽垯绂佹缁х画鎵爜鍏ュ簱
+ // 瀛樺湪鏈彁浜ゆ垨鍏ュ簱瀹℃壒涓殑鍘熸潗鏂欐楠屽崟锛屽垯绂佹缁х画鎵爜鍏ュ簱
Long pendingInspectCount = qualityInspectMapper.selectCount(new LambdaQueryWrapper<QualityInspect>()
.eq(QualityInspect::getInspectType, 0)
.eq(QualityInspect::getPurchaseLedgerId, purchaseId)
@@ -939,9 +942,8 @@
.and(w -> w
.isNull(QualityInspect::getInspectState)
.or(q0 -> q0.eq(QualityInspect::getInspectState, 0))
- // inspect_state=1 涔熻涓衡�滄湭澶勭悊鈥�
.or(q1 -> q1.eq(QualityInspect::getInspectState, 1)
- .isNull(QualityInspect::getCheckResult))));
+ .in(QualityInspect::getApprovalStatus, 1, 2))));
if (pendingInspectCount != null && pendingInspectCount > 0) {
throw new ServiceException("鍏ュ簱澶辫触,瀛樺湪鏈�氳繃鎴栨湭澶勭悊鐨勮川妫�璁板綍,璇峰厛澶勭悊鍚庡啀鎵爜鍏ュ簱");
}
@@ -956,9 +958,11 @@
.or(q1 -> q1.eq(QualityInspect::getInspectState, 1)
.and(r -> r.isNull(QualityInspect::getCheckResult)
.or()
- .eq(QualityInspect::getCheckResult, "鍚堟牸")))))
+ .eq(QualityInspect::getCheckResult, "鍚堟牸")
+ .or()
+ .eq(QualityInspect::getCheckResult, "閮ㄥ垎鍚堟牸")))))
.stream()
- .map(QualityInspect::getQuantity)
+ .map(this::resolveInspectCountedQuantity)
.filter(Objects::nonNull)
.reduce(BigDecimal.ZERO, BigDecimal::add);
if (inspectQty.add(inboundThisLine).compareTo(orderQty) > 0) {
@@ -1332,4 +1336,20 @@
}
return sb.toString();
}
+
+ private BigDecimal resolveInspectCountedQuantity(QualityInspect inspect) {
+ if (inspect == null) {
+ return BigDecimal.ZERO;
+ }
+ if (inspect.getInspectState() == null || inspect.getInspectState() == 0) {
+ return inspect.getQuantity() == null ? BigDecimal.ZERO : inspect.getQuantity();
+ }
+ if (inspect.getQualifiedQuantity() != null) {
+ return inspect.getQualifiedQuantity();
+ }
+ if ("鍚堟牸".equals(inspect.getCheckResult()) || "閮ㄥ垎鍚堟牸".equals(inspect.getCheckResult())) {
+ return inspect.getQuantity() == null ? BigDecimal.ZERO : inspect.getQuantity();
+ }
+ return BigDecimal.ZERO;
+ }
}
diff --git a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
index 1b903e7..3cb7eaf 100644
--- a/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
+++ b/src/main/java/com/ruoyi/quality/pojo/QualityInspect.java
@@ -94,12 +94,30 @@
private String unit;
/**
- * 鏁伴噺
+ * 鏁伴噺锛堟�绘暟閲忥紝鍒涘缓鍚庝笉鍙慨鏀癸級
*/
@Excel(name = "鏁伴噺")
private BigDecimal quantity;
/**
+ * 鍚堟牸鏁伴噺
+ */
+ @Excel(name = "鍚堟牸鏁伴噺")
+ private BigDecimal qualifiedQuantity;
+
+ /**
+ * 涓嶅悎鏍兼暟閲�
+ */
+ @Excel(name = "涓嶅悎鏍兼暟閲�")
+ private BigDecimal unqualifiedQuantity;
+
+ /**
+ * 鍚堟牸鐜囷紙%锛�
+ */
+ @Excel(name = "鍚堟牸鐜�")
+ private BigDecimal passRate;
+
+ /**
* 妫�娴嬪崟浣�
*/
@Excel(name = "妫�娴嬪崟浣�")
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;
}
diff --git a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
index 61777bb..faceef0 100644
--- a/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
+++ b/src/main/java/com/ruoyi/sales/service/impl/SalesLedgerServiceImpl.java
@@ -2965,6 +2965,9 @@
qualityInspect.setModel(dbProduct.getSpecificationModel());
qualityInspect.setUnit(resolveInspectUnit(dbProduct));
qualityInspect.setQuantity(inspectQty);
+ qualityInspect.setQualifiedQuantity(inspectQty);
+ qualityInspect.setUnqualifiedQuantity(BigDecimal.ZERO);
+ qualityInspect.setPassRate(BigDecimal.valueOf(100));
qualityInspect.setCheckResult("鍚堟牸");
qualityInspect.setInspectState(1);
qualityInspect.setApprovalStatus(1);
diff --git a/src/main/resources/mapper/quality/QualityInspectMapper.xml b/src/main/resources/mapper/quality/QualityInspectMapper.xml
index 6f84cc0..9c064b4 100644
--- a/src/main/resources/mapper/quality/QualityInspectMapper.xml
+++ b/src/main/resources/mapper/quality/QualityInspectMapper.xml
@@ -15,6 +15,9 @@
qi.model,
ifnull(pm.unit, qi.unit) as unit,
qi.quantity,
+ qi.qualified_quantity,
+ qi.unqualified_quantity,
+ qi.pass_rate,
qi.check_company,
qi.check_result,
qi.create_time,
@@ -177,10 +180,14 @@
SELECT base.modelType,
COALESCE(SUM(qi.quantity), 0) AS totalCount,
COALESCE(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END), 0) AS completedCount,
- COALESCE(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END),
- 0) AS qualifiedCount,
- COALESCE(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '涓嶅悎鏍�' THEN qi.quantity ELSE 0 END),
- 0) AS unqualifiedCount,
+ COALESCE(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.qualified_quantity,
+ CASE WHEN qi.check_result = '鍚堟牸' THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END), 0) AS qualifiedCount,
+ COALESCE(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.unqualified_quantity,
+ CASE WHEN qi.check_result IN ('涓嶅悎鏍�', '閮ㄥ垎鍚堟牸') THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END), 0) AS unqualifiedCount,
IF(COALESCE(SUM(qi.quantity), 0) = 0, 0,
ROUND(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END)
@@ -188,7 +195,10 @@
) AS completionRate,
IF(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) = 0, 0,
- ROUND(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END)
+ ROUND(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.qualified_quantity,
+ CASE WHEN qi.check_result = '鍚堟牸' THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END)
/ SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) * 100, 2)
) AS passRate
@@ -249,10 +259,14 @@
COALESCE(SUM(qi.quantity), 0) AS totalCount,
COALESCE(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END), 0) AS completedCount,
- COALESCE(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END),
- 0) AS qualifiedCount,
- COALESCE(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '涓嶅悎鏍�' THEN qi.quantity ELSE 0 END),
- 0) AS unqualifiedCount,
+ COALESCE(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.qualified_quantity,
+ CASE WHEN qi.check_result = '鍚堟牸' THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END), 0) AS qualifiedCount,
+ COALESCE(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.unqualified_quantity,
+ CASE WHEN qi.check_result IN ('涓嶅悎鏍�', '閮ㄥ垎鍚堟牸') THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END), 0) AS unqualifiedCount,
/* 瀹屾垚鐜� */
IF(COALESCE(SUM(qi.quantity), 0) = 0, 0,
@@ -261,7 +275,10 @@
/* 鍚堟牸鐜� */
IF(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) = 0, 0,
- ROUND(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END)
+ ROUND(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.qualified_quantity,
+ CASE WHEN qi.check_result = '鍚堟牸' THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END)
/ SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) * 100, 2)
) AS passRate
@@ -306,11 +323,16 @@
COALESCE(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END), 0) AS completedCount,
- COALESCE(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END),
- 0) AS qualifiedCount,
+ COALESCE(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.qualified_quantity,
+ CASE WHEN qi.check_result = '鍚堟牸' THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END), 0) AS qualifiedCount,
IF(SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) = 0, 0,
- ROUND(SUM(CASE WHEN qi.inspect_state = 1 AND qi.check_result = '鍚堟牸' THEN qi.quantity ELSE 0 END)
+ ROUND(SUM(CASE
+ WHEN qi.inspect_state = 1 THEN IFNULL(qi.qualified_quantity,
+ CASE WHEN qi.check_result = '鍚堟牸' THEN IFNULL(qi.quantity, 0) ELSE 0 END)
+ ELSE 0 END)
/ SUM(CASE WHEN qi.inspect_state = 1 THEN qi.quantity ELSE 0 END) * 100, 2)
) AS passRate
--
Gitblit v1.9.3