diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java
index 6bd45d32a..6fe14e090 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataFreightEntity.java
@@ -17,12 +17,16 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.math.BigDecimal;
+import java.util.Date;
+
 /**
  * 基础价格记录表 实体类
  *
@@ -34,6 +38,158 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @ApiModel(value = "BasicdataFreight对象", description = "基础价格记录表")
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataFreightEntity extends TenantEntity {
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 计算方式;1件  2方  3公斤
+	 */
+	@ApiModelProperty(value = "计算方式;1件  2方  3公斤")
+	private Integer formulaMode;
+	/**
+	 * 物品名称
+	 */
+	@ApiModelProperty(value = "物品名称")
+	private String itemName;
+	/**
+	 * 门店品牌记录表
+	 */
+	@ApiModelProperty(value = "门店品牌记录表")
+	private String storeBrandId;
+	/**
+	 * 运费
+	 */
+	@ApiModelProperty(value = "运费")
+	private BigDecimal freight;
+	/**
+	 * 送货费用
+	 */
+	@ApiModelProperty(value = "送货费用")
+	private BigDecimal deliveryExpense;
+	/**
+	 * 提货费用
+	 */
+	@ApiModelProperty(value = "提货费用")
+	private BigDecimal deliveryCharge;
+	/**
+	 * 仓库管理费用
+	 */
+	@ApiModelProperty(value = "仓库管理费用")
+	private BigDecimal warehouseOverhead;
+	/**
+	 * 仓储费用
+	 */
+	@ApiModelProperty(value = "仓储费用")
+	private BigDecimal storageCharge;
+	/**
+	 * 装卸费用
+	 */
+	@ApiModelProperty(value = "装卸费用")
+	private BigDecimal terminalCharges;
+	/**
+	 * 其他费用
+	 */
+	@ApiModelProperty(value = "其他费用")
+	private BigDecimal otherCharges;
+	/**
+	 * 末端仓
+	 */
+	@ApiModelProperty(value = "末端仓")
+	private String singleColon;
+	/**
+	 * 发货单位
+	 */
+	@ApiModelProperty(value = "发货单位")
+	private String forwardingUnit;
+	/**
+	 * 门店
+	 */
+	@ApiModelProperty(value = "门店")
+	private String shop;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+	/**
+	 * 服务类型;1 干  2干仓  3干仓配 4干配
+	 */
+	@ApiModelProperty(value = "服务类型;1 干  2干仓  3干仓配 4干配")
+	private Integer typeService;
+	/**
+	 * 结算方;1 商场  2工厂
+	 */
+	@ApiModelProperty(value = "结算方;1 商场  2工厂")
+	private Integer clearingForm;
+	/**
+	 * 一级品类
+	 */
+	@ApiModelProperty(value = "一级品类")
+	private String firstClassCategory;
+	/**
+	 * 一口价
+	 */
+	@ApiModelProperty(value = "一口价")
+	private BigDecimal fixedPrice;
+	/**
+	 * 干线费用
+	 */
+	@ApiModelProperty(value = "干线费用")
+	private BigDecimal trunkCharge;
+	/**
+	 * 生效时间
+	 */
+	@ApiModelProperty(value = "生效时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING,pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date effectiveTime;
+	/**
+	 * 截至时间
+	 */
+	@ApiModelProperty(value = "截至时间")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	private Date expirationTime;
+	/**
+	 * 类型
+	 */
+	@ApiModelProperty(value = "类型")
+	private String type;
+	/**
+	 * 标识
+	 */
+	@ApiModelProperty(value = "标识")
+	private String identification;
+	/**
+	 * 仓储时间端状态;1 0-30天  2 0-60天 3 60天以上
+	 */
+	@ApiModelProperty(value = "仓储时间端状态;1 0-30天  2 0-60天 3 60天以上")
+	private Integer warehousingTimeCharge;
+	/**
+	 * 仓储时间端费用
+	 */
+	@ApiModelProperty(value = "仓储时间端费用")
+	private BigDecimal warehousingTimeStatus;
 
 
 }
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java
index 133ef542f..f848156cb 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataShopEntity.java
@@ -77,7 +77,7 @@ public class BasicdataShopEntity extends TenantEntity {
 	 * 门店名称
 	 */
 	@ApiModelProperty(value = "门店名称")
-	private Integer storeName;
+	private String storeName;
 	/**
 	 * 联系人
 	 */
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java
index cb77f6b0c..81a36a24b 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStoreBrandEntity.java
@@ -17,12 +17,15 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
+
 /**
  * 门店品牌中间表 实体类
  *
@@ -34,6 +37,43 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @ApiModel(value = "BasicdataStoreBrand对象", description = "门店品牌中间表")
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataStoreBrandEntity extends TenantEntity {
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 品牌名称
+	 */
+	@ApiModelProperty(value = "门店ID")
+	private String shopId;
+	/**
+	 * 品牌编码
+	 */
+	@ApiModelProperty(value = "品牌ID")
+	private String brandId;
+
+
 
 
 }
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataZonePriceEntity.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataZonePriceEntity.java
index 2a45dd8f7..01c92e384 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataZonePriceEntity.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataZonePriceEntity.java
@@ -17,12 +17,16 @@
 package com.logpm.basicdata.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.models.auth.In;
 import lombok.Data;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.EqualsAndHashCode;
 import org.springblade.core.tenant.mp.TenantEntity;
 
