diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java index af32a710a..77bb7631e 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/AccountHeadService.java @@ -130,6 +130,22 @@ public class AccountHeadService { return list; } + public Long countAccountHead(String type, String billNo, String beginTime, String endTime, + Long organId, Long creator, Long handsPersonId, Long accountId, String status, + String remark, String number) throws Exception{ + Long result=null; + try{ + String [] creatorArray = getCreatorArray(); + beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); + endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); + result = accountHeadMapperEx.countsByAccountHead(type, creatorArray, billNo, + beginTime, endTime, organId, creator, handsPersonId, accountId, status, remark, number); + } catch(Exception e){ + JshException.readFail(logger, e); + } + return result; + } + /** * 根据角色类型获取操作员数组 * @return diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java index 83bc4dded..9f9f13632 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/DepotHeadService.java @@ -216,6 +216,28 @@ public class DepotHeadService { return list; } + public Long countDepotHead(String type, String subType, String hasDebt, String status, String purchaseStatus, String number, String linkApply, String linkNumber, + String beginTime, String endTime, String materialParam, Long organId, Long creator, Long depotId, Long accountId, String remark) throws Exception{ + Long result=null; + try{ + String [] depotArray = getDepotArray(subType); + String [] creatorArray = getCreatorArray(); + String [] statusArray = StringUtil.isNotEmpty(status) ? status.split(",") : null; + String [] purchaseStatusArray = StringUtil.isNotEmpty(purchaseStatus) ? purchaseStatus.split(",") : null; + String [] organArray = getOrganArray(subType, purchaseStatus); + //以销定购,查看全部数据 + creatorArray = StringUtil.isNotEmpty(purchaseStatus) ? null: creatorArray; + beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); + endTime = Tools.parseDayToTime(endTime,BusinessConstants.DAY_LAST_TIME); + result=depotHeadMapperEx.countsByDepotHead(type, subType, creatorArray, hasDebt, + statusArray, purchaseStatusArray, number, linkApply, linkNumber, beginTime, endTime, + materialParam, organId, organArray, creator, depotId, depotArray, accountId, remark); + } catch(Exception e){ + JshException.readFail(logger, e); + } + return result; + } + /** * 根据单据类型获取仓库数组 * @param subType