diff --git a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java index 42b14fa4..37b00d94 100644 --- a/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java +++ b/jshERP-boot/src/main/java/com/jsh/erp/service/depotHead/DepotHeadService.java @@ -122,6 +122,8 @@ public class DepotHeadService { 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; Map personMap = personService.getPersonMap(); Map accountMap = accountService.getAccountMap(); beginTime = Tools.parseDayToTime(beginTime,BusinessConstants.DAY_FIRST_TIME); @@ -230,6 +232,8 @@ public class DepotHeadService { 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, linkNumber, beginTime, endTime,