From 3a77c500a010d12e913ff2b9e4cf27b1115c8224 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期三, 09 四月 2025 17:26:52 +0800
Subject: [PATCH] 检验任务，进货检验车间文件选择
---
basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java | 92 ----------------------------------------------
1 files changed, 0 insertions(+), 92 deletions(-)
diff --git a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
index f144c00..918a98b 100644
--- a/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
+++ b/basic-server/src/main/java/com/ruoyi/basic/service/impl/ProductServiceImpl.java
@@ -4,25 +4,20 @@
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
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.pojo.*;
-import com.ruoyi.common.utils.StringUtils;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.List;
-
/**
* @author z1292
* @description 閽堝琛ㄣ�恜roduct(浜у搧琛�)銆戠殑鏁版嵁搴撴搷浣淪ervice瀹炵幇
@@ -34,8 +29,6 @@
implements ProductService{
private ProductMapper productMapper;
-
- private LaboratoryService laboratoryService;
private StructureTestObjectMapper structureTestObjectMapper;
@@ -129,91 +122,6 @@
.eq(ProductPart::getProductId, id));
return productMapper.deleteById(id);
- }
-
- @Transactional(rollbackFor = Exception.class)
- @Override
- public void importPartExcel(List<StructureTestObjectData> list) {
- list.forEach(i -> {
- // 妫�楠屽璞�
- 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::getId, i.getLaboratory()));
-// if (ObjectUtils.isEmpty(laboratory)) {
-// throw new BaseException("鏈壘鍒拌鍦烘墍锛�" + i.getLaboratory() + "锛岃妫�鏌ユ槸鍚﹀瓨鍦ㄨ鍦烘墍锛�");
-// }
- // 濡傛灉涓虹┖杩涜鏂板
- if (ObjectUtils.isEmpty(structureTestObject1)) {
- StructureTestObject structureTestObject = new StructureTestObject();
- 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)) {
- 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(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)) {
- 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());
- baseMapper.updateById(product);
- }
- }
- });
}
@Override
--
Gitblit v1.9.3