czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangw
2025-03-14 10:01:22 +08:00
parent 9af7a6a742 76d6659c81
commit 9b53f62442
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cash-service/product-service/src/main/java/com/czg/service/product/service/impl/ConsStockFlowServiceImpl.java
View File

@@ -10,7 +10,6 @@ import com.czg.exception.CzgException;
import com.czg.product.dto.ConsStockFlowDTO;
import com.czg.product.entity.ConsInfo;
import com.czg.product.entity.ConsStockFlow;
import com.czg.product.entity.ProductStockFlow;
import com.czg.product.enums.InOutItemEnum;
import com.czg.product.enums.InOutTypeEnum;
import com.czg.product.param.ConsCheckStockParam;
@@ -217,9 +216,9 @@ public class ConsStockFlowServiceImpl extends ServiceImpl<ConsStockFlowMapper, C
queryWrapper.eq(ConsStockFlow::getInOutItem, param.getInOutItem());
}
if (ObjUtil.isNotNull(param.getConId())) {
queryWrapper.eq(ConsStockFlow::getProductId, param.getConId());
queryWrapper.eq(ConsStockFlow::getConId, param.getConId());
}
queryWrapper.orderBy(ProductStockFlow::getId, false);
queryWrapper.orderBy(ConsStockFlow::getId, false);
return pageAs(PageUtil.buildPage(), queryWrapper, ConsStockFlowDTO.class);
}