Browse Source

feat: 商品管理修复

xdd 2 tuần trước cách đây
mục cha
commit
2213a527c6

+ 4 - 0
fs-service-system/src/main/java/com/fs/store/mapper/FsWarehousesMapper.java

@@ -71,4 +71,8 @@ public interface FsWarehousesMapper
     @Select("select id,warehouse_code from fs_warehouses")
     @MapKey("id")
     Map<Long,FsWarehouses> queryAllWarehouses();
+
+    @Select("select id,warehouse_code from fs_warehouses")
+    @MapKey("warehouseCode")
+    Map<String,FsWarehouses> queryWarehouseCodeMapping();
 }

+ 14 - 0
fs-service-system/src/main/java/com/fs/store/service/impl/FsStoreProductServiceImpl.java

@@ -54,6 +54,9 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
     private FsStoreProductPackageMapper fsStoreProductPackageMapper;
     @Autowired
     private FsStoreProductGroupMapper fsStoreProductGroupMapper;
+
+    @Autowired
+    private FsWarehousesMapper fsWarehousesMapper;
     /**
      * 查询商品
      *
@@ -644,6 +647,9 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
         {
             throw new CustomException("导入商品数据不能为空!");
         }
+
+        Map<String, FsWarehouses> warehouseCodeMapping = fsWarehousesMapper.queryWarehouseCodeMapping();
+
         int successNum = 0;
         int failureNum = 0;
         StringBuilder successMsg = new StringBuilder();
@@ -655,6 +661,14 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
                 if (product.getBarCode()==null || product.getBarCode()==""){
                     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);
                 ProductArrtDTO formatDetailDto = ProductArrtDTO.builder()
                         .value("规格")