czg_team
/
cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'ww' into test 

# Conflicts:
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
#	eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
#	eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
This commit is contained in:
wangw 2024-10-12 18:28:17 +08:00
parent 527b5f059c f120867e35
commit fac0e9b046
6 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
eladmin-system/src/main/java/cn/ysk/cashier/cons/domain/TbConsStockCountQueryCriteria.java
View File

@ -13,7 +13,7 @@ public class TbConsStockCountQueryCriteria extends BaseQueryDto {
private String conName;
private String conTypeId;
private Integer conTypeId;
private String column;
@ -23,12 +23,6 @@ public class TbConsStockCountQueryCriteria extends BaseQueryDto {
private Integer size = 10;
public void setConTypeId(String conTypeId) {
if (StringUtils.isNotBlank(conTypeId)) {
this.conTypeId = conTypeId;
}
}
public void setConName(String conName) {
if (StringUtils.isNotBlank(conName)) {

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/repository/TbConsInfoFlowRepository.java
View File

@ -33,7 +33,7 @@ public interface TbConsInfoFlowRepository extends JpaRepository<TbConsInfoFlow,
"AND flow.createTime < :endTime " +
"AND flow.bizName IN :types " +
"ORDER BY flow.id DESC")
Page<TbConsInfoFlow> findByConsParam(Integer shopId, Integer consId, String conName, String conTypeId, List<String> types,
Page<TbConsInfoFlow> findByConsParam(Integer shopId, Integer consId, String conName, Integer conTypeId, List<String> types,
Date startTime, Date endTime, Pageable pageable);

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/rest/TbConsInfoFlowController.java
View File

@ -43,7 +43,7 @@ public class TbConsInfoFlowController {
@PostMapping("/stock")
@ApiOperation("耗材库存记录列表")
public ResponseEntity<Object> queryPage(@RequestBody TbConsStockCountQueryCriteria criteria){
public ResponseEntity<Object> queryPage(@RequestBody TbConsStockCountQueryCriteria criteria) throws ParseException {
return new ResponseEntity<>(tbConsInfoFlowService.queryPage(criteria),HttpStatus.OK);
}

2
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/TbConsInfoFlowService.java
View File

@ -35,7 +35,7 @@ public interface TbConsInfoFlowService {
*/
List<TbConsInfoFlowDto> queryAll(TbConsInfoFlowQueryCriteria criteria);
Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria);
Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria) throws ParseException;
TbProductStockCountVo stockCount(TbConsStockCountQueryCriteria criteria) throws ParseException;
Map<String,Object> stockList(TbProductStockCountQueryCriteria criteria) throws ParseException;

7
eladmin-system/src/main/java/cn/ysk/cashier/cons/service/impl/TbConsInfoFlowServiceImpl.java
View File

@ -75,7 +75,12 @@ public class TbConsInfoFlowServiceImpl implements TbConsInfoFlowService {
//入库stockInNumber; stockIn
//出库stockOutNumber; stockout
@Override
public Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria){
public Map<String,Object> queryPage(TbConsStockCountQueryCriteria criteria) throws ParseException {
if (criteria.getStartTime() == null || criteria.getEndTime() == null) {
criteria.setEndTime(new Date());//
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
criteria.setStartTime(sdf.parse("2024-01-01"));//创建2024年1月1日的Date对象
}
if(StringUtils.isNotBlank(criteria.getColumn())){
switch (criteria.getColumn()){
case "addCountNumber":

2
eladmin-system/src/main/java/cn/ysk/cashier/repository/product/ProductStockCountRepository.java
View File

@ -160,6 +160,6 @@ public interface ProductStockCountRepository extends JpaRepository<TbProductStoc
" AND flow.createTime > :startTime " +
" AND flow.createTime < :endTime ")
TbProductStockCountVo consStockCount(Integer shopId, Integer consId, String conName,
String conTypeId, Date startTime, Date endTime);
Integer conTypeId, Date startTime, Date endTime);
}