From ba5bd31ecf829d2b462bd3f62b566828b347a89a Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期二, 08 四月 2025 13:36:18 +0800
Subject: [PATCH] Merge branch 'radio_frequency' of http://114.132.189.42:9002/r/lims-ruoyi-after into radio_frequency
---
inspect-server/src/main/java/com/ruoyi/inspect/service/impl/RawMaterialOrderServiceImpl.java | 4 ++++
1 files changed, 4 insertions(+), 0 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 155010a..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
@@ -103,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)) {
@@ -115,6 +117,8 @@
rawMaterialStandardTreeDto.setLabel(sampleDto.getLabel());
rawMaterialStandardTreeDto.setValue(sampleDto.getValue());
rawMaterialStandardTreeDto.setChildren2(sampleDto.getChildren());
+ rawMaterialStandardTreeDto.setWorkShopName(sampleTypeDto.getWorkShopName());
+ rawMaterialStandardTreeDto.setWorkShopId(sampleTypeDto.getWorkShopId());
}
}
}
--
Gitblit v1.9.3