czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

商品模块bug修复

Browse Source
This commit is contained in:
Tankaikai
2025-03-11 15:34:24 +08:00
parent 6d74d26ff5
commit 56f73cb24f
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
View File

@@ -10,11 +10,10 @@ import com.czg.resp.CzgResult;
import com.czg.utils.AssertUtil;
import com.czg.validator.ValidatorUtil;
import com.czg.validator.group.DefaultGroup;
import com.mybatisflex.core.paginate.Page;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import java.util.List;
/**
* 耗材进销存
@@ -61,9 +60,9 @@ public class ConsStockFlowController {
@GetMapping("checkRecord")
@OperationLog("库存盘点记录")
//@SaAdminCheckPermission("consStockFlow:check-record")
public CzgResult<List<ConsCheckStockRecordVo>> checkStock(@RequestParam Long conId) {
public CzgResult<Page<ConsCheckStockRecordVo>> checkStock(@RequestParam Long conId) {
AssertUtil.isNull(conId, "耗材ID不能为空");
List<ConsCheckStockRecordVo> data = consStockFlowService.getCheckStockRecordList(conId);
Page<ConsCheckStockRecordVo> data = consStockFlowService.getCheckStockRecordPage(conId);
return CzgResult.success(data);
}

9
cash-common/cash-common-service/src/main/java/com/czg/product/service/ConsStockFlowService.java
View File

@@ -5,6 +5,7 @@ import com.czg.product.param.ConsCheckStockParam;
import com.czg.product.param.ConsInOutStockHeadParam;
import com.czg.product.param.ConsReportDamageParam;
import com.czg.product.vo.ConsCheckStockRecordVo;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.service.IService;
import java.util.List;
@@ -38,6 +39,14 @@ public interface ConsStockFlowService extends IService<ConsStockFlow> {
*/
void checkStock(ConsCheckStockParam param);
/**
* 获取盘点记录
*
* @param conId 耗材id
* @return 盘点记录列表
*/
Page<ConsCheckStockRecordVo> getCheckStockRecordPage(Long conId);
/**
* 获取盘点记录
*

7
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
View File

@@ -20,6 +20,7 @@ import com.czg.sa.StpKit;
import com.czg.service.product.mapper.ConsInfoMapper;
import com.czg.service.product.mapper.ConsStockFlowMapper;
import com.czg.utils.PageUtil;
import com.mybatisflex.core.paginate.Page;
import com.mybatisflex.core.query.QueryWrapper;
import com.mybatisflex.spring.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
@@ -157,6 +158,12 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
consInfoMapper.update(consInfo);
}
@Override
public Page<ConsCheckStockRecordVo> getCheckStockRecordPage(Long conId) {
Long shopId = StpKit.USER.getShopId(0L);
return super.pageAs(PageUtil.buildPage(), query().eq(ConsStockFlow::getShopId, shopId).eq(ConsStockFlow::getConId, conId).orderBy(ConsStockFlow::getId, true), ConsCheckStockRecordVo.class);
}
@Override
public List<ConsCheckStockRecordVo> getCheckStockRecordList(Long conId) {
Long shopId = StpKit.USER.getShopId(0L);