2024年4月11日17:33:32

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/ICorpsDescClient.java

@@ -52,6 +52,8 @@ public interface ICorpsDescClient {
 	String UPDATE_INTEGRAL = API_PREFIX + "/updateIntegral";
 	String UPDATE_CORPS = API_PREFIX + "/updateCorps";
 	String REVOKE_UPDATE_INTEGRAL = API_PREFIX + "/revokeUpdateCorps";
+
+	String GET_CORP_LIST_BY_CORP_NAME = API_PREFIX + "/getCorpListByCorpName";
 	@PostMapping(CORPS_UPDATE)
 	R corpsUpdate(@RequestBody CorpsDesc corpsDesc);
 
@@ -219,4 +221,7 @@ public interface ICorpsDescClient {
 
 	@PostMapping(REVOKE_UPDATE_INTEGRAL)
 	R revokeUpdateIntegral(@RequestBody Order order);
+
+	@GetMapping(GET_CORP_LIST_BY_CORP_NAME)
+	R<List<CorpsDesc>> getCorpListByCorpName(@RequestParam("corpName") String corpName);
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IGoodsDescClient.java

@@ -43,6 +43,8 @@ public interface IGoodsDescClient {
 	String SELECT_GOODS_SPECIFICATION_ALL = API_PREFIX + "selectGoodsSpecificationAll";
 	String GET_GOODS_IDS = API_PREFIX + "/getGoodsIds";
 	String GET_GOODS_TYPE_ID = API_PREFIX + "/getGoodsTypeId";
+
+	String GET_GOODS_LIST_BY_CODE = API_PREFIX + "/getGoodsListByCode";
 	String GET_GOODS_FILES = API_PREFIX + "/getGoodsFiles";
 
 	/**
@@ -255,4 +257,7 @@ public interface IGoodsDescClient {
 	 */
 	@GetMapping(GET_GOODS_TYPE_ID)
 	List<GoodsType> getGoodsTypeId(@RequestParam("goodsTypeId") String goodsTypeId);
+
+	@GetMapping(GET_GOODS_LIST_BY_CODE)
+	R<List<GoodsDesc>> getGoodsListByCode(@RequestParam("code") String code);
 }

blade-service-api/blade-client-api/src/main/java/org/springblade/client/feign/IStorageClient.java

@@ -31,6 +31,8 @@ public interface IStorageClient {
 	String GET_STORAGE_DESC_ALL = API_PREFIX + "/selectStorageDescAll";
 	String STORAGE_BY_IDS = API_PREFIX + "/selectStorageIds";
 
+	String GET_STORAGE_LIST = API_PREFIX + "/getStorageList";
+
     @GetMapping(FIND_BY_ID)
 	StorageDesc findById(@RequestParam(value = "id",required = true) Long id);
 
@@ -76,4 +78,7 @@ public interface IStorageClient {
 	 */
 	@GetMapping(GET_STORAGE_DESC_ALL)
 	List<StorageDesc> selectStorageDescAll();
+
+	@GetMapping(GET_STORAGE_LIST)
+	R<List<StorageDesc>> getStorageList(@RequestParam("storageName")String storageName);
 }

blade-service/blade-box-tube/src/main/java/org/springblade/box/tube/service/impl/TradingBoxServiceImpl.java

@@ -1257,6 +1257,8 @@ public class TradingBoxServiceImpl extends ServiceImpl<TradingBoxMapper, Trading
 				} else {
 					tradingBoxItem.setStatus("录入");
 				}
+			}else{
+				tradingBoxItem.setStatus("录入");
 			}
 			tradingBoxItem.setCreateUser(AuthUtil.getUserId());
 			tradingBoxItem.setCreateTime(new Date());

blade-service/blade-client/src/main/java/org/springblade/client/corps/feign/CorpsDescClient.java

@@ -426,4 +426,13 @@ public class CorpsDescClient implements ICorpsDescClient {
 		return R.data("操作成功");
 	}
 
+	@Override
+	public R<List<CorpsDesc>> getCorpListByCorpName(String corpName) {
+		LambdaQueryWrapper<CorpsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(CorpsDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(CorpsDesc::getIsDeleted, 0)
+			.apply("find_in_set(cname,'"+corpName+"')");
+		return R.data(service.list(lambdaQueryWrapper));
+	}
+
 }

blade-service/blade-client/src/main/java/org/springblade/client/goods/feign/GoodsDescClient.java

@@ -316,4 +316,13 @@ public class GoodsDescClient implements IGoodsDescClient {
 		List<GoodsType> goodsTypeList = goodsDescType.list(goodsDescLambdaQueryWrapper);
 		return goodsTypeList;
 	}
+
+	@Override
+	public R<List<GoodsDesc>> getGoodsListByCode(String code) {
+		LambdaQueryWrapper<GoodsDesc> goodsDescLambdaQueryWrapper = new LambdaQueryWrapper<>();
+		goodsDescLambdaQueryWrapper.eq(GoodsDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(GoodsDesc::getIsDeleted, 0)
+			.apply("find_in_set(code,'"+code+"')");
+		return R.data(goodsDescService.list(goodsDescLambdaQueryWrapper));
+	}
 }

blade-service/blade-client/src/main/java/org/springblade/client/storage/feign/StorageClient.java

@@ -2,23 +2,12 @@ package org.springblade.client.storage.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import lombok.AllArgsConstructor;
-import org.springblade.client.corps.assemble.mapstruct.CorpsDescMapstructMapper;
-import org.springblade.client.corps.service.ICorpsDescService;
-import org.springblade.client.entity.CorpsDesc;
-import org.springblade.client.entity.GoodsDesc;
 import org.springblade.client.entity.StorageDesc;
 import org.springblade.client.entity.StorageType;
-import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IStorageClient;
 import org.springblade.client.serial.service.IStorageDescService;
 import org.springblade.client.serial.service.IStorageTypeService;
-import org.springblade.client.vo.CorpsDescVO;
-import org.springblade.core.mp.support.BladePage;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tenant.annotation.NonDS;
@@ -30,7 +19,6 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 @NonDS
 @ApiIgnore()
@@ -97,5 +85,14 @@ public class StorageClient implements IStorageClient {
 		return storageDescService.list(lambdaQueryWrapper);
 	}
 
+	@Override
+	public R<List<StorageDesc>> getStorageList(String storageName) {
+		LambdaQueryWrapper<StorageDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(StorageDesc::getIsDeleted, 0);
+		lambdaQueryWrapper.eq(StorageDesc::getTenantId, AuthUtil.getTenantId());
+		lambdaQueryWrapper.apply("find_in_set(cname,'"+storageName+"')");
+		return R.data(storageDescService.list(lambdaQueryWrapper));
+	}
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -350,7 +350,13 @@
         </if>
         acc.bill_no billNo,
         acc.mblno mblNo,
-        acc.etd etdDate,
+        CASE
+        acc.business_type
+        WHEN 'SI' THEN
+        acc.eta
+        WHEN 'SE' THEN
+        acc.etd ELSE ''
+        END AS etdDate,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.amount_dr WHEN 'C' THEN acc.amount_cr ELSE 0 END ) ) AS amount,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.amount_dr_usd WHEN 'C' THEN acc.amount_cr_usd ELSE 0 END ) ) AS amountUsd,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.stl_amount_dr_usd WHEN 'C' THEN acc.stl_amount_cr_usd ELSE 0 END ) ) AS amountUsdAlready,
@@ -439,7 +445,13 @@
         </if>
         acc.bill_no billNo,
         acc.mblno mblNo,
