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

1.新增商品出入库成本价计算

Browse Source 
2.新增后台商品列表接口，支持共享库存sku展示
This commit is contained in:
SongZhang
2024-06-26 14:01:03 +08:00
parent 98439a14b8
commit 273c4c64a6
12 changed files with 109 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductController.java
View File

@@ -1,5 +1,6 @@
package cn.ysk.cashier.controller.product;
import cn.ysk.cashier.annotation.AnonymousAccess;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.dto.product.TbProductSortCriteria;
import cn.ysk.cashier.vo.TbProductVo;
@@ -29,7 +30,13 @@ public class TbProductController {
@GetMapping
@ApiOperation("查询/product")
public ResponseEntity<Object> queryTbProduct(TbProductQueryCriteria criteria){
return new ResponseEntity<>(tbProductService.queryAll(criteria),HttpStatus.OK);
return new ResponseEntity<>(tbProductService.queryAll(criteria, false),HttpStatus.OK);
}
@GetMapping("/list")
@ApiOperation("查询/productForAdmin")
public ResponseEntity<Object> queryTbProductForAdmin(TbProductQueryCriteria criteria){
return new ResponseEntity<>(tbProductService.queryAll(criteria, true),HttpStatus.OK);
}
@GetMapping("/isHot")
@@ -78,4 +85,4 @@ public class TbProductController {
tbProductService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}
}

4
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductGroupController.java
View File

@@ -92,7 +92,7 @@ public class TbProductGroupController {
*/
@GetMapping("/addProduct")
public ResponseEntity<Object> ProductList(TbProductQueryCriteria criteria, Pageable pageable){
return new ResponseEntity<>(tbProductService.queryAll(criteria),HttpStatus.OK);
return new ResponseEntity<>(tbProductService.queryAll(criteria, false),HttpStatus.OK);
}
/**
@@ -107,4 +107,4 @@ public class TbProductGroupController {
return new ResponseEntity<>(tbProductGroupService.updateProductIds(addProduct,userName),HttpStatus.OK);
}
}
}

3
eladmin-system/src/main/java/cn/ysk/cashier/controller/product/TbProductStockOperateController.java
View File

@@ -1,5 +1,6 @@
package cn.ysk.cashier.controller.product;
import cn.ysk.cashier.annotation.AnonymousAccess;
import cn.ysk.cashier.annotation.Log;
import cn.ysk.cashier.pojo.product.TbProductStockOperate;
import cn.ysk.cashier.service.TbProductStockOperateService;
@@ -81,4 +82,4 @@ public class TbProductStockOperateController {
tbProductStockOperateService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}
}

2
eladmin-system/src/main/java/cn/ysk/cashier/controller/shop/TbShopPurveyorController.java
View File

@@ -78,4 +78,4 @@ public class TbShopPurveyorController {
tbShopPurveyorService.deleteAll(ids);
return new ResponseEntity<>(HttpStatus.OK);
}
}
}