BruceSun
/
RuoYi-Vue
mirror of https://gitee.com/y_project/RuoYi-Vue.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

master：模糊查询商品货号接口增加storeId入参；

pull/1121/head
liujiang 2025-10-23 10:30:44 +08:00
parent 2af3b21c49
commit fbc7b8c22e
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductController.java
View File

@ -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()")

1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/xkt/StoreProductStockController.java
View File

@ -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) {

3
xkt/src/main/java/com/ruoyi/xkt/service/IStoreProductService.java
View File

@ -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);
/**
* 获取商城 档口首页商品状态数量

5
xkt/src/main/java/com/ruoyi/xkt/service/impl/StoreProductServiceImpl.java
View File

@ -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);
}