极速发货

@@ -377,14 +377,12 @@ public class ErpFastDeliveryServiceImpl implements IErpFastDeliveryService {
         // 上架
         // 上架
         List<ProductImportTranItemBo> responseList = Lists.newArrayList();
         List<ProductImportTranItemBo> responseList = Lists.newArrayList();
 
 
-        List<Integer> skupIds = Lists.newArrayList();
-
         // 上架的代码(和之前同)
         // 上架的代码(和之前同)
         List<FastDeliveryBatchOnShelfResp> shelfResps = Lists.newArrayList();
         List<FastDeliveryBatchOnShelfResp> shelfResps = Lists.newArrayList();
         for(FastDeliveryBatchOnShelfReq.ProductInfo productInfo : req.getProductInfos()){
         for(FastDeliveryBatchOnShelfReq.ProductInfo productInfo : req.getProductInfos()){
 
 
             StorageCheckResp storage = storageMap.get(getProductCodeSizeNameKey(productInfo.getProductCode(), productInfo.getSizeName()));
             StorageCheckResp storage = storageMap.get(getProductCodeSizeNameKey(productInfo.getProductCode(), productInfo.getSizeName()));
-            if (storage == null){
+            if (storage == null || storage.getStorageId() == null){
                 logger.warn("productCode {} and sizeName {}. storageId not exist.", productInfo.getProductCode(), productInfo.getSizeName());
                 logger.warn("productCode {} and sizeName {}. storageId not exist.", productInfo.getProductCode(), productInfo.getSizeName());
                 throw new UfoServiceException(403, "货号和尺寸对应的storageId不存在");
                 throw new UfoServiceException(403, "货号和尺寸对应的storageId不存在");
             }
             }

@@ -47,7 +47,7 @@ public class FastDeliveryProxyService {
 
 
 
 
     public boolean isOnToThird(){
     public boolean isOnToThird(){
-        return configReader.getBoolean("ufo.fast.delivery.toThired", true);
+        return configReader.getBoolean("ufo.fast.delivery.toThird", true);
     }
     }
 
 
     /**
     /**