|
@@ -90,8 +90,8 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
|
|
|
@RequestParam(name="goodTypes[]",required = false) List<String> goodTypes,
|
|
@RequestParam(name="goodTypes[]",required = false) List<String> goodTypes,
|
|
|
HttpServletRequest req) {
|
|
HttpServletRequest req) {
|
|
|
LambdaQueryWrapper<CesGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesGoods, req.getParameterMap()).lambda();
|
|
LambdaQueryWrapper<CesGoods> queryWrapper = QueryGenerator.initQueryWrapper(cesGoods, req.getParameterMap()).lambda();
|
|
|
- queryWrapper.eq(CesGoods::getInvalid,false);
|
|
|
|
|
- queryWrapper.eq(CesGoods::getIsTemp,false);
|
|
|
|
|
|
|
+ queryWrapper.eq(CesGoods::getInvalid, false);
|
|
|
|
|
+ queryWrapper.eq(CesGoods::getIsTemp, false);
|
|
|
if (ObjectUtils.isNotEmpty(goodTypes)) {
|
|
if (ObjectUtils.isNotEmpty(goodTypes)) {
|
|
|
List<CesStockType> list = cesStockTypeService.list(Wrappers.<CesStockType>lambdaQuery()
|
|
List<CesStockType> list = cesStockTypeService.list(Wrappers.<CesStockType>lambdaQuery()
|
|
|
.eq(CesStockType::getHotelId, cesGoods.getHotelId())
|
|
.eq(CesStockType::getHotelId, cesGoods.getHotelId())
|
|
@@ -112,10 +112,15 @@ public class PosSellClearGoodsController extends JeecgController<PosSellClearGoo
|
|
|
Page<CesGoods> page = new Page<CesGoods>(pageNo, pageSize);
|
|
Page<CesGoods> page = new Page<CesGoods>(pageNo, pageSize);
|
|
|
IPage<CesGoods> pageList = cesGoodsService.page(page, queryWrapper);
|
|
IPage<CesGoods> pageList = cesGoodsService.page(page, queryWrapper);
|
|
|
pageList.getRecords().forEach(item -> {
|
|
pageList.getRecords().forEach(item -> {
|
|
|
- LambdaQueryWrapper<PosSellClearGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
- lambdaQueryWrapper.eq(PosSellClearGoods::getGoodsId, item.getId());
|
|
|
|
|
- Long count = posSellClearGoodsService.count(lambdaQueryWrapper);
|
|
|
|
|
- item.setIsSellClear(count > 0);
|
|
|
|
|
|
|
+ if (item.getInventory() <= 0) {
|
|
|
|
|
+ item.setIsSellClear(true);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ LambdaQueryWrapper<PosSellClearGoods> lambdaQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
|
|
+ lambdaQueryWrapper.eq(PosSellClearGoods::getGoodsId, item.getId());
|
|
|
|
|
+ Long count = posSellClearGoodsService.count(lambdaQueryWrapper);
|
|
|
|
|
+
|
|
|
|
|
+ item.setIsSellClear(count > 0);
|
|
|
|
|
+ }
|
|
|
});
|
|
});
|
|
|
return Result.OK(pageList);
|
|
return Result.OK(pageList);
|
|
|
}
|
|
}
|