From 3b3d4d37ab1782c6790ed4ac68b06413f30c2c9b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 15 一月 2026 11:39:50 +0800
Subject: [PATCH] BOM重构增加新表

---
 src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java |   32 ++++++++++++++------------------
 1 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
index b54617f..310a723 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductStructureServiceImpl.java
@@ -1,13 +1,16 @@
 package com.ruoyi.production.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.ruoyi.basic.dto.ProductModelDto;
+import com.ruoyi.basic.dto.ProductTreeDto;
 import com.ruoyi.basic.mapper.ProductMapper;
 import com.ruoyi.basic.mapper.ProductModelMapper;
 import com.ruoyi.basic.pojo.Product;
 import com.ruoyi.basic.pojo.ProductModel;
 import com.ruoyi.production.dto.ProductStructureDto;
+import com.ruoyi.production.mapper.ProductBomMapper;
 import com.ruoyi.production.mapper.ProductStructureMapper;
 import com.ruoyi.production.pojo.ProductStructure;
 import com.ruoyi.production.service.ProductStructureService;
@@ -17,7 +20,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.HashMap;
+import java.util.ArrayList;
 import java.util.List;
 
 @Service
@@ -27,29 +30,22 @@
 
     @Autowired
     private  ProductStructureMapper productStructureMapper;
-    @Autowired
-    private ProductModelMapper productModelMapper;
-    @Autowired
-    private ProductMapper productMapper;
 
-    @Override
-    public ProductModelDto listByproductModelId(Long productModelId) {
-        ProductModel productModel = productModelMapper.selectById(productModelId);
-        Product product = productMapper.selectById(productModel.getProductId());
-        ProductModelDto productModelDto = new ProductModelDto();
-        BeanUtils.copyProperties(productModel,productModelDto);
-        productModelDto.setProductName(product.getProductName());
-        List<ProductStructureDto> productStructureDtos = productStructureMapper.listByproductModelId(productModelId);
-        productModelDto.setProductStructureList(productStructureDtos);
-        return productModelDto;
-    }
+
 
     @Override
     public Boolean addProductStructureDto(ProductStructureDto productStructureDto) {
-        this.remove(new QueryWrapper<ProductStructure>().lambda().eq(ProductStructure::getParentId, productStructureDto.getParentId()));
+        this.remove(new QueryWrapper<ProductStructure>().lambda().eq(ProductStructure::getBomId, productStructureDto.getBomId()));
         productStructureDto.getProductStructureList().forEach(productStructure -> {
-            productStructure.setParentId(productStructureDto.getParentId());
+            productStructure.setBomId(productStructureDto.getBomId());
         });
         return this.saveBatch(productStructureDto.getProductStructureList());
     }
+
+    @Override
+    public List<ProductStructureDto> listBybomId(Long bomId) {
+        List<ProductStructureDto> tree = productStructureMapper.listBybomId(bomId);
+        return tree;
+
+    }
 }

--
Gitblit v1.9.3