制品返修SQL查询修改

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<BalanceDO> {
     default PageResult<BalanceDO> selectSenior(CustomConditions conditions) {
         return selectPage(conditions, QueryWrapperUtils.structure(conditions));
     }
+
+
+
     default List<BalanceDO> selectList(BalanceExportReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<BalanceDO>()
                 .eqIfPresent(BalanceDO::getPackingNumber, reqVO.getPackingNumber())
@@ -201,8 +204,8 @@ public interface BalanceMapper extends BaseMapperX<BalanceDO> {
                 .orderByDesc(BalanceDO::getId));
     }
 
-    default List<BalanceDO> getBalanceItemsPage(IPage<BalanceDO> mpPage,BalancePageReqVO reqVO){
-        List<BalanceDO> list  = selectList(mpPage,new LambdaQueryWrapperX<BalanceDO>()
+    default PageResult<BalanceDO> getBalanceItemsPage(BalancePageReqVO reqVO){
+        PageResult<BalanceDO> page  = selectPage(reqVO,new LambdaQueryWrapperX<BalanceDO>()
                 .eqIfPresent(BalanceDO::getPackingNumber, reqVO.getPackingNumber())
                 .eqIfPresent(BalanceDO::getContainerNumber, reqVO.getContainerNumber())
                 .eqIfPresent(BalanceDO::getItemCode, reqVO.getItemCode())
@@ -231,6 +234,12 @@ public interface BalanceMapper extends BaseMapperX<BalanceDO> {
                 .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<BalanceDO> selectSeniorItems(CustomConditions conditions) {
+        QueryWrapper<BalanceDO> queryWrapper = QueryWrapperUtils.structure(conditions);
+        queryWrapper.inSql("item_code","select code from basic_itembasic where type in ('FG','SEMI')");
+        return selectPage(conditions, queryWrapper);
     }
 }

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<BalanceDO> getBalanceItemsPage(BalancePageReqVO pageVO) {
-        IPage<BalanceDO> mpPage = MyBatisUtils.buildPage(pageVO);
-        List<BalanceDO> list = balanceMapper.getBalanceItemsPage(mpPage,pageVO);
-        mpPage.setRecords(list);
-        return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
+        return balanceMapper.getBalanceItemsPage(pageVO);
     }
 
     @Override
     public PageResult<BalanceDO> getSeniroBalanceItemsPage(CustomConditions conditions) {
-        QueryWrapper<BalanceDO> lambdaQuery =  QueryWrapperUtils.structure(conditions);
-        lambdaQuery.inSql("item_code","select code from basic_itembasic where type in ('FG','SEMI')");
-        IPage<BalanceDO> mpPage = MyBatisUtils.buildPage(conditions);
-        List<BalanceDO> list = balanceMapper.selectList(mpPage,lambdaQuery);
-        mpPage.setRecords(list);
-        return new PageResult<>(mpPage.getRecords(), mpPage.getTotal());
+        return balanceMapper.selectSeniorItems(conditions);
     }
 
     @Override