1.零件绑定 2.给对象绑定车间 3.检验对象导入模板讨论及联调导入功能 4.检验对象查询优化

liding

2025-03-19 5864e92e24a5fee0a5fed15b505933ac10df5cf4

 basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java

@@ -8,19 +8,15 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.basic.dto.StructureTestObjectDto;
import com.ruoyi.basic.mapper.*;
import com.ruoyi.basic.service.*;
import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.common.utils.QueryWrappers;
import com.ruoyi.basic.dto.ProductDTO1;
import com.ruoyi.basic.excel.StructureTestObjectData;
import com.ruoyi.basic.mapper.ProductMapper;
import com.ruoyi.basic.mapper.ProductPartMapper;
import com.ruoyi.basic.mapper.StandardTreeMapper;
import com.ruoyi.basic.mapper.StructureTestObjectMapper;
import com.ruoyi.basic.pojo.*;
import com.ruoyi.basic.service.LaboratoryService;
import com.ruoyi.basic.service.ProductService;
import com.ruoyi.basic.service.StandardProductListService;
import com.ruoyi.basic.service.StructureItemParameterService;
import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -28,10 +24,10 @@
import java.util.List;

/**
* @author z1292
* @description 针对表【product(产品表)】的数据库操作Service实现
* @createDate 2024-04-26 01:11:02
*/
 * @author z1292
 * @description 针对表【product(产品表)】的数据库操作Service实现
 * @createDate 2024-04-26 01:11:02
 */
@Service
@AllArgsConstructor
public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product>
@@ -45,11 +41,17 @@

    private ProductPartMapper productPartMapper;


    private StandardProductListService standardProductListService;


    private StandardTreeMapper standardTreeMapper;


    private StructureItemParameterService structureItemParameterService;


    private WorkShopMapper workShopMapper;

    @Override
    public IPage<Product> selectProductListByObjectId(Page page, ProductDTO1 product) {
@@ -137,46 +139,74 @@
            StructureTestObject structureTestObject1 = structureTestObjectMapper.selectOne(Wrappers.<StructureTestObject>lambdaQuery()
                    .eq(StructureTestObject::getSpecimenName, i.getSpecimenName())
                    .eq(StructureTestObject::getSpecimenNameEn, i.getSpecimenNameEn()));
            Laboratory laboratory = laboratoryService.getOne(Wrappers.<Laboratory>lambdaQuery()
                    .eq(Laboratory::getLaboratoryName, i.getLaboratory()));
            if (ObjectUtils.isEmpty(laboratory)) {
                throw new BaseException("未找到该场所：" + i.getLaboratory() + "，请检查是否存在该场所！");
            }
//            Laboratory laboratory = laboratoryService.getOne(Wrappers.<Laboratory>lambdaQuery()
//                    .eq(Laboratory::getId, i.getLaboratory()));
//            if (ObjectUtils.isEmpty(laboratory)) {
//                throw new BaseException("未找到该场所：" + i.getLaboratory() + "，请检查是否存在该场所！");
//            }
            // 如果为空进行新增
            if(ObjectUtils.isEmpty(structureTestObject1)) {
            if (ObjectUtils.isEmpty(structureTestObject1)) {
                StructureTestObject structureTestObject = new StructureTestObject();
                structureTestObject.setLaboratoryId(laboratory.getId());
                structureTestObject.setLaboratoryId(9);
                structureTestObject.setSpecimenName(i.getSpecimenName());
                structureTestObject.setSpecimenNameEn(i.getSpecimenNameEn());
                structureTestObject.setCode(i.getCode());
                structureTestObject.setWorkShopName("");
                structureTestObjectMapper.insert(structureTestObject);

                // 产品
                Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
                        .eq(Product::getName, i.getName())
                        .eq(Product::getNameEn, i.getNameEn()));
                if (ObjectUtils.isEmpty(product)){
                if (ObjectUtils.isEmpty(product)) {
                    Product product1 = new Product();
                    product1.setName(i.getName());
                    product1.setNameEn(i.getNameEn());
                    if (StringUtils.isNotEmpty(i.getWorkShopName())) {
                        WorkShop workShop = workShopMapper.selectOne(Wrappers.<WorkShop>lambdaQuery().eq(WorkShop::getName, i.getWorkShopName()));
                        if (workShop == null){
                            throw new BaseException("请先维护车间信息");
                        }else {
                            product1.setWorkShopId(workShop.getId());
                        }
                    }
                    product1.setWorkShopName(i.getWorkShopName());
                    product1.setObjectId(structureTestObject.getId());
                    baseMapper.insert(product1);
                }
            } else {
                structureTestObject1.setCode(i.getCode());
                structureTestObject1.setLaboratoryId(laboratory.getId());
                structureTestObject1.setLaboratoryId(9);
                structureTestObjectMapper.updateById(structureTestObject1);
                // 产品
                Product product = productMapper.selectOne(Wrappers.<Product>lambdaQuery()
                        .eq(Product::getName, i.getName())
                        .eq(Product::getNameEn, i.getNameEn()));
                if (ObjectUtils.isEmpty(product)){
                if (ObjectUtils.isEmpty(product)) {
                    Product product1 = new Product();
                    if (StringUtils.isNotEmpty(i.getWorkShopName())) {
                        WorkShop workShop =  workShopMapper.selectOne(Wrappers.<WorkShop>lambdaQuery().eq(WorkShop::getName, i.getWorkShopName()));
                        if (workShop == null){
                            throw new BaseException("请先维护车间信息");
                        }else {
                            product1.setWorkShopId(workShop.getId());
                        }
                    }
                    product1.setWorkShopName(i.getWorkShopName());
                    product1.setName(i.getName());
                    product1.setNameEn(i.getNameEn());
                    product1.setObjectId(structureTestObject1.getId());
                    baseMapper.insert(product1);
                } else {
                    if (StringUtils.isNotEmpty(i.getWorkShopName())) {
                        WorkShop workShop =  workShopMapper.selectOne(Wrappers.<WorkShop>lambdaQuery().eq(WorkShop::getName, i.getWorkShopName()));
                        if (workShop == null){
                            throw new BaseException("请先维护车间信息");
                        }else {
                            product.setWorkShopId(workShop.getId());
                        }
                    }
                    product.setWorkShopName(i.getWorkShopName());
                    product.setName(i.getName());
                    product.setNameEn(i.getNameEn());
                    product.setObjectId(structureTestObject1.getId());
@@ -187,10 +217,18 @@
    }

    @Override
    public int updateWorkShop(Integer productId, Integer workShopId,String name) {
    public int updateWorkShop(Integer productId, Integer workShopId, String name) {
        return productMapper.update(null, Wrappers.<Product>lambdaUpdate()
                .set(Product::getWorkShopId, workShopId)
                .set(Product::getWorkShopName, name)
                .eq(Product::getId, productId));
    }

    @Override
    public int updateObjectWorkShop(StructureTestObjectDto structureTestObjectDto) {
        return structureTestObjectMapper.update(null, Wrappers.<StructureTestObject>lambdaUpdate()
                .set(StructureTestObject::getWorkShopId, structureTestObjectDto.getWorkShopId())
                .set(StructureTestObject::getWorkShopName, structureTestObjectDto.getWorkShopName())
                .eq(StructureTestObject::getId, structureTestObjectDto.getId()));
    }
}