From e9e88eefcc8abd2b1e187d28c7666e80307e97cc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 09 五月 2026 14:59:33 +0800
Subject: [PATCH] 不合格处理：切换新的OA流程
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
index 060cb87..621ddeb 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/InsOrderPlanServiceImpl.java
@@ -811,7 +811,7 @@
)
.ne(InsProduct::getIsBinding, 1));
insProducts.addAll(insProductMapper.selectFiberInsProduct(InsSampleIds, laboratory));
- if (insProducts.size() > 0) {
+ if (!insProducts.isEmpty()) {
String str = "";
int count = 0;
for (InsProduct product : insProducts) {
@@ -1716,8 +1716,8 @@
for (int i = startIndex; i < endIndex; i++) {
String cableTag = cableTags.get(i);
for (SampleProductExportDto sDto : collect.get(s)) {
- tellSet.add(sDto.getTell());
if (sDto.getCableTag().equals(cableTag)) {
+ tellSet.add(sDto.getTell());
lastValueList.add(sDto.getLastValue());
}
}
@@ -1765,7 +1765,7 @@
IfsInventoryQuantity ifsInventoryQuantity = ifsInventoryQuantityMapper.selectById(insOrder.getIfsInventoryId());
//鏌ヨ闆朵欢灞炴��
IfsPartPropsRecord ifsPartPropsRecord = ifsPartPropsRecordMapper.selectOne(Wrappers.<IfsPartPropsRecord>lambdaQuery()
- .eq(IfsPartPropsRecord::getIfsInventoryId, ifsInventoryQuantity.getId()));
+ .eq(IfsPartPropsRecord::getIfsInventoryId, ifsInventoryQuantity.getId()).last("limit 1"));
if (Objects.nonNull(ifsPartPropsRecord)) {
enterFactoryReport.setOuterColor(StringUtils.equals(ifsPartPropsRecord.getOuterColor(),"/")?ifsPartPropsRecord.getInsulationColor():ifsPartPropsRecord.getOuterColor());
}
--
Gitblit v1.9.3