+import java.util.Date;
+
 /**
  * 区域品牌价格表 实体类
  *
@@ -34,6 +38,97 @@ import org.springblade.core.tenant.mp.TenantEntity;
 @ApiModel(value = "BasicdataZonePrice对象", description = "区域品牌价格表")
 @EqualsAndHashCode(callSuper = true)
 public class BasicdataZonePriceEntity extends TenantEntity {
-
+	/**
+	 * 预留1
+	 */
+	@ApiModelProperty(value = "预留1")
+	private String reserve1;
+	/**
+	 * 预留2
+	 */
+	@ApiModelProperty(value = "预留2")
+	private String reserve2;
+	/**
+	 * 预留3
+	 */
+	@ApiModelProperty(value = "预留3")
+	private String reserve3;
+	/**
+	 * 预留4
+	 */
+	@ApiModelProperty(value = "预留4")
+	private String reserve4;
+	/**
+	 * 预留5
+	 */
+	@ApiModelProperty(value = "预留5")
+	private String reserve5;
+	/**
+	 * 省份
+	 */
+	@ApiModelProperty(value = "省份")
+	private String province;
+	/**
+	 * 市
+	 */
+	@ApiModelProperty(value = "市")
+	private String city;
+	/**
+	 * 区/县
+	 */
+	@ApiModelProperty(value = "区/县")
+	private String district;
+	/**
+	 * 品牌
+	 */
+	@ApiModelProperty(value = "品牌")
+	private String brand;
+	/**
+	 * 费用标识
+	 */
+	@ApiModelProperty(value = "费用标识")
+	private String freightMark;
+	/**
+	 * 费用
+	 */
+	@ApiModelProperty(value = "费用")
+	private String cost;
+	/**
+	 * 仓储时间端状态
+	 */
+	@ApiModelProperty(value = "仓储时间端状态")
+	private String warehousingTimeStatus;
+	/**
+	 * 仓储时间费用
+	 */
+	@ApiModelProperty(value = "仓储时间费用")
+	private String warehousingTimeCharge;
+	/**
+	 * 末端仓
+	 */
+	@ApiModelProperty(value = "末端仓")
+	private String goalGranary;
+	/**
+	 * 标识
+	 */
+	@ApiModelProperty(value = "标识")
+	private Integer identification;
+	/**
+	 * 状态
+	 */
+	@ApiModelProperty(value = "状态")
+	private Integer conditioner;
+//	/**
+//	 * 合同开始时间
+//	 */
+//	@ApiModelProperty(value = "合同开始时间")
+//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	private Date contractStartTime;
+//	/**
+//	 * 合同结束时间
+//	 */
+//	@ApiModelProperty(value = "合同结束时间")
+//	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern="yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+//	private Date contractEntTime;
 
 }
