This commit is contained in:
LiJianZhao 2025-04-28 13:15:16 +08:00
parent 634b62cd43
commit 717bc87db2
2 changed files with 7 additions and 4 deletions

View File

@ -48,13 +48,14 @@ public class InventoryController extends BaseController {
@RequestMapping("/getByGoodsId") @RequestMapping("/getByGoodsId")
public Result<Map<String, Object>> getByGoodsId() { public Result<Map<String, Object>> getByGoodsId() {
int goodsId = parmsUtil.getInteger("goodsId", "请输入商品ID"); int goodsId = parmsUtil.getInteger("goodsId", "请输入商品ID");
Boolean isZero = parmsUtil.getObject("isZero", Boolean.class);
Goods goods = goodsService.getById(goodsId); Goods goods = goodsService.getById(goodsId);
if (goods == null) { if (goods == null) {
return error("商品不存在"); return error("商品不存在");
} }
Map<String, Object> goodsMap = JSON.parseObject(JSON.toJSONString(goods), Map.class); Map<String, Object> goodsMap = JSON.parseObject(JSON.toJSONString(goods), Map.class);
List<Inventory> list = inventoryService.getListByGoodsId(goodsId); List<Inventory> list = inventoryService.getListByGoodsId(goodsId,isZero);
List<Map<String, Object>> listMap = new ArrayList<>(); List<Map<String, Object>> listMap = new ArrayList<>();
for (Inventory inventory : list) { for (Inventory inventory : list) {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
@ -84,7 +85,7 @@ public class InventoryController extends BaseController {
if (goods == null) { if (goods == null) {
return error("商品不存在"); return error("商品不存在");
} }
List<Inventory> list = inventoryService.getListByGoodsId(goodsId); List<Inventory> list = inventoryService.getListByGoodsId(goodsId,true);
return success(list); return success(list);
} }

View File

@ -112,10 +112,12 @@ public class InventoryService extends BaseService {
/** /**
* 根据goodsId 获取该goods的所有库存信息 * 根据goodsId 获取该goods的所有库存信息
*/ */
public List<Inventory> getListByGoodsId(int goodsId) { public List<Inventory> getListByGoodsId(int goodsId,boolean isZero) {
QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>(); QueryWrapper<Inventory> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("good_id", goodsId); queryWrapper.eq("good_id", goodsId);
queryWrapper.and(wrapper->wrapper.ne("whole_number", 0).or().ne("fragment_number", 0)); if (!isZero){
queryWrapper.and(wrapper->wrapper.ne("whole_number", 0).or().ne("fragment_number", 0));
}
queryWrapper.orderByDesc("create_datetime"); queryWrapper.orderByDesc("create_datetime");
return inventoryMapper.selectList(queryWrapper); return inventoryMapper.selectList(queryWrapper);
} }