修改班组查询

blade-service-api/logpm-basicdata-api/src/main/java/com/logpm/basicdata/feign/IBasicdataWarehouseClient.java

@@ -44,6 +44,7 @@ public interface IBasicdataWarehouseClient {
     String API_PREFIX = "warehouse/client";
     String TOP = API_PREFIX + "/top";
     String GETWAREHOUSE = API_PREFIX + "/warehouse";
+    String WAREHOUSEBYDEPARTMENT = API_PREFIX+"/getWarehouseByDepartment";
 
     /**
      * 获取仓库列表
@@ -77,8 +78,8 @@ public interface IBasicdataWarehouseClient {
     BasicdataWarehouseEntity getWarehouseEntityByWarehouseCode(@RequestParam String warehouseCode);
 
 
-	@GetMapping(API_PREFIX+"/getWarehouseByDepartment")
+	@GetMapping(WAREHOUSEBYDEPARTMENT)
-	BasicdataWarehouseEntity getWarehouseByDepartment(@RequestParam String deptId);
+	BasicdataWarehouseEntity getWarehouseByDepartment(String deptId);
 
 
 	/**

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/controller/BasicdataTeamGroupController.java

@@ -16,6 +16,8 @@
  */
 package com.logpm.basicdata.controller;
 
+import com.logpm.basicdata.entity.BasicdataWarehouseEntity;
+import com.logpm.basicdata.feign.IBasicdataWarehouseClient;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -26,7 +28,9 @@ import javax.validation.Valid;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.AesUtil;
 import org.springblade.core.tool.utils.Func;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -42,6 +46,7 @@ import org.springblade.core.tool.constant.BladeConstant;
 import springfox.documentation.annotations.ApiIgnore;
 import java.util.Map;
 import java.util.List;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletResponse;
 
 /**
@@ -58,6 +63,8 @@ public class BasicdataTeamGroupController extends BladeController {
 
 	private final IBasicdataTeamGroupService basicdataTeamGroupService;
 
+	private final IBasicdataWarehouseClient basicdataWarehouseClient;
+
 	/**
 	 * 基础班组表 详情
 	 */
@@ -75,7 +82,13 @@ public class BasicdataTeamGroupController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入basicdataTeamGroup")
 	public R<IPage<BasicdataTeamGroupEntity>> list(@ApiIgnore @RequestParam Map<String, Object> basicdataTeamGroup, Query query) {
-		IPage<BasicdataTeamGroupEntity> pages = basicdataTeamGroupService.page(Condition.getPage(query), Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class));
+		QueryWrapper<BasicdataTeamGroupEntity> queryWrapper = Condition.getQueryWrapper(basicdataTeamGroup, BasicdataTeamGroupEntity.class);
+		List<BasicdataWarehouseEntity> myWarehouseList = basicdataWarehouseClient.getMyWarehouseList();
+		if(myWarehouseList.size() > 0){
+			List<Long> collect = myWarehouseList.stream().map(BasicdataWarehouseEntity::getDepartment).collect(Collectors.toList());
+			queryWrapper.in("department",collect);
+		}
+		IPage<BasicdataTeamGroupEntity> pages = basicdataTeamGroupService.page(Condition.getPage(query),queryWrapper);
 		return R.data(pages);
 	}
 

blade-service/logpm-basicdata/src/main/java/com/logpm/basicdata/feign/BasicdataWarehouseClient.java

@@ -161,6 +161,7 @@ public class BasicdataWarehouseClient implements IBasicdataWarehouseClient {
 	}
 
 	@Override
+	@GetMapping(WAREHOUSEBYDEPARTMENT)
 	public BasicdataWarehouseEntity getWarehouseByDepartment(String deptId) {
 		QueryWrapper<BasicdataWarehouseEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("department",deptId)

blade-service/logpm-distribution/src/main/java/com/logpm/distribution/service/IDistributionReservationService.java

@@ -78,6 +78,10 @@ public interface IDistributionReservationService extends BaseService<Distributio
 	 */
 	boolean insertReservation(DistributionReservationDTO distributionReservationDTO);
 
+	/**
+	 * 备货编码
+	 * @return
+	 */
 	String bianMa();
 
 	/**