From fbc7b8c22eb4e05dd7fde1a48f8dcb158a541e11 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Thu, 23 Oct 2025 10:30:44 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E6=A8=A1=E7=B3=8A=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E5=95=86=E5=93=81=E8=B4=A7=E5=8F=B7=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0storeId=E5=85=A5=E5=8F=82=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/web/controller/xkt/StoreProductController.java | 5 +++--
 .../web/controller/xkt/StoreProductStockController.java      | 1 +
 .../java/com/ruoyi/xkt/service/IStoreProductService.java     | 3 ++-
 .../com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java  | 5 +++--
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java
index 077311717..037f740c5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java
@@ -56,8 +56,9 @@ public class StoreProductController extends XktBaseController {
 
     @ApiOperation(value = "模糊查询系统所有商品", httpMethod = "GET", response = R.class)
     @GetMapping(value = "/fuzzy")
-    public R<List<StoreProdFuzzyResVO>> fuzzyQuery(@RequestParam(value = "prodArtNum", required = false) String prodArtNum) {
-        return R.ok(BeanUtil.copyToList(storeProdService.fuzzyQuery(prodArtNum), StoreProdFuzzyResVO.class));
+    public R<List<StoreProdFuzzyResVO>> fuzzyQuery(@RequestParam("storeId") Long storeId,
+                                                   @RequestParam(value = "prodArtNum", required = false) String prodArtNum) {
+        return R.ok(BeanUtil.copyToList(storeProdService.fuzzyQuery(storeId, prodArtNum), StoreProdFuzzyResVO.class));
     }
 
     @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java
index 3455e150b..b72255074 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java
@@ -89,6 +89,7 @@ public class StoreProductStockController extends XktBaseController {
         return R.ok(BeanUtil.toBean(storeProdStockService.selectByStoreProdStockId(storeId, storeProdStockId), StoreProdStockResVO.class));
     }
 
+    @PreAuthorize("@ss.hasAnyRoles('admin,general_admin,store')||@ss.hasSupplierSubRole()")
     @ApiOperation(value = "根据货号查询档口商品库存", httpMethod = "GET", response = R.class)
     @GetMapping(value = "/{storeId}/store-prod-id/{storeProdId}")
     public R<StoreProdStockTakeResVO> getByStoreIdAndStoreProdId(@PathVariable("storeId") Long storeId, @PathVariable("storeProdId") Long storeProdId) {
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java
index a9a8e5cd2..089f7e47e 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java
@@ -150,10 +150,11 @@ public interface IStoreProductService {
     /**
      * 模糊查询系统所有商品
      *
+     * @param storeId 档口ID
      * @param prodArtNum 货号
      * @return StoreProdFuzzyResDTO
      */
-    List<StoreProdFuzzyResDTO> fuzzyQuery(String prodArtNum);
+    List<StoreProdFuzzyResDTO> fuzzyQuery(Long storeId, String prodArtNum);
 
     /**
      * 获取商城 档口首页商品状态数量
diff --git a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
index a312df80f..9ccc7cb47 100644
--- a/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
+++ b/xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
@@ -691,13 +691,14 @@ public class StoreProductServiceImpl implements IStoreProductService {
     /**
      * 模糊查询系统所有商品
      *
+     * @param storeId 档口ID
      * @param prodArtNum 货号
      * @return StoreProdFuzzyResDTO
      */
     @Override
-    public List<StoreProdFuzzyResDTO> fuzzyQuery(String prodArtNum) {
+    public List<StoreProdFuzzyResDTO> fuzzyQuery(Long storeId, String prodArtNum) {
         LambdaQueryWrapper<StoreProduct> queryWrapper = new LambdaQueryWrapper<StoreProduct>()
-                .eq(StoreProduct::getDelFlag, Constants.UNDELETED);
+                .eq(StoreProduct::getDelFlag, Constants.UNDELETED).eq(StoreProduct::getStoreId, storeId);
         if (StringUtils.isNotBlank(prodArtNum)) {
             queryWrapper.like(StoreProduct::getProdArtNum, prodArtNum);
         }