Merge remote-tracking branch 'origin/dev' into test

This commit is contained in:
qianshijiang
2025-11-19 11:10:09 +08:00

View File

@@ -22,7 +22,7 @@ public interface SalesOrderMapper extends BaseMapperX<SalesOrderDO> {
default PageResult<SalesOrderDO> selectPage(SalesOrderPageReqVO reqVO) {
return selectPage(reqVO, new LambdaQueryWrapperX<SalesOrderDO>()
.likeIfPresent(SalesOrderDO::getOrderSAPNumber, reqVO.getOrderSAPNumber())
.eqIfPresent(SalesOrderDO::getSystemOrderNumber, reqVO.getSystemOrderNumber())
.likeIfPresent(SalesOrderDO::getSystemOrderNumber, reqVO.getSystemOrderNumber())
.eqIfPresent(SalesOrderDO::getCpNum, reqVO.getCpNum())
.eqIfPresent(SalesOrderDO::getSupplierNumber, reqVO.getSupplierNumber())
.likeIfPresent(SalesOrderDO::getSupplierName, reqVO.getSupplierName())
@@ -53,7 +53,7 @@ public interface SalesOrderMapper extends BaseMapperX<SalesOrderDO> {
.eqIfPresent(SalesOrderDO::getMaterialNumber, reqVO.getMaterialNumber())
.likeIfPresent(SalesOrderDO::getMaterialName, reqVO.getMaterialName())
.likeIfPresent(SalesOrderDO::getContractName, reqVO.getContractName())
.eqIfPresent(SalesOrderDO::getTenantNumber, reqVO.getTenantNumber())
.likeIfPresent(SalesOrderDO::getTenantNumber, reqVO.getTenantNumber())
.betweenIfPresent(SalesOrderDO::getCreateTime, reqVO.getCreateTime())
.eqIfPresent(SalesOrderDO::getErpPurchaseCompanyNumber, reqVO.getErpPurchaseCompanyNumber())
.likeIfPresent(SalesOrderDO::getErpPurchaseCompanyName, reqVO.getErpPurchaseCompanyName())