1.修改客户绑定的服务服务仓库，之前是通过发货单位进行指派服务仓库，现在修改按照发货仓来进行对应关系 1.1

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/entity/BasicdataStorageServicesEntity.java

@@ -65,8 +65,8 @@ public class BasicdataStorageServicesEntity extends TenantEntity {
 	/**
 	 * 客户ID
 	 */
-	@ApiModelProperty(value = "门店ID")
+	@ApiModelProperty(value = "客户ID")
-	private Long shopId;
+	private Long clientId;
 	/**
 	 * 区分类型
 	 */

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/mapper/BasicdataStorageServicesMapper.xml

@@ -10,17 +10,39 @@
 
     <select id="selectBasicdataStorageServicesPage" resultType="com.logpm.basicdata.vo.BasicdataStorageServicesVO">
 
-        select lbss.tenant_id, lbss.create_user, lbss.create_time, lbss.update_user, lbss.update_time, lbss.status, lbss.is_deleted, lbss.create_dept, lbss.id, lbss.reserve1, lbss.reserve2,
+        lbss.tenant_id,
-        lbss.reserve3, lbss.reserve4, lbss.reserve5, lbss.shop_id, lbss.forwarding_unit, lbss.warehouse_service,lbsc.linkman,lbss.distinguish
+        lbss.create_user,
+        lbss.create_time,
+        lbss.update_user,
+        lbss.update_time,
+        lbss. STATUS,
+        lbss.is_deleted,
+        lbss.create_dept,
+        lbss.id,
+        lbss.reserve1,
+        lbss.reserve2,
+        lbss.reserve3,
+        lbss.reserve4,
+        lbss.reserve5,
+        lbss.client_id,
+        lbss.distinguish,
+        lbss.serve_warehouse_id,
+        lbss.serve_warehouse_name,
+        lbss.send_warehouse_id,
+        lbss.send_warehouse_name
         from logpm_basicdata_storage_services lbss
-        LEFT JOIN logpm_basicdata_store_contact lbsc on lbsc.id = lbss.forwarding_unit
+
         <where>
             lbss.is_deleted = 0
-            <if test="param.shopIds != null and param.shopIds != null"> and lbss.shop_id = #{param.shopIds}  </if>
+            <if test="param.clientId != null and param.clientId != null"> and lbss.clinet_id = #{param.clientId}  </if>
-            <if test="param.distinguish != null and param.distinguish != null"> and lbss.distinguish = #{param.distinguish}  </if>
+            <if test="param.serveWarehouseId != null and param.serveWarehouseId != null"> and lbss.serve_warehouse_id = #{param.serveWarehouseId}  </if>
-            <if test="param.forwardingUnit != null and param.forwardingUnit != null"> and lbsc.linkman like concat('%',#{param.forwardingUnit} ,'%') </if>
+            <if test="param.sendWarehouseId != null and param.sendWarehouseId != null"> and lbss.send_warehouse_id = #{param.sendWarehouseId}  </if>
-            <if test="param.warehouseService != null and param.warehouseService != null"> and lbss.warehouse_service like concat('%',#{param.warehouseService},'%')  </if>
+
+            <if test="param.serveWarehouseName != null and param.serveWarehouseName != null"> and lbss.serve_warehouse_name  like concat('%',#{param.serveWarehouseName} ,'%')   </if>
+            <if test="param.sendWarehouseId != null and param.sendWarehouseId != null"> and lbss.send_warehouse_name like  concat('%',#{param.sendWarehouseName} ,'%')  </if>
+
         </where>
+
     </select>
 
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/service/impl/BasicdataStorageServicesServiceImpl.java

@@ -59,7 +59,7 @@ public class BasicdataStorageServicesServiceImpl extends BaseServiceImpl<Basicda
 	public boolean submitSave(BasicdataStorageServicesEntity basicdataStorageServices) {
 
 		List<BasicdataStorageServicesEntity> basicdataStorageServicesEntities = baseMapper.selectList(Wrappers.<BasicdataStorageServicesEntity>query().lambda().
-			eq(BasicdataStorageServicesEntity::getShopId, basicdataStorageServices.getShopId()).
+			eq(BasicdataStorageServicesEntity::getClientId, basicdataStorageServices.getClientId()).
 			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId()).
 			eq(BasicdataStorageServicesEntity::getSendWarehouseId, basicdataStorageServices.getSendWarehouseId())
 		);