From bdf6a8aa3c0bb60b570b48ee0447492a83943851 Mon Sep 17 00:00:00 2001 From: wusiyu <2015098864@qq.com> Date: Tue, 9 Jun 2026 16:56:38 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/springblade/wms/feign/WmsTaskClient.java | 9 +++++++++ .../controller/StGraphiteMoldOutController.java | 4 ++-- .../wms/controller/StStorehouseController.java | 13 ++++++++++++- .../springblade/wms/feign/WmsTaskClientImpl.java | 13 +++++++++---- .../wms/service/IStUserRightService.java | 2 ++ .../wms/service/impl/StUserRightServiceImpl.java | 14 ++++++++++++++ 6 files changed, 48 insertions(+), 7 deletions(-) diff --git a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java b/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java index 5a80e6cbc..426dad17f 100644 --- a/blade-service-api/blade-wms-api/src/main/java/org/springblade/wms/feign/WmsTaskClient.java +++ b/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 getStockAndKit(@RequestParam String goodsCode, @RequestParam Integer isGraphite); + /** + * 根据物料编号查询对应的库管员（拥有该物料所在库房权限的人员） + */ + @PostMapping(GET_STOREKEEPERS_BY_GOODS_CODE) + R getStorekeepersByGoodsCode(@RequestParam String goodsCode); + } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGraphiteMoldOutController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGraphiteMoldOutController.java index e23921b33..b7fbad646 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StGraphiteMoldOutController.java +++ b/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 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 stGraphiteMoldOut, BladeUser bladeUser, HttpServletResponse response) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java index 82c29e14b..f25a709fb 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/controller/StStorehouseController.java +++ b/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 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 stStorehouse, BladeUser bladeUser, HttpServletResponse response) { diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java index e6deeddaa..85ab54d50 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/feign/WmsTaskClientImpl.java +++ b/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 getStorekeepersByGoodsCode(@RequestParam String goodsCode) { + return R.data(stUserRightService.getStorekeepersByMaterialCode(goodsCode)); + } } diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java index 65d3cd902..ee13fbdce 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java +++ b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/IStUserRightService.java @@ -20,6 +20,8 @@ public interface IStUserRightService extends BaseService { void saveStorehouseRight(List shIdList, Long userId); Object assembleaUserRight(Long shId, String urTypeStorehouse); + + StUserRight getStorekeepersByMaterialCode(String goodsCode); // /** // * 自定义分页 // * diff --git a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java b/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java index a8d1e7e54..969e4a158 100644 --- a/blade-service/blade-wms/src/main/java/org/springblade/wms/service/impl/StUserRightServiceImpl.java +++ b/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 selectStUserRightPage(IPage page, StUserRightVO stUserRight) {