diff --git a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java
index 284765a23..1786b1f58 100644
--- a/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java
+++ b/blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/vo/BasicdataZonePriceVO.java
@@ -32,4 +32,7 @@ import lombok.EqualsAndHashCode;
 public class BasicdataZonePriceVO extends BasicdataZonePriceEntity {
 	private static final long serialVersionUID = 1L;
 
+	private String name;
+	private String brandName;
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandController.java
index e14023682..1c6f19856 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataBrandController.java
@@ -16,6 +16,9 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -76,10 +79,36 @@ public class BasicdataBrandController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataBrand")
 	public R<IPage<BasicdataBrandVO>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataBrand, Query query) {
-		IPage<BasicdataBrandEntity> pages = basicdataBrandService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataBrand, BasicdataBrandEntity.class));
+		Object o = basicdataBrand.get("checkInTime");
+		Object o1 = basicdataBrand.get("postSetTime");
+		basicdataBrand.put("checkInTime",null);
+		basicdataBrand.put("postSetTime",null);
+		QueryWrapper<BasicdataBrandEntity> queryWrapper = Condition.getQueryWrapper(basicdataBrand, BasicdataBrandEntity.class);
+		queryWrapper.apply(o != null,
+				"date_format (acceptance_time,'%Y-%m-%d') >= date_format ({0},'%Y-%m-%d')", o)
+			.apply(o1 != null,
+				"date_format (acceptance_time,'%Y-%m-%d') <= date_format ({0},'%Y-%m-%d')", o1);
+
+		IPage<BasicdataBrandEntity> pages = basicdataBrandService.page(Condition.getPage(query),queryWrapper);
 		return R.data(BasicdataBrandWrapper.build().pageVO(pages));
 	}
 
+
+	/**
+	 * 基础品牌表 分页
+	 */
+	@GetMapping("/lists")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataBrand")
+	public R<List<BasicdataBrandEntity>> lists(@ApiIgnore @RequestParam Map<String, Object> basicdataBrand, Query query) {
+		BasicdataBrandEntity basicdataBrandEntity = JSONObject.parseObject(JSONObject.toJSONString(basicdataBrand), BasicdataBrandEntity.class);
+
+		List<BasicdataBrandEntity> list = basicdataBrandService.list(Wrappers.<BasicdataBrandEntity>query().lambda().
+			eq(StringUtils.isNotBlank(basicdataBrandEntity.getBrandName()), BasicdataBrandEntity::getBrandName, basicdataBrandEntity.getBrandName())
+		);
+		return R.data(list);
+	}
+
 	/**
 	 * 基础品牌表 自定义分页
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java
index 678158d3f..d5c228049 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataShopController.java
@@ -16,6 +16,12 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.logpm.basicdata.entity.BasicdataClientEntity;
+import com.logpm.basicdata.service.IBasicdataClientService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -78,6 +84,30 @@ public class BasicdataShopController extends BladeController {
 		IPage<BasicdataShopEntity> pages = basicdataShopService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataShop, BasicdataShopEntity.class));
 		return R.data(pages);
 	}
+	/**
+	 * 基础门店表 分页
+	 */
+	@GetMapping("/lists")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataShop")
+	public R<List<BasicdataShopEntity>> lists(@ApiIgnore @RequestParam Map<String, Object> basicdataShop) {
+		BasicdataShopEntity basicdataShopEntity = JSONObject.parseObject(JSONObject.toJSONString(basicdataShop), BasicdataShopEntity.class);
+
+		List<BasicdataShopEntity> list = basicdataShopService.list(Wrappers.<BasicdataShopEntity>query().lambda()
+			.eq(StringUtils.isNotBlank(basicdataShopEntity.getStoreName()), BasicdataShopEntity::getStoreName, basicdataShopEntity.getStoreName())
+		);
+		return R.data(list);
+	}
+	/**
+	 * 自定义基础门店表 分页
+	 */
+	@GetMapping("/Taglib")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataShop")
+	public R<IPage<BasicdataShopVO>> taglib(@ApiIgnore @RequestParam Map<String, Object> basicdataShop, Query query) {
+		IPage<BasicdataShopVO> pages = basicdataShopService.taglibPage(Condition.getPage(query), basicdataShop);
+		return R.data(pages);
+	}
 
 	/**
 	 * 基础门店表 自定义分页
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
index e08b005bd..e374192d0 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataWarehouseController.java
@@ -81,6 +81,18 @@ public class BasicdataWarehouseController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 仓库名称查询
+	 */
+	@GetMapping("/listName")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入warehouseWarehouse")
+	public R<List<BasicdataWarehouseEntity>> listName(String name) {
+		List<BasicdataWarehouseEntity> pages = warehouseService.pageListName(name);
+
+		return R.data(pages);
+	}
+
 	/**
 	 * 仓库 自定义分页
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java
index 1aa7765dd..8f87c6f11 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataZonePriceController.java
@@ -79,6 +79,17 @@ public class BasicdataZonePriceController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 区域品牌价格表 分页 自定义
+	 */
+	@GetMapping("/pageList")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入basicdataZonePrice")
+	public R<IPage<BasicdataZonePriceEntity>> pageList(@ApiIgnore @RequestParam Map<String, Object> basicdataZonePrice, Query query) {
+		IPage<BasicdataZonePriceEntity> pages = basicdataZonePriceService.pageList(Condition.getPage(query),basicdataZonePrice);
+		return R.data(pages);
+	}
+
 	/**
 	 * 区域品牌价格表 自定义分页
 	 */
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java
index b27cf3171..57f21aa83 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.java
@@ -51,4 +51,7 @@ public interface BasicdataZonePriceMapper extends BaseMapper<BasicdataZonePriceE
 	 */
 	List<BasicdataZonePriceExcel> exportBasicdataZonePrice(@Param("ew") Wrapper<BasicdataZonePriceEntity> queryWrapper);
 
