Merge branch 'dev' into pre-production

blade-service/logpm-warehouse/src/main/java/com/logpm/warehouse/service/impl/WarehouseUpdownTypeServiceImpl.java

@@ -326,6 +326,10 @@ public class WarehouseUpdownTypeServiceImpl extends BaseServiceImpl<WarehouseUpd
 			}
 
 			Map map = distributionStockArticleClient.findShelfNumByOrderCodeAndWarehouseId(orderCode,warehouseId);
+			if(Objects.isNull(map)){
+				log.warn("#################findUpShelfScanGoods: 无可用数据 orderCode={}",orderCode);
+				throw new CustomerException(403,"无可用数据");
+			}
 
 			List<UpShelfDataVO> ls = new ArrayList<>();
 			UpShelfDataVO upShelfDataVO = new UpShelfDataVO();