-        acc.etd etdDate,
+        CASE
+        acc.business_type
+        WHEN 'SI' THEN
+        acc.eta
+        WHEN 'SE' THEN
+        acc.etd ELSE ''
+        END AS etdDate,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.amount_dr WHEN 'C' THEN acc.amount_cr ELSE 0 END ) ) AS amount,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.amount_dr_usd WHEN 'C' THEN acc.amount_cr_usd ELSE 0 END ) ) AS amountUsd,
         SUM(( CASE acc.account_dc WHEN 'D' THEN acc.stl_amount_dr_usd WHEN 'C' THEN acc.stl_amount_cr_usd ELSE 0 END ) ) AS amountUsdAlready,
@@ -530,7 +542,13 @@
             acc.vessel_en_name vesselName,
             acc.voyage_no voyageNo,
             acc.mblno mblNo,
-            acc.etd etd,
+            CASE
+            acc.business_type
+            WHEN 'SI' THEN
+            acc.eta
+            WHEN 'SE' THEN
+            acc.etd ELSE ''
+            END AS etd,
             acc.pod_en_name pod,
             acc.pol_en_name pol,
             acc.quantity_cntr_descr quantityCntrDescr,
@@ -620,7 +638,13 @@
         acc.vessel_en_name vesselName,
         acc.voyage_no voyageNo,
         acc.mblno mblNo,
