diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java index febd505c..afe694ea 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/dal/mysql/balance/BalanceMapper.java @@ -170,6 +170,9 @@ public interface BalanceMapper extends BaseMapperX { default PageResult selectSenior(CustomConditions conditions) { return selectPage(conditions, QueryWrapperUtils.structure(conditions)); } + + + default List selectList(BalanceExportReqVO reqVO) { return selectList(new LambdaQueryWrapperX() .eqIfPresent(BalanceDO::getPackingNumber, reqVO.getPackingNumber()) @@ -201,8 +204,8 @@ public interface BalanceMapper extends BaseMapperX { .orderByDesc(BalanceDO::getId)); } - default List getBalanceItemsPage(IPage mpPage,BalancePageReqVO reqVO){ - List list = selectList(mpPage,new LambdaQueryWrapperX() + default PageResult getBalanceItemsPage(BalancePageReqVO reqVO){ + PageResult page = selectPage(reqVO,new LambdaQueryWrapperX() .eqIfPresent(BalanceDO::getPackingNumber, reqVO.getPackingNumber()) .eqIfPresent(BalanceDO::getContainerNumber, reqVO.getContainerNumber()) .eqIfPresent(BalanceDO::getItemCode, reqVO.getItemCode()) @@ -231,6 +234,12 @@ public interface BalanceMapper extends BaseMapperX { .eqIfPresent(BalanceDO::getVolume, reqVO.getVolume()) .inSql(BalanceDO::getItemCode,"select code from basic_itembasic where type in ('FG','SEMI')") .orderByDesc(BalanceDO::getId)); - return list; + return page; + } + + default PageResult selectSeniorItems(CustomConditions conditions) { + QueryWrapper queryWrapper = QueryWrapperUtils.structure(conditions); + queryWrapper.inSql("item_code","select code from basic_itembasic where type in ('FG','SEMI')"); + return selectPage(conditions, queryWrapper); } } diff --git a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java index 6da3c55e..d67406a2 100644 --- a/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java +++ b/win-module-wms/win-module-wms-biz/src/main/java/com/win/module/wms/service/balance/BalanceServiceImpl.java @@ -259,20 +259,12 @@ public class BalanceServiceImpl implements BalanceService { @Override public PageResult getBalanceItemsPage(BalancePageReqVO pageVO) { - IPage mpPage = MyBatisUtils.buildPage(pageVO); - List list = balanceMapper.getBalanceItemsPage(mpPage,pageVO); - mpPage.setRecords(list); - return new PageResult<>(mpPage.getRecords(), mpPage.getTotal()); + return balanceMapper.getBalanceItemsPage(pageVO); } @Override public PageResult getSeniroBalanceItemsPage(CustomConditions conditions) { - QueryWrapper lambdaQuery = QueryWrapperUtils.structure(conditions); - lambdaQuery.inSql("item_code","select code from basic_itembasic where type in ('FG','SEMI')"); - IPage mpPage = MyBatisUtils.buildPage(conditions); - List list = balanceMapper.selectList(mpPage,lambdaQuery); - mpPage.setRecords(list); - return new PageResult<>(mpPage.getRecords(), mpPage.getTotal()); + return balanceMapper.selectSeniorItems(conditions); } @Override