From 958e45e28ca4f591ab13f2c6f4fe27d57c4880d5 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期六, 04 十一月 2023 15:19:31 +0800
Subject: [PATCH] Changes
---
mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java | 34 ++++++++++++++++------------------
1 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java
index 6f9b49e..e853f3a 100644
--- a/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java
+++ b/mes-basic/src/main/java/com/chinaztt/mes/basic/service/impl/WarehouseServiceImpl.java
@@ -21,13 +21,10 @@
import cn.hutool.core.io.IoUtil;
import cn.hutool.core.util.IdUtil;
import cn.hutool.core.util.StrUtil;
-import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-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.chinaztt.mes.basic.entity.Factory;
import com.chinaztt.mes.basic.entity.Warehouse;
import com.chinaztt.mes.basic.excel.WarehouseData;
import com.chinaztt.mes.basic.mapper.FactoryMapper;
@@ -43,6 +40,7 @@
import lombok.SneakyThrows;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletResponse;
@@ -50,6 +48,7 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
/**
* 浠撳簱鍩虹鏁版嵁
@@ -130,35 +129,34 @@
}
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importWarehouseExcel(List<WarehouseData> list) {
if (CollectionUtil.isEmpty(list)) {
return;
}
- List<SysDictItem> dict = dictUtils.getDict("warehouse_type");
- List<Factory> factoryList =factoryMapper.selectList(null);
+ List<SysDictItem> dict = dictUtils.getDict("storehouse_type");
for (WarehouseData data :list){
+ QueryWrapper<Warehouse> wrapper = new QueryWrapper<>();
+ wrapper.lambda().eq(Warehouse::getWarehouseNo,data.getWarehouseNo());
+ Warehouse warehouse1 = baseMapper.selectOne(wrapper);
+ if(!Objects.isNull(warehouse1)){
+ log.error("浠撳簱缂栧彿閲嶅");
+ continue;
+ }
Warehouse warehouse = new Warehouse();
dict.forEach(a -> {
if (a.getLabel().equals(data.getType())){
warehouse.setWarehouseType(a.getValue());
}
});
- factoryList.forEach(b -> {
- if (b.getFactoryName().equals(data.getFactoryName())){
- warehouse.setFactoryId(b.getId());
- }
- });
- if (warehouse.getFactoryId()==null){
- log.error("宸ュ巶:" + data.getWarehouseName() + "涓嶅瓨鍦�");
- continue;
+ if("鍚敤".equals(data.getState())){
+ warehouse.setWarehouseStatus(1);
+ }else{
+ warehouse.setWarehouseStatus(0);
}
- if(warehouse.getWarehouseType()==null){
- log.error("浠撳簱绫诲瀷:" + data.getType() + "涓嶅瓨鍦�");
- continue;
- };
warehouse.setWarehouseNo(data.getWarehouseNo());
warehouse.setWarehouseName(data.getWarehouseName());
- warehouse.setWarehouseStatus(1);
+ //warehouse.setWarehouseStatus(1);
baseMapper.insert(warehouse);
}
}
--
Gitblit v1.9.3