-        acc.etd etd,
+        CASE
+        acc.business_type
+        WHEN 'SI' THEN
+        acc.eta
+        WHEN 'SE' THEN
+        acc.etd ELSE ''
+        END AS etd,
         acc.pod_en_name pod,
         acc.pol_en_name pol,
         acc.quantity_cntr_descr quantityCntrDescr,

blade-service/blade-stock/src/main/java/org/springblade/stock/service/impl/StockGoodsServiceImpl.java

@@ -59,6 +59,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 库存账 服务实现类
@@ -209,113 +210,133 @@ public class StockGoodsServiceImpl extends ServiceImpl<StockGoodsMapper, StockGo
 		StringBuffer storage = new StringBuffer();//未找到仓库的商品
 		List<StockGoodsLog> stockGoodsLogList = new ArrayList<>();
 		Date date = new Date();
-		for (StockGoodsExcel datum : data) {
-
-			StockGoodsLog stockGoodsLog = new StockGoodsLog();
-			stockGoodsLog.setTime(date);
-			stockGoodsLog.setUserName(AuthUtil.getUserName());
-			stockGoodsLog.setType("库存导入更新");
-			stockGoodsLog.setTenantId(AuthUtil.getTenantId());
-			stockGoodsLog.setCreateUser(AuthUtil.getUserId());
-			stockGoodsLog.setCreateTime(date);
-
-			StockGoods stockGoods = new StockGoods();
-			stockGoods.setBalanceQuantity(datum.getSurplusRouteQuantity());//结余数量
-			stockGoods.setSurplusRouteQuantity(datum.getSurplusRouteQuantity());//可用数量
-			stockGoods.setInQuantity(datum.getSurplusRouteQuantity());//入库数量
-			stockGoods.setInAmount(datum.getStockPrice());//入库金额
-			stockGoods.setBalanceAmount(datum.getStockPrice());//结余金额
-			stockGoods.setOutQuantity(BigDecimal.ZERO);//出库数量
-			stockGoods.setEnRouteQuantity(BigDecimal.ZERO);//在途数量
-			stockGoods.setTradeType("GN");
-			stockGoods.setTenantId(SecureUtil.getTenantId());
-			if ("681169".equals(AuthUtil.getTenantId())) {
-				stockGoods.setWarehouseId(1510440001509326849L);
+		if (!data.isEmpty()){
+			List<GoodsDesc> goodsDescList = new ArrayList<>();
+			String code = data.stream().map(StockGoodsExcel::getCode).filter(Objects::nonNull).collect(Collectors.joining(","));
+			R<List<GoodsDesc>> goodsR = goodsDescClient.getGoodsListByCode(code);
+			if (goodsR.isSuccess()){
+				goodsDescList = goodsR.getData();
 			}
-			//获取商品id
-			R<GoodsDesc> goodsDesc = goodsDescClient.GoodsByCode(datum.getCode());
-			if (goodsDesc.isSuccess() && goodsDesc.getData() != null) {
-				stockGoods.setGoodsId(goodsDesc.getData().getId());
-				if (StringUtils.isNotBlank(goodsDesc.getData().getBrand())) {
-					stockGoods.setBrand(goodsDesc.getData().getBrand());
-				}
-				if (StringUtils.isNotBlank(goodsDesc.getData().getBrandItem())) {
-					stockGoods.setBrandItem(goodsDesc.getData().getBrandItem());
+			List<CorpsDesc> corpsDescList = new ArrayList<>();
+			String corpName = data.stream().map(StockGoodsExcel::getCorpName).filter(Objects::nonNull).collect(Collectors.joining(","));
+			R<List<CorpsDesc>> corpR = corpsDescClient.getCorpListByCorpName(corpName);
+			if (goodsR.isSuccess()){
+				corpsDescList = corpR.getData();
+			}
+			List<StorageDesc> storageDescList = new ArrayList<>();
+			String storageName = data.stream().map(StockGoodsExcel::getStorageName).filter(Objects::nonNull).collect(Collectors.joining(","));
+			R<List<StorageDesc>> storageR = storageClient.getStorageList(storageName);
+			if (goodsR.isSuccess()){
+				storageDescList = storageR.getData();
+			}
+			for (StockGoodsExcel datum : data) {
+
+				StockGoodsLog stockGoodsLog = new StockGoodsLog();
+				stockGoodsLog.setTime(date);
+				stockGoodsLog.setUserName(AuthUtil.getUserName());
+				stockGoodsLog.setType("库存导入更新");
+				stockGoodsLog.setTenantId(AuthUtil.getTenantId());
+				stockGoodsLog.setCreateUser(AuthUtil.getUserId());
+				stockGoodsLog.setCreateTime(date);
+
+				StockGoods stockGoods = new StockGoods();
+				stockGoods.setBalanceQuantity(datum.getSurplusRouteQuantity());//结余数量
+				stockGoods.setSurplusRouteQuantity(datum.getSurplusRouteQuantity());//可用数量
+				stockGoods.setInQuantity(datum.getSurplusRouteQuantity());//入库数量
+				stockGoods.setInAmount(datum.getStockPrice());//入库金额
+				stockGoods.setBalanceAmount(datum.getStockPrice());//结余金额
+				stockGoods.setOutQuantity(BigDecimal.ZERO);//出库数量
+				stockGoods.setEnRouteQuantity(BigDecimal.ZERO);//在途数量
+				stockGoods.setTradeType("GN");
+				stockGoods.setTenantId(SecureUtil.getTenantId());
+				if ("681169".equals(AuthUtil.getTenantId())) {
+					stockGoods.setWarehouseId(1510440001509326849L);
 				}
-				if (StringUtils.isNotBlank(goodsDesc.getData().getTypeno())) {
-					stockGoods.setTypeno(goodsDesc.getData().getTypeno());
-					stockGoods.setItemType(goodsDesc.getData().getTypeno());
+				//获取商品id
+				GoodsDesc goodsDesc = goodsDescList.stream().filter(e-> e.getCode().equals(datum.getCode())).findFirst().orElse(null);
+				if (goodsDesc != null) {
+					stockGoods.setGoodsId(goodsDesc.getId());
+					if (StringUtils.isNotBlank(goodsDesc.getBrand())) {
+						stockGoods.setBrand(goodsDesc.getBrand());
+					}
+					if (StringUtils.isNotBlank(goodsDesc.getBrandItem())) {
+						stockGoods.setBrandItem(goodsDesc.getBrandItem());
+					}
+					if (StringUtils.isNotBlank(goodsDesc.getTypeno())) {
+						stockGoods.setTypeno(goodsDesc.getTypeno());
+						stockGoods.setItemType(goodsDesc.getTypeno());
+					}
+					if (StringUtils.isNotBlank(goodsDesc.getSpecsOne())) {
+						stockGoods.setTypenoOne(goodsDesc.getSpecsOne());
+					}
+					if (StringUtils.isNotBlank(goodsDesc.getSpecsTwo())) {
+						stockGoods.setTypenoTwo(goodsDesc.getSpecsTwo());
+					}
+					if (StringUtils.isNotBlank(goodsDesc.getPlaceProduction())) {
+						stockGoods.setPlaceProduction(goodsDesc.getPlaceProduction());
+					}
+					stockGoods.setCname(goodsDesc.getCname());
+					stockGoods.setCode(goodsDesc.getCode());
+				} else {
+					good.append(datum.getCode());
+					continue;
 				}
-				if (StringUtils.isNotBlank(goodsDesc.getData().getSpecsOne())) {
-					stockGoods.setTypenoOne(goodsDesc.getData().getSpecsOne());
+				//获取客户id
+				if (StringUtils.isNotBlank(datum.getCorpName())) {
+					CorpsDesc corpsDesc = corpsDescList.stream().filter(e-> e.getCname().equals(datum.getCorpName())).findFirst().orElse(null);
+					if ( corpsDesc != null) {
+						stockGoods.setCorpId(corpsDesc.getId());
+						stockGoods.setCorpName(corpsDesc.getCname());
+					}
+				} else if (StringUtils.isBlank(datum.getCorpName()) && goodsDesc.getCorpId() != null) {
+					stockGoods.setCorpId(goodsDesc.getCorpId());
+					stockGoods.setCorpName(goodsDesc.getCorpName());
+				} else {
+					corp.append(datum.getCode());
+					continue;
 				}
-				if (StringUtils.isNotBlank(goodsDesc.getData().getSpecsTwo())) {
-					stockGoods.setTypenoTwo(goodsDesc.getData().getSpecsTwo());
+				if (stockGoods.getCorpId() == null) {
+					corp.append(datum.getCode());
+					continue;
 				}
-				if (StringUtils.isNotBlank(goodsDesc.getData().getPlaceProduction())) {
-					stockGoods.setPlaceProduction(goodsDesc.getData().getPlaceProduction());
+				//获取仓库id
+				StorageDesc storageDesc = storageDescList.stream().filter(e-> e.getCname().equals(datum.getStorageName())).findFirst().orElse(null);
+				if (storageDesc != null) {
+					stockGoods.setStorageId(storageDesc.getId());
+				} else {
+					storage.append(datum.getCode());
+					continue;
 				}
-				stockGoods.setCname(goodsDesc.getData().getCname());
-				stockGoods.setCode(goodsDesc.getData().getCode());
-			} else {
-				good.append(datum.getCode());
-				continue;
-			}
-			//获取客户id
-			if (StringUtils.isNotBlank(datum.getCorpName())) {
-				R<CorpsDesc> corpsDesc = corpsDescClient.getCorpByName(datum.getCorpName(), SecureUtil.getTenantId());
-				if (corpsDesc.isSuccess() && corpsDesc.getData() != null) {
-					stockGoods.setCorpId(corpsDesc.getData().getId());
-					stockGoods.setCorpName(corpsDesc.getData().getCname());
+				//查询库存账
+				StockGoods goods = baseMapper.selectOne(new QueryWrapper<StockGoods>().eq("goods_id", stockGoods.getGoodsId())
+					.eq("corp_id", stockGoods.getCorpId()).eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0)
+					.eq("item_type", stockGoods.getItemType()).eq("storage_id", stockGoods.getStorageId()));
+				if (goods == null) {
+					stockGoods.setCreateTime(new Date());
+					stockGoods.setCreateUser(SecureUtil.getUserId());
+					stockGoods.setLockingQuantity(BigDecimal.ZERO);//锁定数量
+					baseMapper.insert(stockGoods);
+				} else {
+					stockGoodsLog.setStockId(goods.getId());
+					stockGoodsLog.setBalanceQuantityOld(goods.getBalanceQuantity());
+					stockGoodsLog.setSurplusRouteQuantityOld(goods.getSurplusRouteQuantity());
+					stockGoodsLog.setLockingQuantityOld(goods.getLockingQuantity());
+					stockGoodsLog.setOrderQuantity(new BigDecimal("0"));
+
+					stockGoodsLogList.add(stockGoodsLog);
+					stockGoods.setUpdateUser(SecureUtil.getUserId());
+					stockGoods.setUpdateTime(new Date());
+					stockGoods.setId(goods.getId());
+					stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().subtract(goods.getLockingQuantity()));//可用数量 = 可用减去之前的锁定
+					baseMapper.updateById(stockGoods);
+					stockGoodsLog.setBalanceQuantity(stockGoods.getBalanceQuantity());
+					stockGoodsLog.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity());
+					stockGoodsLog.setLockingQuantity(goods.getLockingQuantity());
+					stockGoodsLogList.add(stockGoodsLog);
 				}
-			} else if (StringUtils.isBlank(datum.getCorpName()) && goodsDesc.getData().getCorpId() != null) {
-				stockGoods.setCorpId(goodsDesc.getData().getCorpId());
-				stockGoods.setCorpName(goodsDesc.getData().getCorpName());
-			} else {
-				corp.append(datum.getCode());
-				continue;
-			}
-			if (stockGoods.getCorpId() == null) {
-				corp.append(datum.getCode());
-				continue;
-			}
-			//获取仓库id
-			StorageDesc storageDesc = storageClient.getName(datum.getStorageName());
-			if (storageDesc != null) {
-				stockGoods.setStorageId(storageDesc.getId());
-			} else {
-				storage.append(datum.getCode());
-				continue;
-			}
-			//查询库存账
-			StockGoods goods = baseMapper.selectOne(new QueryWrapper<StockGoods>().eq("goods_id", stockGoods.getGoodsId())
-				.eq("corp_id", stockGoods.getCorpId()).eq("tenant_id", SecureUtil.getTenantId()).eq("is_deleted", 0)
-				.eq("item_type", stockGoods.getItemType()).eq("storage_id", stockGoods.getStorageId()));
-			if (goods == null) {
-				stockGoods.setCreateTime(new Date());
-				stockGoods.setCreateUser(SecureUtil.getUserId());
-				stockGoods.setLockingQuantity(BigDecimal.ZERO);//锁定数量
-				baseMapper.insert(stockGoods);
-			} else {
-				stockGoodsLog.setStockId(goods.getId());
-				stockGoodsLog.setBalanceQuantityOld(goods.getBalanceQuantity());
-				stockGoodsLog.setSurplusRouteQuantityOld(goods.getSurplusRouteQuantity());
-				stockGoodsLog.setLockingQuantityOld(goods.getLockingQuantity());
-				stockGoodsLog.setOrderQuantity(new BigDecimal("0"));
-
-				stockGoodsLogList.add(stockGoodsLog);
-				stockGoods.setUpdateUser(SecureUtil.getUserId());
-				stockGoods.setUpdateTime(new Date());
-				stockGoods.setId(goods.getId());
-				stockGoods.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity().subtract(goods.getLockingQuantity()));//可用数量 = 可用减去之前的锁定
-				baseMapper.updateById(stockGoods);
-				stockGoodsLog.setBalanceQuantity(stockGoods.getBalanceQuantity());
-				stockGoodsLog.setSurplusRouteQuantity(stockGoods.getSurplusRouteQuantity());
-				stockGoodsLog.setLockingQuantity(goods.getLockingQuantity());
-				stockGoodsLogList.add(stockGoodsLog);
 			}
+			stockGoodsLogService.saveOrUpdateBatch(stockGoodsLogList);
 		}
-		stockGoodsLogService.saveOrUpdateBatch(stockGoodsLogList);
 		String message = new String("导入成功");
 		if (StringUtils.isNotBlank(good)) {
 			message = message + "在基础资料中未查到商品信息的商品有:" + good.toString();