调整Pressure的接口包位置到COre中，然后增加modBus-TCP协议通讯报道

jiazx0107@163.com

2023-08-11 be175fe739e687cd1d45da58f2cb7dd0c36d001f

 igds-inout/src/main/java/com/ld/igds/inout/service/HInoutSettleService.java

@@ -63,10 +63,6 @@
         args.put("foodVariety", param.getFoodVariety());
      }

      if (StringUtils.isNotEmpty(param.getSettleTag())) {
         hql += " and settleTag =:settleTag";
         args.put("settleTag", param.getSettleTag());
      }

      if (null != param.getStart()) {
         hql += " and completeTime >=:start";
@@ -145,5 +141,49 @@
      }
   }

    /**
     * 根据条件分页获取结算信息
     *
     * @param page
     * @param param
     */
    public void pageSettle(Page<InoutSettle> page, InoutParam param) throws Exception {
        String hql = " from " + InoutSettle.class.getName()
                + " where companyId =:companyId and deptId=:deptId";
        Map<String, Object> args = new HashMap<>();

        args.put("companyId", param.getCompanyId());
        args.put("deptId", param.getDeptId());

        if (StringUtils.isNotEmpty(param.getType())) {
            hql += " and inoutType =:inoutType";
            args.put("inoutType", param.getType());
        }

        if (StringUtils.isNotEmpty(param.getId())) {
            hql += " and id like:id";
            args.put("id", "%" + param.getId() + "%");
        }

        if (StringUtils.isNotEmpty(param.getDepotId())) {
            hql += " and depotId =:depotId";
            args.put("depotId", param.getDepotId());
        }
        if (null != param.getStart()) {
            hql += " and payTime >=:start";
            args.put("start", DateUtil.getCurZero(param.getStart()));
        }
        if (null != param.getEnd()) {
            hql += " and payTime <=:end";
            args.put("end", DateUtil.getNextZero(param.getEnd()));
        }

        String countHql = " select count(*) " + hql;

        hql += " order by id desc ";

        this.pagingQuery(page, hql, countHql, args);
    }

   
}