订单入库备货领取的返回 和修改 试剂直接入库和试剂管理 的搜索排序

gdg

2021-02-22 d2be6e4afe1dba009b56f8555792f2823f9e4535

 src/main/java/com/nanometer/smartlab/service/OpeApplyServiceImpl.java

@@ -526,7 +526,7 @@
   }

    @Override
    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status) {
    public int getOpeApplyReserveTotalCountByNameFor(String id,String reagentName, String personName,String productSn,String applyCode,Integer status,Integer isAllApply) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentName);
@@ -535,6 +535,7 @@
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            params.put("status",status);
            params.put("isAllApply",isAllApply);
            return this.opeApplyDao.getOpeApplyReserveTotalCountFor(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);
@@ -544,7 +545,7 @@
    }
    @Override
    public List<OpeApplyReserve> getOpeApplyReserveListByNameFor(String id,String reagentName, String personName, Integer first,
                                                              Integer pageSize,String productSn,String applyCode,Integer status) {
                                                              Integer pageSize,String productSn,String applyCode,Integer status,Integer isAllApply) {
        try {
            Map<String, Object> params = new HashMap<String, Object>();
            params.put("reagentName", reagentName);
@@ -555,6 +556,7 @@
            params.put("productSn",productSn);
            params.put("applyCode",applyCode);
            params.put("status",status);
            params.put("isAllApply",isAllApply);
            return this.opeApplyDao.getOpeApplyReserveListFor(params);
        } catch (DataAccessException e) {
            logger.error(e.getMessage(), e);