+    IPage<BasicdataZonePriceEntity> pageList(IPage<Object> page, @Param("param") BasicdataZonePriceEntity basicdataZonePriceEntity);
+
+	BasicdataZonePriceVO getOneDetail(BasicdataZonePriceEntity basicdataZonePrice);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml
index 06b4a4f29..8d07e87e5 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataZonePriceMapper.xml
@@ -6,6 +6,33 @@
     <resultMap id="basicdataZonePriceResultMap" type="com.logpm.basicdata.entity.BasicdataZonePriceEntity">
     </resultMap>
 
+    <select id="pageList" resultType="com.logpm.basicdata.vo.BasicdataZonePriceVO">
+        select lbzp.id,lbzp.province,lbzp.city , lbzp.district , lbzp.brand , lbzp.freight_mark , lbzp.cost , lbzp.warehousing_time_status , lbzp.warehousing_time_charge , lbzp.goal_granary ,
+               lbzp.identification , lbzp.conditioner , lww.name , lbb.brand_name brandName,lbzp.create_time,lbzp.tenant_id
+        from logpm_basicdata_zone_price lbzp
+                 LEFT JOIN logpm_basicdata_brand lbb on lbzp.brand = lbb.id
+                 LEFT JOIN logpm_warehouse_warehouse lww on  lbzp.goal_granary = lww.id
+        <where>
+            lbzp.is_deleted = 0
+            <if test="param.district != null and param.district != ''"> and lbzp.district = #{ param.district } </if>
+            <if test="param.brand != null and param.brand != ''"> and lww.name like concat('%',#{param.brand},'%')  </if>
+            <if test="param.freightMark != null and param.freightMark != ''"> and lbzp.freight_mark like concat('%', #{param.freightMark},'%') </if>
+            <if test="param.goalGranary != null and param.goalGranary != ''"> and lbzp.goal_granary like concat('%',#{param.goalGranary},'%')  </if>
+
+        </where>
+    </select>
+
+    <select id="getOneDetail" resultType="com.logpm.basicdata.vo.BasicdataZonePriceVO">
+        select lbzp.id,lbzp.province,lbzp.city , lbzp.district , lbzp.brand , lbzp.freight_mark , lbzp.cost , lbzp.warehousing_time_status , lbzp.warehousing_time_charge , lbzp.goal_granary ,
+        lbzp.identification , lbzp.conditioner , lww.name , lbb.brand_name brandName,lbzp.create_time,lbzp.tenant_id
+        from logpm_basicdata_zone_price lbzp
+        LEFT JOIN logpm_basicdata_brand lbb on lbzp.brand = lbb.id
+        LEFT JOIN logpm_warehouse_warehouse lww on  lbzp.goal_granary = lww.id
+        <where>
+            <if test="id != null and id != ''"> and lbzp.id = #{id} </if>
+        </where>
+    </select>
+
 
     <select id="selectBasicdataZonePricePage" resultMap="basicdataZonePriceResultMap">
         select * from logpm_basicdata_zone_price where is_deleted = 0
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java
index 625177be2..0c3385ff5 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataWarehouseService.java
@@ -26,6 +26,7 @@ import com.logpm.basicdata.vo.BasicdataWarehouseVO;
 import org.springblade.core.mp.base.BaseService;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库 服务类
@@ -71,4 +72,6 @@ public interface IBasicdataWarehouseService extends BaseService<BasicdataWarehou
 	 * @return
 	 */
 	boolean removeWarehouse(List<String> ids);
+
+    List<BasicdataWarehouseEntity> pageListName(String name);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java
index 84af3d53f..d950e27b1 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/IBasicdataZonePriceService.java
@@ -23,6 +23,7 @@ import com.logpm.basicdata.excel.BasicdataZonePriceExcel;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseService;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 区域品牌价格表 服务类
@@ -49,4 +50,7 @@ public interface IBasicdataZonePriceService extends BaseService<BasicdataZonePri
 	 */
 	List<BasicdataZonePriceExcel> exportBasicdataZonePrice(Wrapper<BasicdataZonePriceEntity> queryWrapper);
 
+    IPage<BasicdataZonePriceEntity> pageList(IPage<Object> page, Map<String, Object> basicdataZonePrice);
+
+	BasicdataZonePriceVO getOneDetail(BasicdataZonePriceEntity basicdataZonePrice);
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
index 9489bf50c..7feef6ec6 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataWarehouseServiceImpl.java
@@ -16,6 +16,10 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import cn.hutool.db.Page;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.logpm.basicdata.dto.BasicdataDTO;
 import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
 import com.logpm.basicdata.excel.BasicdataWarehouseExcel;
@@ -33,6 +37,7 @@ import org.springblade.core.mp.base.BaseServiceImpl;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 仓库 服务实现类
@@ -93,4 +98,11 @@ public class BasicdataWarehouseServiceImpl extends BaseServiceImpl<BasicdataWare
 		return result;
 	}
 
+	@Override
+	public List<BasicdataWarehouseEntity> pageListName(String name) {
+		QueryWrapper<BasicdataWarehouseEntity> queryWrapper = new QueryWrapper<>();
+		queryWrapper.lambda().eq(StringUtils.isNotBlank(name),BasicdataWarehouseEntity::getName,name);
+		return baseMapper.selectList( queryWrapper);
+	}
+
 }
diff --git a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java
index 33b7a1f06..0c70408a2 100644
--- a/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java
+++ b/blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataZonePriceServiceImpl.java
@@ -16,6 +16,7 @@
  */
 package com.logpm.basicdata.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.logpm.basicdata.entity.BasicdataZonePriceEntity;
 import com.logpm.basicdata.vo.BasicdataZonePriceVO;
 import com.logpm.basicdata.excel.BasicdataZonePriceExcel;
@@ -26,6 +27,7 @@ import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.core.mp.base.BaseServiceImpl;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 区域品牌价格表 服务实现类
@@ -51,4 +53,15 @@ public class BasicdataZonePriceServiceImpl extends BaseServiceImpl<BasicdataZone
 		return basicdataZonePriceList;
 	}
 
+	@Override
+	public IPage<BasicdataZonePriceEntity> pageList(IPage<Object> page, Map<String, Object> basicdataZonePrice) {
+		BasicdataZonePriceEntity basicdataZonePriceEntity = JSONObject.parseObject(JSONObject.toJSONString(basicdataZonePrice), BasicdataZonePriceEntity.class);
+		return baseMapper.pageList(page,basicdataZonePriceEntity);
+	}
+
+	@Override
+	public BasicdataZonePriceVO getOneDetail(BasicdataZonePriceEntity basicdataZonePrice) {
+		return baseMapper.getOneDetail(basicdataZonePrice);
+	}
+
 }