委托加工和回收率管理优化

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/dataobject/erp/ErpWarehouseDO.java

@@ -20,7 +20,7 @@ import lombok.*;
 /**
 * 支持业务基类继承：isBusiness=true 时继承 BusinessBaseDO，否则继承 BaseDO
 */
-public class ErpWarehouseDO extends BusinessBaseDO {
+public class ErpWarehouseDO extends BaseDO {
 
     /**
     * 主键

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/dal/mysql/erp/ErpWarehouseMapper.java

@@ -8,6 +8,7 @@ import com.zt.plat.module.erp.controller.admin.erp.vo.ErpWarehousePageReqVO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpSalesOrganizationDO;
 import com.zt.plat.module.erp.dal.dataobject.erp.ErpWarehouseDO;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -40,5 +41,10 @@ public interface ErpWarehouseMapper extends BaseMapperX<ErpWarehouseDO> {
                 .orderByDesc(ErpWarehouseDO::getId));
     }
 
+    List<ErpWarehouseDO> selectWarehouseByDynamicParams(
+            @Param("paramReqVO") ErpWarehousePageReqVO reqVO,
+            @Param("pageNum") Integer pageNum,
+            @Param("pageSize") Integer pageSize);
 
+    Long selectWarehouseByDynamicParamsCount(@Param("paramReqVO") ErpWarehousePageReqVO reqVO);
 }

zt-module-erp/zt-module-erp-server/src/main/java/com/zt/plat/module/erp/service/erp/ErpWarehouseServiceImpl.java

@@ -192,31 +192,32 @@ public PageResult<ErpWarehouseDO> getErpWarehousePageDistinctByFactory(ErpWareho
 
     @Override
     public PageResult<ErpWarehouseDO> getErpWarehousePage(ErpWarehousePageReqVO pageReqVO) {
-//        PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
+        return new PageResult<>(erpWarehouseMapper.selectWarehouseByDynamicParams(pageReqVO, pageReqVO.getPageNo(), pageReqVO.getPageSize()), erpWarehouseMapper.selectWarehouseByDynamicParamsCount(pageReqVO));
+        //        PageResult<ErpWarehouseRespVO> erpWarehouseRespVOPageResult = BeanUtils.toBean(erpWarehouseMapper.selectPage(pageReqVO), ErpWarehouseRespVO.class);
 //        if (erpWarehouseRespVOPageResult.getList() == null) {
 //            return erpWarehouseRespVOPageResult;
 //        }
 //        erpWarehouseRespVOPageResult.getList().forEach(this::setWarehouseFactoryInfo);
 //        return erpWarehouseRespVOPageResult;
         // 获取分页数据
-        List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
-        if (list == null) {
-            list = CollUtil.newArrayList();
-        }
-        // 分页处理
-        int pageNo = pageReqVO.getPageNo();
-        int pageSize = pageReqVO.getPageSize();
-        int total = list.size();
-        // 计算分页起始和结束位置
-        int fromIndex = (pageNo - 1) * pageSize;
-        int toIndex = Math.min(fromIndex + pageSize, total);
-        // 如果起始位置超出范围，则返回空列表
-        if (fromIndex >= total) {
-            return new PageResult<>(new ArrayList<>(), (long) total);
-        }
-        // 截取当前页数据
-        List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
-        return new PageResult<>(pageList, (long) total);
+//        List<ErpWarehouseDO> list = erpWarehouseMapper.getPageByReq(pageReqVO);
+//        if (list == null) {
+//            list = CollUtil.newArrayList();
+//        }
+//        // 分页处理
+//        int pageNo = pageReqVO.getPageNo();
+//        int pageSize = pageReqVO.getPageSize();
+//        int total = list.size();
+//        // 计算分页起始和结束位置
+//        int fromIndex = (pageNo - 1) * pageSize;
+//        int toIndex = Math.min(fromIndex + pageSize, total);
+//        // 如果起始位置超出范围，则返回空列表
+//        if (fromIndex >= total) {
+//            return new PageResult<>(new ArrayList<>(), (long) total);
+//        }
+//        // 截取当前页数据
+//        List<ErpWarehouseDO> pageList = list.subList(fromIndex, toIndex);
+//        return new PageResult<>(pageList, (long) total);
     }
 
     // 设置主物料信息