From de0494d7a6f99f50fa33b9487dd2ffefca82e8b6 Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 17:44:47 +0800
Subject: [PATCH] 标准库功能修改
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
index e42e414..ad73f30 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java
@@ -12,14 +12,14 @@
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
-import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.basic.dto.*;
import com.ruoyi.basic.pojo.IfsInventoryQuantity;
import com.ruoyi.common.constant.InsOrderTypeConstants;
+import com.ruoyi.common.core.domain.Result;
import com.ruoyi.common.core.domain.entity.User;
-import com.ruoyi.common.properties.WechatProperty;
+import com.ruoyi.common.config.WechatProperty;
import com.ruoyi.common.utils.LimsDateUtil;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.common.utils.SecurityUtils;
@@ -57,7 +57,6 @@
import java.time.format.DateTimeFormatter;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.stream.Collectors;
/**
* @Author zhuo
@@ -82,13 +81,10 @@
@Override
- public RawMaterialStandardTreeDto selectStandardTreeListByPartNo(String partNo) {
- if (StringUtils.isBlank(partNo)) {
- throw new ErrorException("闆朵欢鍙蜂涪澶�");
- }
+ public Result selectStandardTreeListByPartNo(String partNo) {
List<FactoryDto> factoryDtos = standardTreeMapper.selectStandardTreeListByPartNo(partNo);
if (CollectionUtil.isEmpty(factoryDtos)) {
- throw new ErrorException("闆朵欢鍙蜂负" + partNo + "鐨勫師鏉愭枡娌℃湁瀵瑰簲鐨勬爣鍑嗗簱閰嶇疆");
+ return Result.success(null, "闆朵欢鍙蜂负" + partNo + "鐨勫師鏉愭枡娌℃湁瀵瑰簲鐨勬爣鍑嗗簱閰嶇疆");
}
RawMaterialStandardTreeDto rawMaterialStandardTreeDto = new RawMaterialStandardTreeDto();
for (FactoryDto factoryDto : factoryDtos) {
@@ -107,6 +103,8 @@
rawMaterialStandardTreeDto.setLabel(sampleTypeDto.getLabel());
rawMaterialStandardTreeDto.setValue(sampleTypeDto.getValue());
rawMaterialStandardTreeDto.setChildren1(sampleTypeDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
} else {
for (SampleDto sampleDto : sampleTypeDto.getChildren()) {
if (sampleDto.getPartNo() != null && sampleDto.getPartNo().equals(partNo)) {
@@ -119,13 +117,15 @@
rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
}
}
}
}
}
}
- return rawMaterialStandardTreeDto;
+ return Result.success(rawMaterialStandardTreeDto);
}
@Override
--
Gitblit v1.9.3