仓库管理修改

blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java

@@ -3,6 +3,7 @@ package org.springblade.wms.feign;
 import org.springblade.core.tool.api.R;
 import org.springblade.wms.pojo.dto.StGraphiteMoldOutDTO;
 import org.springblade.wms.pojo.entity.StGraphiteMoldOut;
+import org.springblade.wms.pojo.entity.StUserRight;
 import org.springblade.wms.pojo.vo.GraphiteStockKitVO;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.cloud.openfeign.SpringQueryMap;
@@ -38,6 +39,8 @@ public interface WmsTaskClient {
 
 	String GET_STOCK_AND_KIT = API_PREFIX + "/getStockAndKit";
 
+	String GET_STOREKEEPERS_BY_GOODS_CODE = API_PREFIX + "/getStorekeepersByGoodsCode";
+
 	/**
 	 * 物料状态监控同步erp
 	 */
@@ -74,4 +77,10 @@ public interface WmsTaskClient {
 	R<GraphiteStockKitVO> getStockAndKit(@RequestParam String goodsCode,
 										 @RequestParam Integer isGraphite);
 
+	/**
+	 * 根据物料编号查询对应的库管员（拥有该物料所在库房权限的人员）
+	 */
+	@PostMapping(GET_STOREKEEPERS_BY_GOODS_CODE)
+	R<StUserRight> getStorekeepersByGoodsCode(@RequestParam String goodsCode);
+
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGraphiteMoldOutController.java

@@ -222,7 +222,7 @@ public class StGraphiteMoldOutController extends BladeController {
 	 * 查询库存和齐套数
 	 */
 	@GetMapping("/getStockAndKit")
-	@ApiOperationSupport(order = 11)
+	@ApiOperationSupport(order = 14)
 	@ApiLog("查询库存和齐套数")
 	@Operation(summary = "查询库存和齐套数库", description = "传入物料编号和是否石墨模查询")
 	public R<GraphiteStockKitVO> getStockAndKit(@RequestParam String goodsCode,
@@ -235,7 +235,7 @@ public class StGraphiteMoldOutController extends BladeController {
 	 */
 	@IsAdmin
 	@GetMapping("/export-stGraphiteMoldOut")
-	@ApiOperationSupport(order = 14)
+	@ApiOperationSupport(order = 15)
 	@ApiLog("导出数据")
 	@Operation(summary = "导出数据", description = "传入stGraphiteMoldOut")
 	public void exportStGraphiteMoldOut(@Parameter(hidden = true) @RequestParam Map<String, Object> stGraphiteMoldOut, BladeUser bladeUser, HttpServletResponse response) {

blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java

@@ -313,12 +313,23 @@ public class StStorehouseController extends BladeController {
 		return R.success();
 	}
 
+	/**
+	 * 根据物料编号查询对应的库管员（拥有该物料所在库房权限的人员）
+	 */
+	@PostMapping("/getStorekeepersByMaterialCode")
+	@ApiOperationSupport(order = 14)
+	@ApiLog("根据物料编号查询库管员")
+	@Operation(summary = "根据物料编号查询库管员", description = "传入物料编号，返回拥有对应库房权限的库管员列表")
+	public R<StUserRight> getStorekeepersByGoodsCode(@RequestParam String goodsCode) {
+		return R.data(stUserRightService.getStorekeepersByMaterialCode(goodsCode));
+	}
+
 	/**
 	 * 导出数据
 	 */
 	@IsAdmin
 	@GetMapping("/export-stStorehouse")
-	@ApiOperationSupport(order = 14)
+	@ApiOperationSupport(order = 15)
 	@ApiLog("导出数据")
 	@Operation(summary = "导出数据", description = "传入stStorehouse")
 	public void exportStStorehouse(@Parameter(hidden = true) @RequestParam Map<String, Object> stStorehouse, BladeUser bladeUser, HttpServletResponse response) {

blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java

@@ -7,11 +7,9 @@ import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.wms.pojo.dto.StGraphiteMoldOutDTO;
 import org.springblade.wms.pojo.entity.StGraphiteMoldOut;
+import org.springblade.wms.pojo.entity.StUserRight;
 import org.springblade.wms.pojo.vo.GraphiteStockKitVO;
-import org.springblade.wms.service.IStBuyOrderService;
-import org.springblade.wms.service.IStGoodsExtService;
-import org.springblade.wms.service.IStGraphiteMoldOutService;
-import org.springblade.wms.service.IStOtherReceiptRecordService;
+import org.springblade.wms.service.*;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
@@ -41,6 +39,8 @@ public class WmsTaskClientImpl implements WmsTaskClient{
 
 	private final IStGraphiteMoldOutService stGraphiteMoldOutService;
 
+	private final IStUserRightService stUserRightService;
+
 	@Override
 	public boolean executeGoodsStatusUpdate() {
 		stGoodsExtService.executeGoodsStatusUpdate();
@@ -67,4 +67,9 @@ public class WmsTaskClientImpl implements WmsTaskClient{
 										        @RequestParam Integer isGraphite) {
 		return R.data(stGraphiteMoldOutService.getStockAndKit(goodsCode, isGraphite));
 	}
+
+	@Override
+	public R<StUserRight> getStorekeepersByGoodsCode(@RequestParam String goodsCode) {
+		return R.data(stUserRightService.getStorekeepersByMaterialCode(goodsCode));
+	}
 }

blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java

@@ -20,6 +20,8 @@ public interface IStUserRightService extends BaseService<StUserRight> {
 	void saveStorehouseRight(List<Long> shIdList, Long userId);
 
 	Object assembleaUserRight(Long shId, String urTypeStorehouse);
+
+	StUserRight getStorekeepersByMaterialCode(String goodsCode);
 //	/**
 //	 * 自定义分页
 //	 *

blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java

@@ -12,7 +12,9 @@ import org.springblade.system.pojo.entity.Dept;
 import org.springblade.system.pojo.entity.User;
 import org.springblade.wms.mapper.StUserRightMapper;
 import org.springblade.wms.pojo.entity.MesConstant;
+import org.springblade.wms.pojo.entity.StStorageLocation;
 import org.springblade.wms.pojo.entity.StUserRight;
+import org.springblade.wms.service.IStStorageLocationService;
 import org.springblade.wms.service.IStUserRightService;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -36,6 +38,8 @@ public class StUserRightServiceImpl extends BaseServiceImpl<StUserRightMapper, S
 	IUserClient userClient;
 	@Resource
 	ISysClient sysClient;
+	@Resource
+	IStStorageLocationService stStorageLocationService;
 
 	@Override
 	@Transactional(rollbackFor = Exception.class)
@@ -307,6 +311,16 @@ public class StUserRightServiceImpl extends BaseServiceImpl<StUserRightMapper, S
 		return baseMapper.findNoUserRightByTheId(theId, urType);
 	}
 
+	@Override
+	public StUserRight getStorekeepersByMaterialCode(String goodsCode) {
+		StStorageLocation location = stStorageLocationService.findByGoodsCode(goodsCode);
+		StUserRight userRight = baseMapper.findByTheIdAndUrType(location.getShId(), StUserRight.UR_TYPE_STOREHOUSE)
+				.stream()
+				.filter(Objects::nonNull)
+				.findFirst()
+				.orElse(null);
+		return userRight;
+	}
 
 //	@Override
 //	public IPage<StUserRightVO> selectStUserRightPage(IPage<StUserRightVO> page, StUserRightVO stUserRight) {