From e2a818321e5e998ef59daed3468a7bb65691b35b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Sat, 18 Nov 2023 21:40:08 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E6=8E=A5=E5=8F=A3=E7=A7=BB=E9=99=A4?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=8F=82=E6=95=B0?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=88=E4=BB=A5=E9=94=80=E5=AE=9A=E8=B4=AD?= =?UTF-8?q?=EF=BC=8C=E5=85=BC=E5=AE=B9=E6=9F=A5=E7=9C=8B=E5=85=A8=E9=83=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/jsh/erp/service/depotHead/DepotHeadService.java | 4 ++++ 1 file changed, 4 insertions(+) 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,