|
|
@@ -110,8 +110,13 @@ public class StockDescController extends BladeController {
|
|
|
.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), PjStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
|
|
|
.like(ObjectUtil.isNotEmpty(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot())
|
|
|
.orderByDesc(PjStockDesc::getBalanceQuantity);
|
|
|
- if ("0".equals(stockDesc.getWhether())) {
|
|
|
+ String appWhetherZeroInventory = iSysClient.getParamService("app.whether.zero.inventory");
|
|
|
+ if ("0".equals(appWhetherZeroInventory)){
|
|
|
lambdaQueryWrapper.ne(PjStockDesc::getBalanceQuantity, 0);
|
|
|
+ }else{
|
|
|
+ if ("0".equals(stockDesc.getWhether())) {
|
|
|
+ lambdaQueryWrapper.ne(PjStockDesc::getBalanceQuantity, 0);
|
|
|
+ }
|
|
|
}
|
|
|
if (ObjectUtils.isNotNull(ParameterUtils.getStorageId()) && ParameterUtils.whetherDatabaseSharding()) {
|
|
|
lambdaQueryWrapper.apply("find_in_set(storage_id,'" + ParameterUtils.getStorageId() + "')");
|