From d92655691ec5e527dfbec16f402fde827cb69dc1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 13 五月 2026 17:17:54 +0800
Subject: [PATCH] fix(quality): 解决质量检验参数ID重复问题
---
src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java | 11 ++++++-----
1 files changed, 6 insertions(+), 5 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 a128dd3..8639289 100644
--- a/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
+++ b/src/main/java/com/ruoyi/quality/service/impl/QualityInspectServiceImpl.java
@@ -79,7 +79,7 @@
QualityInspect qualityInspect = new QualityInspect();
BeanUtils.copyProperties(qualityInspectDto, qualityInspect);
if (qualityInspectDto.getInspectType() != 0) {
- qualityInspectDto.setCustomer("闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�");
+ qualityInspectDto.setCustomer("闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�");
}
qualityInspect.setInspectState(0);//榛樿鏈彁浜�
qualityInspectMapper.insert(qualityInspect);
@@ -112,7 +112,7 @@
ProductWorkOrder productWorkOrder = productWorkOrderMapper.selectById(productionProductMain.getWorkOrderId());
ProductOrder productOrder = productOrderMapper.selectById(productWorkOrder.getProductOrderId());
batchNo = productOrder.getBatchNo();
- customer = "闀挎不甯傝酱鎵垮埗閫犳湁闄愬叕鍙�";
+ customer = "闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�";
} else {
batchNo = qualityInspect.getBatchNo();
customer = qualityInspect.getSupplier();
@@ -131,13 +131,13 @@
String text = inspectParams.stream().map(QualityInspectParam::getParameterItem).collect(Collectors.joining(","));
qualityUnqualified.setDefectivePhenomena(text + "杩欎簺鎸囨爣涓瓨鍦ㄤ笉鍚堟牸");//涓嶅悎鏍肩幇璞�
qualityUnqualified.setInspectId(qualityInspect.getId());
- qualityUnqualified.setProductionDate(inspect.getProductionDate());
- qualityUnqualified.setBatchNo(inspect.getBatchNo());
+ qualityUnqualified.setProductionDate(qualityInspect.getProductionDate());
+ qualityUnqualified.setBatchNo(batchNo);
qualityUnqualifiedMapper.insert(qualityUnqualified);
} else {
//鍚堟牸鐩存帴鍏ュ簱
stockUtils.addStock(qualityInspect.getProductModelId(), qualityInspect.getQuantity(), StockInQualifiedRecordTypeEnum.QUALITYINSPECT_STOCK_IN.getCode(),
- qualityInspect.getId(), batchNo, customer,inspect.getProductionDate()
+ qualityInspect.getId(), batchNo, customer != null ? customer : "闀挎不甯傚仴榻块娇绉戝櫒鏉愭湁闄愬叕鍙�", inspect.getProductionDate()
);
}
qualityInspect.setInspectState(1);//宸叉彁浜�
@@ -202,6 +202,7 @@
qualityInspectParamService.remove(Wrappers.<QualityInspectParam>lambdaQuery().eq(QualityInspectParam::getInspectId, qualityInspectDto.getId()));
for (QualityInspectParam qualityInspectParam : qualityInspectDto.getQualityInspectParams()) {
qualityInspectParam.setInspectId(qualityInspectDto.getId());
+ qualityInspectParam.setId(null);
}
qualityInspectParamService.saveBatch(qualityInspectDto.getQualityInspectParams());
}
--
Gitblit v1.9.3