|
@@ -54,6 +54,9 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
|
|
private FsStoreProductPackageMapper fsStoreProductPackageMapper;
|
|
private FsStoreProductPackageMapper fsStoreProductPackageMapper;
|
|
@Autowired
|
|
@Autowired
|
|
private FsStoreProductGroupMapper fsStoreProductGroupMapper;
|
|
private FsStoreProductGroupMapper fsStoreProductGroupMapper;
|
|
|
|
+
|
|
|
|
+ @Autowired
|
|
|
|
+ private FsWarehousesMapper fsWarehousesMapper;
|
|
/**
|
|
/**
|
|
* 查询商品
|
|
* 查询商品
|
|
*
|
|
*
|
|
@@ -644,6 +647,9 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
|
|
{
|
|
{
|
|
throw new CustomException("导入商品数据不能为空!");
|
|
throw new CustomException("导入商品数据不能为空!");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ Map<String, FsWarehouses> warehouseCodeMapping = fsWarehousesMapper.queryWarehouseCodeMapping();
|
|
|
|
+
|
|
int successNum = 0;
|
|
int successNum = 0;
|
|
int failureNum = 0;
|
|
int failureNum = 0;
|
|
StringBuilder successMsg = new StringBuilder();
|
|
StringBuilder successMsg = new StringBuilder();
|
|
@@ -655,6 +661,14 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
|
|
if (product.getBarCode()==null || product.getBarCode()==""){
|
|
if (product.getBarCode()==null || product.getBarCode()==""){
|
|
throw new CustomException("商品编号为空");
|
|
throw new CustomException("商品编号为空");
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ if(StringUtils.isNotBlank(product.getWarehouseCode())){
|
|
|
|
+ FsWarehouses fsWarehouses = warehouseCodeMapping.get(product.getWarehouseCode());
|
|
|
|
+ if(fsWarehouses==null){
|
|
|
|
+ throw new CustomException("编码: "+product.getWarehouseCode()+" 不存在!");
|
|
|
|
+ }
|
|
|
|
+ product.setWarehouseId(fsWarehouses.getId());
|
|
|
|
+ }
|
|
this.insertFsStoreProduct(product);
|
|
this.insertFsStoreProduct(product);
|
|
ProductArrtDTO formatDetailDto = ProductArrtDTO.builder()
|
|
ProductArrtDTO formatDetailDto = ProductArrtDTO.builder()
|
|
.value("规格")
|
|
.value("规格")
|